Changeset 47550 for trunk/src/wp-includes/general-template.php

Timestamp:

04/05/2020 03:00:44 AM (4 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/general-template.php (modified) (4 diffs)

trunk/src/wp-includes/general-template.php

@@ -3234 +3234 @@
             }
 
-            if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
+            if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ), true ) ) {
                 $parsed = wp_parse_url( $url );
 
@@ -3259 +3259 @@
 
             foreach ( $atts as $attr => $value ) {
-                if ( ! is_scalar( $value ) ||
-                    ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ) ) ) {
+                if ( ! is_scalar( $value )
+                    || ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ) )
+                ) {
 
                     continue;
@@ -3304 +3305 @@
                 $parsed     = wp_parse_url( $dependency->src );
 
-                if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
+                if ( ! empty( $parsed['host'] )
+                    && ! in_array( $parsed['host'], $unique_hosts, true ) && $parsed['host'] !== $_SERVER['SERVER_NAME']
+                ) {
                     $unique_hosts[] = $parsed['host'];
                 }
@@ -3372 +3375 @@
     if ( wp_get_current_user() ) { // Look for cookie.
         $ed = get_user_setting( 'editor', 'tinymce' );
-        $r  = ( in_array( $ed, array( 'tinymce', 'html', 'test' ) ) ) ? $ed : $r;
+        $r  = ( in_array( $ed, array( 'tinymce', 'html', 'test' ), true ) ) ? $ed : $r;
     }