Ticket #50630: 50630.diff

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

@@ -71 +71 @@
                         'flipimage',
                         'flopimage',
                         'readimage',
+                        'readimageblob',
                 );
 
                 // Now, test for deep requirements within Imagick.
@@ -148 +149 @@
 
                         // Reading image after Imagick instantiation because `setResolution`
                         // only applies correctly before the image is read.
-                        $this->image->readImage( $filename );
+                        if ( wp_is_stream( $filename ) ) {
+                                // Imagick::readImageFile doesn't properly support streams.
+                                $this->image->readImageBlob( file_get_contents( $filename ), $filename );
+                        } else {
+                                $this->image->readImage( $filename );
+                        }
 
                         if ( ! $this->image->valid() ) {
                                 return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
@@ -678 +684 @@
                         $orig_format = $this->image->getImageFormat();
 
                         $this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-                        $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+
+                        if ( wp_is_stream( $filename ) ) {
+                                // Imagick::writeImageFile doesn't support streams properly, so copy the blob.
+                                file_put_contents( $filename, $image->getImageBlob() );
+                        } else {
+                                $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+                        }
 
                         // Reset original format.
                         $this->image->setImageFormat( $orig_format );

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

@@ -365 +365 @@
                 $new_ext = strtolower( $extension ? $extension : $ext );
 
                 if ( ! is_null( $dest_path ) ) {
-                        $_dest_path = realpath( $dest_path );
-                        if ( $_dest_path ) {
-                                $dir = $_dest_path;
+                        if ( ! wp_is_stream( $dest_path ) ) {
+                                $_dest_path = realpath( $dest_path );
+                                if ( $_dest_path ) {
+                                        $dir = $_dest_path;
+                                }
+                        } else {
+                                $dir = $dest_path;
                         }
                 }
 

tests/phpunit/tests/image/editor.php

@@ -143 +143 @@
 
                 // Combo!
                 $this->assertEquals( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
+
+                // Test with a stream destination.
+                $this->assertEquals( 'file://testing/path/canola-100x50.jpg', $editor->generate_filename( null, 'file://testing/path' ) );
         }
 
         /**

tests/phpunit/tests/image/editorImagick.php

@@ -577 +577 @@
                 unlink( $ret['path'] );
         }
 
+        /**
+         * Test that images can be loaded and written over streams
+         */
+        public function test_streams() {
+                $file = 'file://' . DIR_TESTDATA . '/images/waffles.jpg';
+                $imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+                $imagick_image_editor->load();
+                $this->assertNotWPError( $imagick_image_editor );
+
+                $temp_file = 'file://' . get_temp_dir() . 'waffles.jpg';
+                $ret = $imagick_image_editor->save( $temp_file );
+                $this->assertNotWPError( $ret );
+
+                $this->assertEquals( $temp_file , $ret['path'] );
+
+                if ( $temp_file != $ret['path'] ) {
+                        unlink( $ret['path'] );
+                }
+                unlink( $temp_file );
+        }
 }