Ticket #28154: 28154.2.diff

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

@@ -114 +114 @@
                 $this->update_size( $size[0], $size[1] );
                 $this->mime_type = $size['mime'];
 
-                return $this->set_quality( $this->quality );
+                return true;
         }
 
         /**
@@ -387 +387 @@
                                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                 }
                 elseif ( 'image/jpeg' == $mime_type ) {
-                        if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) )
+                        if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) )
                                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                 }
                 else {
@@ -435 +435 @@
                                 return imagegif( $this->image );
                         default:
                                 header( 'Content-Type: image/jpeg' );
-                                return imagejpeg( $this->image, null, $this->quality );
+                                return imagejpeg( $this->image, null, $this->get_quality() );
                 }
         }
 

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

@@ -143 +143 @@
                 if ( is_wp_error( $updated_size ) )
                                 return $updated_size;
 
-                return $this->set_quality( $this->quality );
+                return true;
         }
 
         /**
@@ -160 +160 @@
                 if ( is_wp_error( $quality_result ) ) {
                         return $quality_result;
                 } else {
-                        $quality = $this->quality;
+                        $quality = $this->get_quality();
                 }
 
                 try {

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

@@ -16 +16 @@
         protected $size = null;
         protected $mime_type = null;
         protected $default_mime_type = 'image/jpeg';
-        protected $quality = 90;
+        protected $quality = false;
+        protected $default_quality = 90;
 
         /**
          * Each instance handles a single file.
@@ -203 +204 @@
         }
 
         /**
-         * Sets Image Compression quality on a 1-100% scale.
+         * Gets the Image Compression quality on a 1-100% scale.
          *
-         * @since 3.5.0
+         * @since 4.0.0
          * @access public
          *
-         * @param int $quality Compression Quality. Range: [1,100]
-         * @return boolean|WP_Error True if set successfully; WP_Error on failure.
+         * @return int $quality Compression Quality. Range: [1,100]
          */
-        public function set_quality( $quality = null ) {
-                if ( $quality == null ) {
-                        $quality = $this->quality;
-                }
-
-                /**
-                 * Filter the default image compression quality setting.
-                 *
-                 * @since 3.5.0
-                 *
-                 * @param int    $quality   Quality level between 1 (low) and 100 (high).
-                 * @param string $mime_type Image mime type.
-                 */
-                $quality = apply_filters( 'wp_editor_set_quality', $quality, $this->mime_type );
-
-                if ( 'image/jpeg' == $this->mime_type ) {
+        public function get_quality() {
+                if ( ! $this->quality ) {
                         /**
-                         * Filter the JPEG compression quality for backward-compatibility.
+                         * Filter the default image compression quality setting.
                          *
-                         * The filter is evaluated under two contexts: 'image_resize', and 'edit_image',
-                         * (when a JPEG image is saved to file).
+                         * @since 3.5.0
                          *
-                         * @since 2.5.0
-                         *
-                         * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
-                         * @param string $context Context of the filter.
+                         * @param int    $quality   Quality level between 1 (low) and 100 (high).
+                         * @param string $mime_type Image mime type.
                          */
-                        $quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+                        $quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_type );
 
-                        // Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
-                        if ( $quality == 0 ) {
-                                $quality = 1;
+                        if ( 'image/jpeg' == $this->mime_type ) {
+                                /**
+                                 * Filter the JPEG compression quality for backward-compatibility.
+                                 *
+                                 * The filter is evaluated under two contexts: 'image_resize', and 'edit_image',
+                                 * (when a JPEG image is saved to file).
+                                 *
+                                 * @since 2.5.0
+                                 *
+                                 * @param int    $quality Quality level between 0 (low) and 100 (high) of the JPEG.
+                                 * @param string $context Context of the filter.
+                                 */
+                                $quality = apply_filters( 'jpeg_quality', $quality, 'image_resize' );
+
+                                if ( ! $this->set_quality( $quality ) ) {
+                                        $this->quality = $this->default_quality;
+                                }
                         }
                 }
 
-                if ( ( $quality >= 1 ) && ( $quality <= 100 ) ){
+                return $this->quality;
+        }
+
+        /**
+         * Sets Image Compression quality on a 1-100% scale.
+         *
+         * @since 3.5.0
+         * @access public
+         *
+         * @param int $quality Compression Quality. Range: [1,100]
+         * @return boolean|WP_Error True if set successfully; WP_Error on failure.
+         */
+        public function set_quality( $quality = null ) {
+                // Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
+                if ( $quality == 0 ) {
+                        $quality = 1;
+                }
+
+                if ( ( $quality >= 1 ) && ( $quality <= 100 ) ) {
                         $this->quality = $quality;
                         return true;
                 } else {

tests/phpunit/tests/image/editor.php

@@ -45 +45 @@
 
         /**
          * Test test_quality
+         * @group marko
          * @ticket 6821
          */
         public function test_set_quality() {
@@ -51 +52 @@
 
                 // Get an editor
                 $editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
-
-                // Make quality readable
-                $property = new ReflectionProperty( $editor, 'quality' );
-                $property->setAccessible( true );
-
+var_dump( $editor );
                 // Ensure set_quality works
                 $this->assertTrue( $editor->set_quality( 75 ) );
-                $this->assertEquals( 75, $property->getValue( $editor ) );
+                $this->assertEquals( 75, $editor->get_quality() );
 
                 // Ensure the quality filter works
                 $func = create_function( '', "return 100;");
                 add_filter( 'wp_editor_set_quality', $func );
                 $this->assertTrue( $editor->set_quality( 75 ) );
-                $this->assertEquals( 100, $property->getValue( $editor ) );
+                $this->assertEquals( 75, $editor->get_quality() );
 
                 // Clean up
                 remove_filter( 'wp_editor_set_quality', $func );