Changeset 27794 for trunk/src/wp-includes/class-wp-image-editor-gd.php

Timestamp:

03/27/2014 08:39:08 PM (12 years ago)

Author:

wonderboymusic

Message:

In multi_resize() image editor methods, assert that null can only be passed for one of the arguments, not both. Add a lot more unit test assertions to ensure this.

Props pbearne, DH-Shredder.
Fixes #26823.

File:

• trunk/src/wp-includes/class-wp-image-editor-gd.php (modified) (3 diffs)

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

@@ -141 +141 @@
          * Wraps _resize, since _resize returns a GD Resource.
          *
-         * @since 3.5.0
-         * @access public
-         *
-         * @param int $max_w
-         * @param int $max_h
-         * @param boolean $crop
+         * At minimum, either a height or width must be provided.
+         * If one of the two is set to null, the resize will
+         * maintain aspect ratio according to the provided dimension.
+         *
+         * @since 3.5.0
+         * @access public
+         *
+         * @param  int|null $max_w Image width.
+         * @param  int|null $max_h Image height.
+         * @param  boolean  $crop
          * @return boolean|WP_Error
          */
@@ -193 +197 @@
          *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
          *
+         *     Either a height or width must be provided.
+         *     If one of the two is set to null, the resize will
+         *     maintain aspect ratio according to the provided dimension.
+         *
          *     @type array $size {
-         *         @type int  $width  Image width.
-         *         @type int  $height Image height.
-         *         @type bool $crop   Optional. Whether to crop the image. Default false.
+         *         @type int  ['width']  Optional. Image width.
+         *         @type int  ['height'] Optional. Image height.
+         *         @type bool ['crop']   Optional. Whether to crop the image. Default false.
          *     }
          * }
-         * @return array An array of resized images metadata by size.
+         * @return array An array of resized images' metadata by size.
          */
         public function multi_resize( $sizes ) {
@@ -206 +214 @@
 
                 foreach ( $sizes as $size => $size_data ) {
-                        if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+                        if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
                                 continue;
-
-                        if ( ! isset( $size_data['crop'] ) )
+                        }
+
+                        if ( ! isset( $size_data['width'] ) ) {
+                                $size_data['width'] = null;
+                        }
+                        if ( ! isset( $size_data['height'] ) ) {
+                                $size_data['height'] = null;
+                        }
+
+                        if ( ! isset( $size_data['crop'] ) ) {
                                 $size_data['crop'] = false;
+                        }
 
                         $image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );