Changeset 60477

Timestamp:

07/16/2025 02:07:58 PM (5 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Reorder width and height for consistency in wp_get_attachment_image().

Includes correcting the placement of the filter_wp_get_attachment_image() helper function in unit tests.

Follow-up to [60415], [60476].

See #63168.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (3 diffs)
• tests/phpunit/tests/media.php (modified) (4 diffs)

trunk/src/wp-includes/media.php

@@ -1090 +1090 @@
          * @param string $context The context. Default 'wp_get_attachment_image'.
          */
-        $context        = apply_filters( 'wp_get_attachment_image_context', 'wp_get_attachment_image' );
+        $context = apply_filters( 'wp_get_attachment_image_context', 'wp_get_attachment_image' );
+
         $attr           = wp_parse_args( $attr, $default_attr );
         $attr['width']  = $width;
@@ -1159 +1160 @@
          *
          * @since 2.8.0
-         * @since 6.8.2 The `$attr` array includes `height` and `width` attributes.
+         * @since 6.8.2 The `$attr` array includes `width` and `height` attributes.
          *
          * @param string[]     $attr       Array of attribute values for the image markup, keyed by attribute name.
@@ -1169 +1170 @@
         $attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
 
+        if ( isset( $attr['width'] ) && is_numeric( $attr['width'] ) ) {
+            $width = absint( $attr['width'] );
+        }
         if ( isset( $attr['height'] ) && is_numeric( $attr['height'] ) ) {
             $height = absint( $attr['height'] );
         }
-        if ( isset( $attr['width'] ) && is_numeric( $attr['width'] ) ) {
-            $width = absint( $attr['width'] );
-        }
-        unset( $attr['height'], $attr['width'] );
+        unset( $attr['width'], $attr['height'] );
+
         $attr     = array_map( 'esc_attr', $attr );
         $hwstring = image_hwstring( $width, $height );

trunk/tests/phpunit/tests/media.php

@@ -1584 +1584 @@
     }
 
+    public function filter_wp_get_attachment_image() {
+        return 'Override wp_get_attachment_image';
+    }
+
     /**
      * @ticket 14110
      */
-    public function test_wp_get_attachment_image_filter_with_height_width() {
+    public function test_wp_get_attachment_image_filter_with_width_height() {
         $mock_action = new MockAction();
         add_filter( 'wp_get_attachment_image_attributes', array( $mock_action, 'filter' ) );
@@ -1601 +1605 @@
      * @ticket 14110
      */
-    public function test_wp_get_attachment_image_filter_change_height_width() {
+    public function test_wp_get_attachment_image_filter_change_width_height() {
         add_filter(
             'wp_get_attachment_image_attributes',
             static function ( $args ) {
+                $args['width']  = '999';
                 $args['height'] = '999';
-                $args['width']  = '999';
                 return $args;
             }
@@ -1618 +1622 @@
      * @ticket 14110
      */
-    public function test_wp_get_attachment_image_filter_unset_height_width() {
+    public function test_wp_get_attachment_image_filter_unset_width_height() {
         add_filter(
             'wp_get_attachment_image_attributes',
             static function ( $args ) {
-                unset( $args['height'], $args['width'] );
+                unset( $args['width'], $args['height'] );
                 return $args;
             }
@@ -1629 +1633 @@
         $this->assertStringContainsString( 'width="150"', $output, 'Width should not be changed.' );
         $this->assertStringContainsString( 'height="150"', $output, 'Height should not be changed.' );
-    }
-
-    public function filter_wp_get_attachment_image() {
-        return 'Override wp_get_attachment_image';
     }