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

Timestamp:

05/16/2020 06:40:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict comparison where static strings are involved.

This reduces the number of WordPress.PHP.StrictComparisons.LooseComparison issues in half, from 1897 to 890.

Includes minor code layout fixes for better readability.

See #49542.

File:

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

trunk/src/wp-includes/functions.php

@@ -641 +641 @@
     }
     $data = trim( $data );
-    if ( 'N;' == $data ) {
+    if ( 'N;' === $data ) {
         return true;
     }
@@ -1518 +1518 @@
  */
 function bool_from_yn( $yn ) {
-    return ( strtolower( $yn ) == 'y' );
+    return ( 'y' === strtolower( $yn ) );
 }
 
@@ -1541 +1541 @@
     $feed = preg_replace( '/^_+/', '', $feed );
 
-    if ( '' == $feed || 'feed' === $feed ) {
+    if ( '' === $feed || 'feed' === $feed ) {
         $feed = get_default_feed();
     }
@@ -1842 +1842 @@
         echo $referer_field;
     }
+
     return $referer_field;
 }
@@ -1861 +1862 @@
 function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
     $ref = wp_get_original_referer();
+
     if ( ! $ref ) {
-        $ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
-    }
+        $ref = ( 'previous' === $jump_back_to ) ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
+    }
+
     $orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
+
     if ( $echo ) {
         echo $orig_referer_field;
     }
+
     return $orig_referer_field;
 }
@@ -1973 +1978 @@
     // We need to find the permissions of the parent folder that exists and inherit that.
     $target_parent = dirname( $target );
-    while ( '.' != $target_parent && ! is_dir( $target_parent ) && dirname( $target_parent ) !== $target_parent ) {
+    while ( '.' !== $target_parent && ! is_dir( $target_parent ) && dirname( $target_parent ) !== $target_parent ) {
         $target_parent = dirname( $target_parent );
     }
@@ -2335 +2340 @@
     $upload_path = trim( get_option( 'upload_path' ) );
 
-    if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
+    if ( empty( $upload_path ) || 'wp-content/uploads' === $upload_path ) {
         $dir = WP_CONTENT_DIR . '/uploads';
     } elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
@@ -2346 +2351 @@
     $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 {
@@ -3212 +3217 @@
  */
 function wp_nonce_ays( $action ) {
-    if ( 'log-out' == $action ) {
+    if ( 'log-out' === $action ) {
         $html = sprintf(
             /* translators: %s: Site title. */
@@ -3540 +3545 @@
 
         <?php
-        if ( 'rtl' == $text_direction ) {
+        if ( 'rtl' === $text_direction ) {
             echo 'body { font-family: Tahoma, Arial; }';
         }
@@ -4334 +4339 @@
         // New subpattern?
         if ( $firstchar != $subchar ) {
-            if ( '' != $subchar ) {
+            if ( '' !== $subchar ) {
                 $wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern".
                 $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
@@ -5215 +5220 @@
     $server_parts    = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
     $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' ) );
 }
 
@@ -5249 +5255 @@
         }
     }
+
     return $default;
 }
@@ -5275 +5282 @@
          * via ISAPI then pretty permalinks will not work.
          */
-        $supports_permalinks = class_exists( 'DOMDocument', false ) && isset( $_SERVER['IIS_UrlRewriteModule'] ) && ( PHP_SAPI == 'cgi-fcgi' );
+        $supports_permalinks = class_exists( 'DOMDocument', false ) && isset( $_SERVER['IIS_UrlRewriteModule'] ) && ( 'cgi-fcgi' === PHP_SAPI );
     }
 
@@ -5325 +5332 @@
 
     // Absolute Windows drive paths are not allowed:
-    if ( ':' == substr( $file, 1, 1 ) ) {
+    if ( ':' === substr( $file, 1, 1 ) ) {
         return 2;
     }
@@ -5365 +5372 @@
  */
 function wp_guess_url() {
-    if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL ) {
+    if ( defined( 'WP_SITEURL' ) && '' !== WP_SITEURL ) {
         $url = WP_SITEURL;
     } else {
@@ -5376 +5383 @@
 
             // The request is for a file in ABSPATH.
-        } elseif ( $script_filename_dir . '/' == $abspath_fix ) {
+        } elseif ( $script_filename_dir . '/' === $abspath_fix ) {
             // Strip off any file/query params in the path.
             $path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
@@ -5936 +5943 @@
         $del_post = get_post( $post_id );
 
-        if ( ! $del_post || 'trash' != $del_post->post_status ) {
+        if ( ! $del_post || 'trash' !== $del_post->post_status ) {
             delete_post_meta( $post_id, '_wp_trash_meta_status' );
             delete_post_meta( $post_id, '_wp_trash_meta_time' );
@@ -5954 +5961 @@
         $del_comment = get_comment( $comment_id );
 
-        if ( ! $del_comment || 'trash' != $del_comment->comment_approved ) {
+        if ( ! $del_comment || 'trash' !== $del_comment->comment_approved ) {
             delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
             delete_comment_meta( $comment_id, '_wp_trash_meta_status' );