Changeset 45639 for trunk/src/wp-includes/class-wp-customize-manager.php

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.

File:

• trunk/src/wp-includes/class-wp-customize-manager.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' ),