Changeset 47550 for trunk/src/wp-includes/canonical.php

Timestamp:

04/05/2020 03:00:44 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search() where strings are involved.

This reduces the number of WordPress.PHP.StrictInArray.MissingTrueStrict issues from 486 to 50.

Includes minor code layout fixes for better readability.

See #49542.

File:

• trunk/src/wp-includes/canonical.php (modified) (4 diffs)

trunk/src/wp-includes/canonical.php

@@ -43 +43 @@
     global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
 
-    if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ), true ) ) {
         return;
     }
@@ -332 +332 @@
 
             $addl_path = '';
-            if ( is_feed() && in_array( get_query_var( 'feed' ), $wp_rewrite->feeds ) ) {
+            if ( is_feed() && in_array( get_query_var( 'feed' ), $wp_rewrite->feeds, true ) ) {
                 $addl_path = ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '';
                 if ( ! is_singular() && get_query_var( 'withcomments' ) ) {
@@ -752 +752 @@
         site_url( 'admin', 'relative' ),
     );
-    if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
+    if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins, true ) ) {
         wp_redirect( admin_url() );
         exit;
@@ -762 +762 @@
         site_url( 'login', 'relative' ),
     );
-    if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
+    if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins, true ) ) {
         wp_redirect( wp_login_url() );
         exit;