Changeset 47219 for trunk/src/wp-includes/functions.php

Timestamp:

02/09/2020 04:52:28 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use Yoda conditions where appropriate.

See #49222.

File:

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

trunk/src/wp-includes/functions.php

@@ -687 +687 @@
     } elseif ( ';' !== substr( $data, -1 ) ) {
         return false;
-    } elseif ( $data[0] !== 's' ) {
+    } elseif ( 's' !== $data[0] ) {
         return false;
     } elseif ( '"' !== substr( $data, -2, 1 ) ) {
@@ -1014 +1014 @@
             $k = urlencode( $k );
         }
-        if ( is_int( $k ) && $prefix != null ) {
+        if ( is_int( $k ) && null != $prefix ) {
             $k = $prefix . $k;
         }
@@ -1020 +1020 @@
             $k = $key . '%5B' . $k . '%5D';
         }
-        if ( $v === null ) {
+        if ( null === $v ) {
             continue;
-        } elseif ( $v === false ) {
+        } elseif ( false === $v ) {
             $v = '0';
         }
@@ -1133 +1133 @@
 
     foreach ( $qs as $k => $v ) {
-        if ( $v === false ) {
+        if ( false === $v ) {
             unset( $qs[ $k ] );
         }
@@ -1540 +1540 @@
     $feed = preg_replace( '/^_+/', '', $feed );
 
-    if ( $feed == '' || $feed == 'feed' ) {
+    if ( '' == $feed || 'feed' === $feed ) {
         $feed = get_default_feed();
     }
@@ -1886 +1886 @@
     $ref = wp_get_raw_referer();
 
-    if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) && $ref !== home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
+    if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref && home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref ) {
         return wp_validate_redirect( $ref, false );
     }
@@ -1948 +1948 @@
 
     // Put the wrapper back on the target.
-    if ( $wrapper !== null ) {
+    if ( null !== $wrapper ) {
         $target = $wrapper . '://' . $target;
     }
@@ -1990 +1990 @@
          * the $dir_perms correctly with chmod()
          */
-        if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
+        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++ ) {
@@ -2030 +2030 @@
     }
 
-    if ( strlen( $path ) == 0 || $path[0] == '.' ) {
+    if ( strlen( $path ) == 0 || '.' === $path[0] ) {
         return false;
     }
@@ -2040 +2040 @@
 
     // A path starting with / or \ is absolute; anything else is relative.
-    return ( $path[0] == '/' || $path[0] == '\\' );
+    return ( '/' === $path[0] || '\\' === $path[0] );
 }
 
@@ -2186 +2186 @@
  */
 function win_is_writable( $path ) {
-    if ( $path[ strlen( $path ) - 1 ] == '/' ) {
+    if ( '/' === $path[ strlen( $path ) - 1 ] ) {
         // If it looks like a directory, check a random file within the directory.
         return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp' );
@@ -2198 +2198 @@
 
     $f = @fopen( $path, 'a' );
-    if ( $f === false ) {
+    if ( false === $f ) {
         return false;
     }
@@ -2634 +2634 @@
     $upload = wp_upload_dir( $time );
 
-    if ( $upload['error'] !== false ) {
+    if ( false !== $upload['error'] ) {
         return $upload;
     }
@@ -4322 +4322 @@
         // New subpattern?
         if ( $firstchar != $subchar ) {
-            if ( $subchar != '' ) {
+            if ( '' != $subchar ) {
                 $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern".
                 $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
@@ -5462 +5462 @@
     $site_id = (int) $site_id;
 
-    return $site_id === get_main_site_id( $network_id );
+    return get_main_site_id( $network_id ) === $site_id;
 }
 
@@ -5506 +5506 @@
     $network_id = (int) $network_id;
 
-    return ( $network_id === get_main_network_id() );
+    return ( get_main_network_id() === $network_id );
 }
 
@@ -7514 +7514 @@
     }
 
-    if ( $max_execution_time === null ) {
+    if ( null === $max_execution_time ) {
         // Keep the previous behavior but attempt to prevent fatal errors from timeout if possible.
         if ( function_exists( 'ini_get' ) ) {
@@ -7533 +7533 @@
         while ( ( $file = readdir( $handle ) ) !== false ) {
             $path = $directory . '/' . $file;
-            if ( $file != '.' && $file != '..' ) {
+            if ( '.' !== $file && '..' !== $file ) {
                 if ( is_file( $path ) ) {
                     $size += filesize( $path );