Changeset 47329 for branches/3.9/tests/phpunit/tests/image/functions.php

Timestamp:

02/20/2020 05:04:42 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Fix the Travis CI build for the 3.9 branch.

Among other fixes, this backports [28943], [28961], [28964-28968], [28988], [29120], [29251], [29503], [29860], [29869], [29954], [30001], [30160], [30282], [30285], [30289-30291], [30513-30514], [30516-30521], [30523-30524], [30526], [30529-30530], [31253-31254], [31257-31259], [31622], [33374], [40255], [40257], [40259], [40269], [40271], [40446], [40449], [40457], [40604], [40538], [40833], [41082], [41303], [41306], [44993].

See #49485.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/image/functions.php (modified) (6 diffs)

branches/3.9/tests/phpunit/tests/image/functions.php

@@ -89 +89 @@
                 $files = array(
                         // 'test-image-cmyk.jpg', Allowed in r9727
-                        'test-image.bmp',
+                        // 'test-image.bmp', Allowed in r28589
                         // 'test-image-grayscale.jpg', Allowed in r9727
                         'test-image.pct',
@@ -145 +145 @@
 
                                 // Clean up
-                                @unlink( $file );
-                                @unlink( $ret['path'] );
+                                unlink( $file );
+                                unlink( $ret['path'] );
                         }
 
@@ -186 +186 @@
 
                         // Clean up
-                        @unlink( $file );
-                        @unlink( $ret['path'] );
+                        unlink( $file );
+                        unlink( $ret['path'] );
                         unset( $img );
                 }
@@ -232 +232 @@
                                 $this->assertNotInstanceOf( 'WP_Error', $ret );
                                 $this->assertEquals( $mime_type, $this->get_mime_type( $ret['path'] ) );
-                                @unlink( $file );
-                                @unlink( $ret['path'] );
+                                unlink( $ret['path'] );
                         }
 
@@ -292 +291 @@
                         $this->markTestSkipped( 'jpeg support unavailable' );
 
-                $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
+                if ( ! extension_loaded( 'openssl' ) ) {
+                        $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() requires openssl.' );
+                }
+
+                $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
                                                           0, 0, 100, 100, 100, 100, false,
                                                           DIR_TESTDATA . '/images/' . rand_str() . '.jpg' );
@@ -312 +315 @@
 
         public function test_wp_crop_image_url_not_exist() {
-                $file = wp_crop_image( 'http://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
+                if ( ! extension_loaded( 'openssl' ) ) {
+                        $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url_not_exist() requires openssl.' );
+                }
+
+                $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
                                                           0, 0, 100, 100, 100, 100 );
                 $this->assertInstanceOf( 'WP_Error', $file );