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

Timestamp:

11/30/2017 11:09:33 PM (8 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

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

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

@@ -13 +13 @@
  */
 abstract class WP_Image_Editor {
-    protected $file = null;
-    protected $size = null;
-    protected $mime_type = null;
+    protected $file              = null;
+    protected $size              = null;
+    protected $mime_type         = null;
     protected $default_mime_type = 'image/jpeg';
-    protected $quality = false;
-    protected $default_quality = 82;
+    protected $quality           = false;
+    protected $default_quality   = 82;
 
     /**
@@ -192 +192 @@
     protected function update_size( $width = null, $height = null ) {
         $this->size = array(
-            'width' => (int) $width,
-            'height' => (int) $height
+            'width'  => (int) $width,
+            'height' => (int) $height,
         );
         return true;
@@ -272 +272 @@
             return true;
         } else {
-            return new WP_Error( 'invalid_image_quality', __('Attempted to set image quality outside of the range [1,100].') );
+            return new WP_Error( 'invalid_image_quality', __( 'Attempted to set image quality outside of the range [1,100].' ) );
         }
     }
@@ -299 +299 @@
 
         if ( $filename ) {
-            $file_ext = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
+            $file_ext  = strtolower( pathinfo( $filename, PATHINFO_EXTENSION ) );
             $file_mime = $this->get_mime_type( $file_ext );
-        }
-        else {
+        } else {
             // If no file specified, grab editor's current extension and mime-type.
-            $file_ext = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+            $file_ext  = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
             $file_mime = $this->mime_type;
         }
@@ -312 +311 @@
         if ( ! $mime_type || ( $file_mime == $mime_type ) ) {
             $mime_type = $file_mime;
-            $new_ext = $file_ext;
+            $new_ext   = $file_ext;
         }
 
@@ -328 +327 @@
              */
             $mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
-            $new_ext = $this->get_extension( $mime_type );
+            $new_ext   = $this->get_extension( $mime_type );
         }
 
@@ -353 +352 @@
     public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
         // $suffix will be appended to the destination filename, just before the extension
-        if ( ! $suffix )
+        if ( ! $suffix ) {
             $suffix = $this->get_suffix();
-
-        $dir  = pathinfo( $this->file, PATHINFO_DIRNAME );
-        $ext  = pathinfo( $this->file, PATHINFO_EXTENSION );
-
-        $name = wp_basename( $this->file, ".$ext" );
+        }
+
+        $dir = pathinfo( $this->file, PATHINFO_DIRNAME );
+        $ext = pathinfo( $this->file, PATHINFO_EXTENSION );
+
+        $name    = wp_basename( $this->file, ".$ext" );
         $new_ext = strtolower( $extension ? $extension : $ext );
 
-        if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) )
+        if ( ! is_null( $dest_path ) && $_dest_path = realpath( $dest_path ) ) {
             $dir = $_dest_path;
+        }
 
         return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
@@ -376 +377 @@
      */
     public function get_suffix() {
-        if ( ! $this->get_size() )
+        if ( ! $this->get_size() ) {
             return false;
+        }
 
         return "{$this->size['width']}x{$this->size['height']}";
@@ -407 +409 @@
             $fp = fopen( $filename, 'w' );
 
-            if ( ! $fp )
+            if ( ! $fp ) {
                 return false;
+            }
 
             fwrite( $fp, $contents );
@@ -433 +436 @@
      */
     protected static function get_mime_type( $extension = null ) {
-        if ( ! $extension )
+        if ( ! $extension ) {
             return false;
+        }
 
         $mime_types = wp_get_mime_types();
@@ -441 +445 @@
         foreach ( $extensions as $_extension ) {
             if ( preg_match( "/{$extension}/i", $_extension ) ) {
-                return $mime_types[$_extension];
+                return $mime_types[ $_extension ];
             }
         }
@@ -462 +466 @@
         $extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
 
-        if ( empty( $extensions[0] ) )
+        if ( empty( $extensions[0] ) ) {
             return false;
+        }
 
         return $extensions[0];