Ticket #39875: 39875.patch

src/wp-includes/class-wp-image-editor-imagick.php

@@ -624 +624 @@
         protected function _save( $image, $filename = null, $mime_type = null ) {
                 list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-                if ( ! $filename )
+                if ( ! $filename ) {
                         $filename = $this->generate_filename( null, null, $extension );
+                } else {
+                        // If PDF preview.
+                        if ( 'image/jpeg' === $mime_type && 'pdf' === strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) ) ) {
+                                // Make sure not to overwrite existing JPEG with same name.
+                                $dirname = dirname( $filename );
+                                $filename = $dirname . '/' . wp_unique_filename( $dirname, wp_basename( $filename ) );
+                        }
+                }
 
                 try {
                         // Store initial Format

tests/phpunit/tests/image/editor_imagick.php

@@ -542 +542 @@
 
                 $this->assertTrue( $result );
         }
+
+        /**
+         * Test PDF preview doesn't overwrite existing JPEG.
+         * @ticket 39875
+         */
+        public function test_pdf_preview_doesnt_overwrite_existing_jpeg() {
+                // Dummy JPEG.
+                $jpg_path = '/tmp/test.jpg';
+                file_put_contents( $jpg_path, 'asdf' );
+
+                // PDF with same name as JPEG.
+                $pdf_path = '/tmp/test.pdf';
+                copy( DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf', $pdf_path );
+
+                // Load PDF.
+                $image_editor = new WP_Image_Editor_Imagick( $pdf_path );
+                $output = $image_editor->load();
+                $this->assertTrue( $output );
+
+                // Create PDF preview.
+                $output = $image_editor->save( $pdf_path, 'image/jpeg' );
+
+                $this->assertNotEmpty( $output );
+                $this->assertTrue( is_array( $output ) );
+                $this->assertNotEquals( $jpg_path, $output['path'] );
+                $this->assertNotEquals( $pdf_path, $output['path'] );
+                $this->assertSame( 'asdf', file_get_contents( $jpg_path ) );
+                $this->assertTrue( is_file( $output['path'] ) );
+                $this->assertSame( wp_basename( $output['path'] ), $output['file'] );
+                $this->assertSame( 'image/jpeg', $output['mime-type'] );
+
+                // Cleanup.
+                unlink( $jpg_path );
+                unlink( $pdf_path );
+                unlink( $output['path'] );
+        }
 }

tests/phpunit/tests/image/functions.php

@@ -18 +18 @@
                 require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
 
                 include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
+
+                $folder = '/tmp/wordpress-gsoc-flyer*.jpg';
+
+                foreach ( glob( $folder ) as $file ) {
+                        unlink( $file );
+                }
         }
 
         /**
@@ -403 +409 @@
                 $this->assertSame( $expected, $metadata );
 
                 unlink( $test_file );
+                foreach ( $expected['sizes'] as $size ) {
+                        unlink ( '/tmp/' . $size['file'] );
+                }
         }
 
         /**
@@ -427 +436 @@
                 add_filter( 'fallback_intermediate_image_sizes', array( $this, 'filter_fallback_intermediate_image_sizes' ), 10, 2 );
 
                 $expected = array(
-                        'file'      => 'wordpress-gsoc-flyer-77x100.jpg',
-                        'width'     => 77,
-                        'height'    => 100,
-                        'mime-type' => 'image/jpeg',
                 );
+                $expected = array(
+                        'sizes' => array(
+                                'thumbnail' => array(
+                                        'file'      => "wordpress-gsoc-flyer-116x150.jpg",
+                                        'width'     => 116,
+                                        'height'    => 150,
+                                        'mime-type' => "image/jpeg",
+                                ),
+                                'medium'    => array(
+                                        'file'      => "wordpress-gsoc-flyer-232x300.jpg",
+                                        'width'     => 232,
+                                        'height'    => 300,
+                                        'mime-type' => "image/jpeg",
+                                ),
+                                'large'     => array(
+                                        'file'      => "wordpress-gsoc-flyer-791x1024.jpg",
+                                        'width'     => 791,
+                                        'height'    => 1024,
+                                        'mime-type' => "image/jpeg",
+                                ),
+                                'test-size'      => array(
+                                        'file'      => 'wordpress-gsoc-flyer-77x100.jpg',
+                                        'width'     => 77,
+                                        'height'    => 100,
+                                        'mime-type' => 'image/jpeg',
+                                ),
+                                'full'      => array(
+                                        'file'      => "wordpress-gsoc-flyer.jpg",
+                                        'width'     => 1088,
+                                        'height'    => 1408,
+                                        'mime-type' => "image/jpeg",
+                                ),
+                        ),
+                );
 
                 $metadata = wp_generate_attachment_metadata( $attachment_id, $test_file );
                 $this->assertTrue( isset( $metadata['sizes']['test-size'] ), 'The `test-size` was not added to the metadata.' );
-                $this->assertSame( $metadata['sizes']['test-size'], $expected );
+                $this->assertSame( $expected, $metadata );
 
                 remove_image_size( 'test-size' );
                 remove_filter( 'fallback_intermediate_image_sizes', array( $this, 'filter_fallback_intermediate_image_sizes' ), 10 );
 
                 unlink( $test_file );
+                foreach ( $expected['sizes'] as $size ) {
+                        unlink ( '/tmp/' . $size['file'] );
+                }
         }
 
         function filter_fallback_intermediate_image_sizes( $fallback_sizes, $metadata ) {