Ticket #8432: 8432.patch

tests/phpunit/testcases/core/class-bp-attachment.php

@@ -377 +377 @@
          * @group avatars
          */
         public function test_bp_attachment_avatar_shrink() {
-                if ( false === _wp_image_editor_choose() ) {
-                        $this->markTestSkipped( 'This test requires PHP to have a valid image editor that is compatible with WordPress.' );
+                if ( false === _wp_image_editor_choose() || version_compare( phpversion(), '7.0' , '<' ) ) {
+                        $this->markTestSkipped( 'This test requires PHP >= 7.0 and to have a valid image editor that is compatible with WordPress.' );
                 }
 
                 $image = BP_TESTS_DIR . 'assets/upside-down.jpg';
@@ -429 +429 @@
                         $this->markTestSkipped( 'This test requires PHP to have a valid image editor that is compatible with WordPress.' );
                 }
 
-                $image = BP_TESTS_DIR . 'assets/upside-down.jpg';
+                $image = BP_TESTS_DIR . 'assets/test-image-large.jpg';
 
                 $cover_image_class = new BP_Attachment_Cover_Image();
 
-                $abs_path_copy = $cover_image_class->upload_path . '/upside-down.jpg';
+                $abs_path_copy = $cover_image_class->upload_path . '/test-image-large.jpg';
 
                 copy( $image, $abs_path_copy );
 
@@ -464 +464 @@
          * @group cover_images
          */
         public function test_bp_attachment_get_image_data() {
-                if ( ! is_callable( 'exif_read_data' ) ) {
-                        $this->markTestSkipped( 'This test requires PHP to be compiled with EXIF support.' );
+                if ( ! is_callable( 'exif_read_data' ) || version_compare( phpversion(), '7.0' , '<' ) ) {
+                        $this->markTestSkipped( 'This test requires PHP >= 7.0 and to be compiled with EXIF support.' );
                 }
 
                 $image_data = BP_Attachment::get_image_data( BP_TESTS_DIR . 'assets/upside-down.jpg' );

tests/phpunit/testcases/core/class-bp-media-extractor.php

@@ -321 +321 @@
         }
 
         public function test_extract_images_from_content_with_galleries_variant_ids() {
-                $attachment_ids   = array();
-                $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/test-image-large.png' );
-                $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/canola.jpg' );
-                $attachment_ids   = join( ',', $attachment_ids );
-                $post_id          = self::factory()->post->create( array( 'post_content' => "[gallery ids='{$attachment_ids}']" ) );
+                $attachment_ids = array(
+                        'large'  => 0,
+                        'canola' => 0,
+                );
+
+                $attachment_ids['large'] = self::factory()->attachment->create_upload_object( BP_TESTS_DIR . 'assets/test-image-large.jpg' );
+                $attachment_ids['canola'] = self::factory()->attachment->create_upload_object( BP_TESTS_DIR . 'assets/canola.jpg' );
+
+                $attachments = join( ',', $attachment_ids );
+                $post_id     = self::factory()->post->create( array( 'post_content' => "[gallery ids='{$attachments}']" ) );
 
                 // Extract the gallery images.
                 $media = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array(
@@ -336 +341 @@
                 $media = array_values( wp_list_filter( $media['images'], array( 'source' => 'galleries' ) ) );
                 $this->assertCount( 2, $media );
 
-                $this->assertSame( WP_CONTENT_URL . '/uploads/test-image-large.png', $media[0]['url'] );
-                $this->assertSame( WP_CONTENT_URL . '/uploads/canola.jpg', $media[1]['url'] );
+                $expected_urls = array(
+                        'large'  => wp_get_attachment_url( $attachment_ids['large'] ),
+                        'canola' => wp_get_attachment_url( $attachment_ids['canola'] ),
+                );
+
+                $this->assertSame( $expected_urls['large'], $media[0]['url'] );
+                $this->assertSame( $expected_urls['canola'], $media[1]['url'] );
         }
 
         public function test_extract_no_images_from_content_with_invalid_galleries_variant_no_ids() {