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.

git-svn-id: https://develop.svn.wordpress.org/trunk@60477 602fd350-edb4-49c9-b593-d223f7449a82

Author: SergeyBiryukov

src/wp-includes/media.php

@@ -1089,7 +1089,8 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
 		 *
 		 * @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;
 		$attr['height'] = $height;
@@ -1158,7 +1159,7 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
 		 * Filters the list of attachment image attributes.
 		 *
 		 * @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.
 		 *                                 See wp_get_attachment_image().
@@ -1168,13 +1169,14 @@ function wp_get_attachment_image( $attachment_id, $size = 'thumbnail', $icon = f
 		 */
 		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
 
-		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'] );
+		if ( isset( $attr['height'] ) && is_numeric( $attr['height'] ) ) {
+			$height = absint( $attr['height'] );
+		}
+		unset( $attr['width'], $attr['height'] );
+
 		$attr     = array_map( 'esc_attr', $attr );
 		$hwstring = image_hwstring( $width, $height );
 		$html     = rtrim( "<img $hwstring" );

tests/phpunit/tests/media.php

@@ -1583,10 +1583,14 @@ public function test_wp_get_attachment_image_filter_output() {
 		$this->assertSame( $expected, $output );
 	}
 
+	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' ) );
 		wp_get_attachment_image( self::$large_id );
@@ -1600,12 +1604,12 @@ public function test_wp_get_attachment_image_filter_with_height_width() {
 	/**
 	 * @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['height'] = '999';
 				$args['width']  = '999';
+				$args['height'] = '999';
 				return $args;
 			}
 		);
@@ -1617,11 +1621,11 @@ static function ( $args ) {
 	/**
 	 * @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;
 			}
 		);
@@ -1630,10 +1634,6 @@ static function ( $args ) {
 		$this->assertStringContainsString( 'height="150"', $output, 'Height should not be changed.' );
 	}
 
-	public function filter_wp_get_attachment_image() {
-		return 'Override wp_get_attachment_image';
-	}
-
 	/**
 	 * Test that `wp_get_attachment_image()` returns a proper alt value.
 	 *