Changeset 47550 for trunk/src/wp-includes/theme.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/theme.php (modified) (8 diffs)

trunk/src/wp-includes/theme.php

@@ -49 +49 @@
         if ( isset( $theme_directories[ $current_theme ] ) ) {
             $root_of_current_theme = get_raw_theme_root( $current_theme );
-            if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
+            if ( ! in_array( $root_of_current_theme, $wp_theme_directories, true ) ) {
                 $root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
             }
@@ -120 +120 @@
         if ( false === $theme_root ) {
             $theme_root = WP_CONTENT_DIR . '/themes';
-        } elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+        } elseif ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
             $theme_root = WP_CONTENT_DIR . $theme_root;
         }
@@ -412 +412 @@
 
     $untrailed = untrailingslashit( $directory );
-    if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+    if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories, true ) ) {
         $wp_theme_directories[] = $untrailed;
     }
@@ -584 +584 @@
             // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
             // This gives relative theme roots the benefit of the doubt when things go haywire.
-            if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+            if ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
                 $theme_root = WP_CONTENT_DIR . $theme_root;
             }
@@ -627 +627 @@
 
     if ( $stylesheet_or_template && $theme_root ) {
-        if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
+        if ( in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
             // Absolute path. Make an educated guess. YMMV -- but note the filter below.
             if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
@@ -2739 +2739 @@
 function remove_theme_support( $feature ) {
     // Blacklist: for internal registrations not used directly by themes.
-    if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
+    if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ), true ) ) {
         return false;
     }
@@ -2847 +2847 @@
              * If no array was passed, then any type is accepted.
              */
-            if ( true === $_wp_theme_features[ $feature ] ) {  // Registered for all types
+            if ( true === $_wp_theme_features[ $feature ] ) {  // Registered for all types.
                 return true;
             }
             $content_type = $args[0];
-            return in_array( $content_type, $_wp_theme_features[ $feature ][0] );
+            return in_array( $content_type, $_wp_theme_features[ $feature ][0], true );
 
         case 'html5':
@@ -2862 +2862 @@
              */
             $type = $args[0];
-            return in_array( $type, $_wp_theme_features[ $feature ][0] );
+            return in_array( $type, $_wp_theme_features[ $feature ][0], true );
 
         case 'custom-logo':