Changeset 56326

Timestamp:

07/31/2023 01:31:28 PM (4 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison in wp-includes/functions.php.

Follow-up to [5999], [6342], [7406], [8369], [10322], [11288], [11332], [11597], [12405], [13569], [14649], [15806], [19773], [26449], [26926], [39831], [40124].

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

File:

• trunk/src/wp-includes/functions.php (modified) (16 diffs)

trunk/src/wp-includes/functions.php

@@ -1062 +1062 @@
             $k = urlencode( $k );
         }
-        if ( is_int( $k ) && null != $prefix ) {
+
+        if ( is_int( $k ) && null !== $prefix ) {
             $k = $prefix . $k;
         }
+
         if ( ! empty( $key ) ) {
             $k = $key . '%5B' . $k . '%5D';
         }
+
         if ( null === $v ) {
             continue;
@@ -1773 +1776 @@
 
     $suppress = $wpdb->suppress_errors();
+
     if ( ! wp_installing() ) {
         $alloptions = wp_load_alloptions();
     }
+
     // If siteurl is not set to autoload, check it specifically.
     if ( ! isset( $alloptions['siteurl'] ) ) {
@@ -1782 +1787 @@
         $installed = $alloptions['siteurl'];
     }
+
     $wpdb->suppress_errors( $suppress );
 
@@ -1806 +1812 @@
     foreach ( $wp_tables as $table ) {
         // The existence of custom user tables shouldn't suggest an unwise state or prevent a clean installation.
-        if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+        if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE === $table ) {
             continue;
         }
-        if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+
+        if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE === $table ) {
             continue;
         }
@@ -2081 +2088 @@
          * the $dir_perms correctly with chmod()
          */
-        if ( ( $dir_perms & ~umask() ) != $dir_perms ) {
+        if ( ( $dir_perms & ~umask() ) !== $dir_perms ) {
             $folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
             for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
@@ -2431 +2438 @@
     $url = get_option( 'upload_url_path' );
     if ( ! $url ) {
-        if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path == $dir ) ) {
+        if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path === $dir ) ) {
             $url = WP_CONTENT_URL . '/uploads';
         } else {
@@ -3096 +3103 @@
         $real_mime = wp_get_image_mime( $file );
 
-        if ( $real_mime && $real_mime != $type ) {
+        if ( $real_mime && $real_mime !== $type ) {
             /**
              * Filters the list mapping image mime types to their respective extensions.
@@ -3123 +3130 @@
                 $new_filename     = implode( '.', $filename_parts );
 
-                if ( $new_filename != $filename ) {
+                if ( $new_filename !== $filename ) {
                     $proper_filename = $new_filename; // Mark that it changed.
                 }
+
                 // Redefine the extension / MIME.
                 $wp_filetype = wp_check_filetype( $new_filename, $mimes );
@@ -4788 +4796 @@
 
         // New subpattern?
-        if ( $firstchar != $subchar ) {
+        if ( $firstchar !== $subchar ) {
             if ( '' !== $subchar ) {
                 $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern".
                 $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
             }
+
             $subchar           = $firstchar;
             $wp_smiliessearch .= preg_quote( $firstchar, '/' ) . '(?:';
@@ -4798 +4807 @@
             $wp_smiliessearch .= '|';
         }
+
         $wp_smiliessearch .= preg_quote( $rest, '/' );
     }
@@ -5939 +5949 @@
     $server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
 
-    return ( 'lighttpd' === $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' ) );
+    return ( 'lighttpd' === $server_parts[0] && -1 === version_compare( $server_parts[1], '1.5.0' ) );
 }
 
@@ -6348 +6358 @@
         return false;
     }
+
     return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
 }
@@ -6368 +6379 @@
             return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
         }
+
         if ( 'UTC' === $a['city'] ) {
             if ( str_starts_with( $b['city'], 'GMT+' ) ) {
                 return 1;
             }
+
             return -1;
         }
+
         if ( 'UTC' === $b['city'] ) {
             if ( str_starts_with( $a['city'], 'GMT+' ) ) {
                 return -1;
             }
+
             return 1;
         }
+
         return strnatcasecmp( $a['city'], $b['city'] );
     }
-    if ( $a['t_continent'] == $b['t_continent'] ) {
-        if ( $a['t_city'] == $b['t_city'] ) {
+
+    if ( $a['t_continent'] === $b['t_continent'] ) {
+        if ( $a['t_city'] === $b['t_city'] ) {
             return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
         }
+
         return strnatcasecmp( $a['t_city'], $b['t_city'] );
     } else {
@@ -6392 +6410 @@
             return 1;
         }
+
         if ( 'Etc' === $b['continent'] ) {
             return -1;
         }
+
         return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
     }
@@ -6914 +6934 @@
 
         // Tortoise got lapped - must be a loop.
-        if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+        if ( $tortoise === $evanescent_hare || $tortoise === $hare ) {
             return $_return_loop ? $return : $tortoise;
         }
@@ -7011 +7031 @@
             $skip_frames--;
         } elseif ( isset( $call['class'] ) ) {
-            if ( $check_class && $ignore_class == $call['class'] ) {
+            if ( $check_class && $ignore_class === $call['class'] ) {
                 continue; // Filter out calls.
             }