Changeset 45639 for trunk/src/wp-includes/theme.php

Timestamp:

07/15/2019 06:24:08 AM (6 years ago)

Author:

pento

Message:

Code Modernisation: Fix known instances of array access on data types that can't be accessed as arrays.

PHP 7.4 addes a warning when trying access a null/bool/int/float/resource (everything but array, string and object) as if it were an array.

This change fixes all of these warnings visible in unit tests.

Props jrf.
See #47704.

File:

• trunk/src/wp-includes/theme.php (modified) (6 diffs)

trunk/src/wp-includes/theme.php

@@ -2372 +2372 @@
              * for post thumbnails.
              */
-            if ( is_array( $args[0] ) && isset( $_wp_theme_features['post-thumbnails'] ) ) {
+            if ( isset( $args[0] ) && is_array( $args[0] ) && isset( $_wp_theme_features['post-thumbnails'] ) ) {
                 $args[0] = array_unique( array_merge( $_wp_theme_features['post-thumbnails'][0], $args[0] ) );
             }
@@ -2379 +2379 @@
 
         case 'post-formats':
-            if ( is_array( $args[0] ) ) {
+            if ( isset( $args[0] ) && is_array( $args[0] ) ) {
                 $post_formats = get_post_format_slugs();
                 unset( $post_formats['standard'] );
@@ -2392 +2392 @@
                 // Build an array of types for back-compat.
                 $args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
-            } elseif ( ! is_array( $args[0] ) ) {
+            } elseif ( ! isset( $args[0] ) || ! is_array( $args[0] ) ) {
                 _doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' );
                 return false;
@@ -2404 +2404 @@
 
         case 'custom-logo':
-            if ( ! is_array( $args ) ) {
+            if ( true === $args ) {
                 $args = array( 0 => array() );
             }
@@ -2427 +2427 @@
 
         case 'custom-header':
-            if ( ! is_array( $args ) ) {
+            if ( true === $args ) {
                 $args = array( 0 => array() );
             }
@@ -2517 +2517 @@
 
         case 'custom-background':
-            if ( ! is_array( $args ) ) {
+            if ( true === $args ) {
                 $args = array( 0 => array() );
             }