Changeset 45639

Timestamp:

07/15/2019 06:24:08 AM (5 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.

Location:

trunk

Files:

• src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php (modified) (2 diffs)
• src/wp-includes/meta.php (modified) (1 diff)
• src/wp-includes/rest-api/class-wp-rest-request.php (modified) (2 diffs)
• src/wp-includes/theme.php (modified) (6 diffs)
• src/wp-includes/user.php (modified) (1 diff)
• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/query/generatePostdata.php (modified) (1 diff)
• tests/phpunit/tests/term/termExists.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -5099 +5099 @@
                     'section'       => 'title_tagline',
                     'priority'      => 8,
-                    'height'        => $custom_logo_args[0]['height'],
-                    'width'         => $custom_logo_args[0]['width'],
-                    'flex_height'   => $custom_logo_args[0]['flex-height'],
-                    'flex_width'    => $custom_logo_args[0]['flex-width'],
+                    'height'        => isset( $custom_logo_args[0]['height'] ) ? $custom_logo_args[0]['height'] : null,
+                    'width'         => isset( $custom_logo_args[0]['width'] ) ? $custom_logo_args[0]['width'] : null,
+                    'flex_height'   => isset( $custom_logo_args[0]['flex-height'] ) ? $custom_logo_args[0]['flex-height'] : null,
+                    'flex_width'    => isset( $custom_logo_args[0]['flex-width'] ) ? $custom_logo_args[0]['flex-width'] : null,
                     'button_labels' => array(
                         'select'       => __( 'Select logo' ),

trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php

@@ -478 +478 @@
     public function filter_wp_get_nav_menu_items( $items, $menu, $args ) {
         $this_item                = $this->value();
-        $current_nav_menu_term_id = $this_item['nav_menu_term_id'];
-        unset( $this_item['nav_menu_term_id'] );
+        $current_nav_menu_term_id = null;
+        if ( isset( $this_item['nav_menu_term_id'] ) ) {
+            $current_nav_menu_term_id = $this_item['nav_menu_term_id'];
+            unset( $this_item['nav_menu_term_id'] );
+        }
 
         $should_filter = (
@@ -494 +497 @@
             false === $this_item
             ||
-            true === $this_item['_invalid']
+            ( isset( $this_item['_invalid'] ) && true === $this_item['_invalid'] )
             ||
             (

trunk/src/wp-includes/meta.php

@@ -524 +524 @@
     if ( ! $meta_cache ) {
         $meta_cache = update_meta_cache( $meta_type, array( $object_id ) );
-        $meta_cache = $meta_cache[ $object_id ];
+        if ( isset( $meta_cache[ $object_id ] ) ) {
+            $meta_cache = $meta_cache[ $object_id ];
+        } else {
+            $meta_cache = null;
+        }
     }
 

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -295 +295 @@
      * @since 4.4.0
      *
-     * @return array Map containing 'value' and 'parameters' keys.
+     * @return array|null Map containing 'value' and 'parameters' keys
+     *                    or null when no valid content-type header was
+     *                    available.
      */
     public function get_content_type() {
@@ -335 +337 @@
 
         $content_type = $this->get_content_type();
-        if ( $content_type['value'] === 'application/json' ) {
+        if ( isset( $content_type['value'] ) && 'application/json' === $content_type['value'] ) {
             $order[] = 'JSON';
         }

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() );
             }

trunk/src/wp-includes/user.php

@@ -2089 +2089 @@
             /** This filter is documented in wp-includes/pluggable.php */
             $default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false );
-            $remember            = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life );
+            $remember            = false;
+            if ( false !== $logged_in_cookie && ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life ) {
+                $remember = true;
+            }
 
             wp_set_auth_cookie( $ID, $remember );

trunk/src/wp-includes/wp-db.php

@@ -3114 +3114 @@
                 if ( ! empty( $value['db'] ) ) {
                     // We're going to need to truncate by characters or bytes, depending on the length value we have.
-                    if ( 'byte' === $value['length']['type'] ) {
+                    if ( isset( $value['length']['type'] ) && 'byte' === $value['length']['type'] ) {
                         // Using binary causes LEFT() to truncate by bytes.
                         $charset = 'binary';

trunk/tests/phpunit/tests/query/generatePostdata.php

@@ -25 +25 @@
 
         // Fails because there's no post with this ID.
-        $this->assertNotSame( $fake->ID, $data['id'] );
+        $this->assertFalse( $data );
     }
 

trunk/tests/phpunit/tests/term/termExists.php

@@ -151 +151 @@
         _unregister_taxonomy( 'foo' );
 
-        $this->assertSame( null, $found['term_id'] );
+        $this->assertSame( null, $found );
     }