Changeset 56400

Timestamp:

08/16/2023 02:03:44 PM (16 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-admin/includes/image-edit.php.

Follow-up to [11911], [11965], [11984], [12155], [12163], [22094].

Props aristath, poena, afercia, SergeyBiryukov.
See #58831.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (17 diffs)

trunk/src/wp-admin/includes/image-edit.php

@@ -637 +637 @@
             unset( $obj->c );
         }
+
         $changes[ $key ] = $obj;
     }
@@ -643 +644 @@
     if ( count( $changes ) > 1 ) {
         $filtered = array( $changes[0] );
+
         for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
             $combined = false;
-            if ( $filtered[ $i ]->type == $changes[ $j ]->type ) {
+
+            if ( $filtered[ $i ]->type === $changes[ $j ]->type ) {
                 switch ( $filtered[ $i ]->type ) {
                     case 'rotate':
@@ -657 +660 @@
                 }
             }
+
             if ( ! $combined ) {
                 $filtered[ ++$i ] = $changes[ $j ];
             }
         }
+
         $changes = $filtered;
         unset( $filtered );
@@ -694 +699 @@
         switch ( $operation->type ) {
             case 'rotate':
-                if ( 0 != $operation->angle ) {
+                if ( 0 !== $operation->angle ) {
                     if ( $image instanceof WP_Image_Editor ) {
                         $image->rotate( $operation->angle );
@@ -703 +708 @@
                 break;
             case 'flip':
-                if ( 0 != $operation->axis ) {
+                if ( 0 !== $operation->axis ) {
                     if ( $image instanceof WP_Image_Editor ) {
-                        $image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+                        $image->flip( ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
                     } else {
-                        $image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+                        $image = _flip_image_resource( $image, ( $operation->axis & 1 ) !== 0, ( $operation->axis & 2 ) !== 0 );
                     }
                 }
@@ -802 +807 @@
         $data = $backup_sizes['full-orig'];
 
-        if ( $parts['basename'] != $data['file'] ) {
+        if ( $parts['basename'] !== $data['file'] ) {
             if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
-
                 // Delete only if it's an edited image.
                 if ( preg_match( '/-e[0-9]{13}\./', $parts['basename'] ) ) {
@@ -829 +833 @@
         if ( isset( $backup_sizes[ "$default_size-orig" ] ) ) {
             $data = $backup_sizes[ "$default_size-orig" ];
-            if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] != $data['file'] ) {
+
+            if ( isset( $meta['sizes'][ $default_size ] ) && $meta['sizes'][ $default_size ]['file'] !== $data['file'] ) {
                 if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
-
                     // Delete only if it's an edited image.
                     if ( preg_match( '/-e[0-9]{13}-/', $meta['sizes'][ $default_size ]['file'] ) ) {
@@ -848 +852 @@
     }
 
-    if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-        ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
-
+    if ( ! wp_update_attachment_metadata( $post_id, $meta )
+        || ( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) )
+    ) {
         $msg->error = __( 'Cannot save image metadata.' );
         return $msg;
@@ -859 +863 @@
     } else {
         $msg->msg = __( 'Image restored successfully.' );
+
         if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE ) {
             delete_post_meta( $post_id, '_wp_attachment_backup_sizes' );
@@ -887 +892 @@
 
     $img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
+
     if ( is_wp_error( $img ) ) {
         $return->error = esc_js( __( 'Unable to create new image.' ) );
@@ -956 +962 @@
     $suffix   = time() . rand( 100, 999 );
 
-    if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
-        isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
+    if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE
+        && isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] !== $basename
+    ) {
 
         if ( $edit_thumbnails_separately && 'thumbnail' === $target ) {
@@ -970 +977 @@
             $new_filename = "{$filename}.{$ext}";
             $new_path     = "{$dirname}/$new_filename";
+
             if ( file_exists( $new_path ) ) {
                 $suffix++;
@@ -986 +994 @@
     if ( 'nothumb' === $target || 'all' === $target || 'full' === $target || $scaled ) {
         $tag = false;
+
         if ( isset( $backup_sizes['full-orig'] ) ) {
-            if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] !== $basename ) {
+            if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+                && $backup_sizes['full-orig']['file'] !== $basename
+            ) {
                 $tag = "full-$suffix";
             }
@@ -1001 +1012 @@
             );
         }
+
         $success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
@@ -1046 +1058 @@
         foreach ( $sizes as $size ) {
             $tag = false;
+
             if ( isset( $meta['sizes'][ $size ] ) ) {
                 if ( isset( $backup_sizes[ "$size-orig" ] ) ) {
-                    if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE ) && $backup_sizes[ "$size-orig" ]['file'] != $meta['sizes'][ $size ]['file'] ) {
+                    if ( ( ! defined( 'IMAGE_EDIT_OVERWRITE' ) || ! IMAGE_EDIT_OVERWRITE )
+                        && $backup_sizes[ "$size-orig" ]['file'] !== $meta['sizes'][ $size ]['file']
+                    ) {
                         $tag = "$size-$suffix";
                     }
@@ -1089 +1104 @@
             // Check if it's an image edit from attachment edit screen.
             if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' === $_REQUEST['context'] ) {
-                $thumb_url         = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+                $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+
                 $return->thumbnail = $thumb_url[0];
             } else {
                 $file_url = wp_get_attachment_url( $post_id );
+
                 if ( ! empty( $meta['sizes']['thumbnail'] ) ) {
                     $thumb             = $meta['sizes']['thumbnail'];
@@ -1110 +1127 @@
 
     $return->msg = esc_js( __( 'Image saved' ) );
+
     return $return;
 }