Tests: Move the filter_image_editor_output_format() helper method next to the test it's used in.

SergeyBiryukov · SergeyBiryukov · commit e44c94abc504 · 2022-06-19T12:47:47.000Z
Follow-up to [53292], [53495]. See #55652. git-svn-id: https://develop.svn.wordpress.org/trunk@53522 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/tests/phpunit/tests/image/functions.php b/tests/phpunit/tests/image/functions.php
@@ -359,6 +359,10 @@ public function test_wp_crop_image_with_filtered_extension() {
 		unlink( $file );
 	}
 
+	public function filter_image_editor_output_format() {
+		return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );
+	}
+
 	/**
 	 * @requires function imagejpeg
 	 */
@@ -678,10 +682,6 @@ public function test_fallback_intermediate_image_sizes() {
 		}
 	}
 
-	public function filter_image_editor_output_format() {
-		return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );
-	}
-
 	public function filter_fallback_intermediate_image_sizes( $fallback_sizes, $metadata ) {
 		// Add the 'test-size' to the list of fallback sizes.
 		$fallback_sizes[] = 'test-size';

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,10 @@ public function test_wp_crop_image_with_filtered_extension() {`
`359`	`359`	`unlink( $file );`
`360`	`360`	`}`
`361`	`361`
	`362`	`+ public function filter_image_editor_output_format() {`
	`363`	`+ return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );`
	`364`	`+ }`
	`365`	`+`
`362`	`366`	`/**`
`363`	`367`	`* @requires function imagejpeg`
`364`	`368`	`*/`
`@@ -678,10 +682,6 @@ public function test_fallback_intermediate_image_sizes() {`
`678`	`682`	`}`
`679`	`683`	`}`
`680`	`684`
`681`		`- public function filter_image_editor_output_format() {`
`682`		`- return array_fill_keys( array( 'image/jpg', 'image/jpeg', 'image/png' ), 'image/webp' );`
`683`		`- }`
`684`		`-`
`685`	`685`	`public function filter_fallback_intermediate_image_sizes( $fallback_sizes, $metadata ) {`
`686`	`686`	`// Add the 'test-size' to the list of fallback sizes.`
`687`	`687`	`$fallback_sizes[] = 'test-size';`