Changeset 60809

Timestamp:

09/29/2025 04:28:00 PM (9 days ago)

Author:

swissspidy

Message:

Code Modernization: Fix instances of using null as an array offset.

Addresses a new ​deprecation in PHP 8.5.

Props swissspidy.
Fixes #63957.

Location:

trunk

Files:

• src/wp-includes/block-bindings.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (2 diffs)
• src/wp-includes/class-wp-block-type-registry.php (modified) (2 diffs)
• src/wp-includes/class-wp-hook.php (modified) (2 diffs)
• src/wp-includes/class-wp-theme-json.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/data/html-api/token-counting-html-processor.php (modified) (1 diff)
• tests/phpunit/tests/functions/wpArrayGet.php (modified) (1 diff)
• tests/phpunit/tests/post/isPostStatusViewable.php (modified) (1 diff)

trunk/src/wp-includes/block-bindings.php

@@ -149 +149 @@
 
     $supported_block_attributes =
-        $block_bindings_supported_attributes[ $block_type ] ??
-        array();
+        isset( $block_type, $block_bindings_supported_attributes[ $block_type ] ) ?
+            $block_bindings_supported_attributes[ $block_type ] :
+            array();
 
     /**

trunk/src/wp-includes/blocks.php

@@ -939 +939 @@
 function insert_hooked_blocks( &$parsed_anchor_block, $relative_position, $hooked_blocks, $context ) {
     $anchor_block_type  = $parsed_anchor_block['blockName'];
-    $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+    $hooked_block_types = isset( $anchor_block_type, $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
         ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
         : array();
@@ -1030 +1030 @@
 function set_ignored_hooked_blocks_metadata( &$parsed_anchor_block, $relative_position, $hooked_blocks, $context ) {
     $anchor_block_type  = $parsed_anchor_block['blockName'];
-    $hooked_block_types = isset( $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
+    $hooked_block_types = isset( $anchor_block_type, $hooked_blocks[ $anchor_block_type ][ $relative_position ] )
         ? $hooked_blocks[ $anchor_block_type ][ $relative_position ]
         : array();

trunk/src/wp-includes/class-wp-block-type-registry.php

@@ -135 +135 @@
      * @since 5.0.0
      *
-     * @param string $name Block type name including namespace.
+     * @param string|null $name Block type name including namespace.
      * @return WP_Block_Type|null The registered block type, or null if it is not registered.
      */
@@ -162 +162 @@
      * @since 5.0.0
      *
-     * @param string $name Block type name including namespace.
+     * @param string|null $name Block type name including namespace.
      * @return bool True if the block type is registered, false otherwise.
      */
     public function is_registered( $name ) {
-        return isset( $this->registered_block_types[ $name ] );
+        return isset( $name, $this->registered_block_types[ $name ] );
     }
 

trunk/src/wp-includes/class-wp-hook.php

@@ -81 +81 @@
      */
     public function add_filter( $hook_name, $callback, $priority, $accepted_args ) {
+        if ( null === $priority ) {
+            $priority = 0;
+        }
+
         $idx = _wp_filter_build_unique_id( $hook_name, $callback, $priority );
 
@@ -188 +192 @@
      */
     public function remove_filter( $hook_name, $callback, $priority ) {
+        if ( null === $priority ) {
+            $priority = 0;
+        }
+
         $function_key = _wp_filter_build_unique_id( $hook_name, $callback, $priority );
 
-        $exists = isset( $this->callbacks[ $priority ][ $function_key ] );
+        $exists = isset( $function_key, $this->callbacks[ $priority ][ $function_key ] );
 
         if ( $exists ) {

trunk/src/wp-includes/class-wp-theme-json.php

@@ -2890 +2890 @@
         $element_pseudo_allowed = array();
 
-        if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
+        if ( isset( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
             $element_pseudo_allowed = static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ];
         }

trunk/src/wp-includes/functions.php

@@ -5102 +5102 @@
              * than `array_key_exists()`.
              */
-            if ( isset( $input_array[ $path_element ] ) ) {
+            if ( isset( $path_element, $input_array[ $path_element ] ) ) {
                 $input_array = $input_array[ $path_element ];
                 continue;
@@ -5111 +5111 @@
              * which also checks for `null` values.
              */
-            if ( array_key_exists( $path_element, $input_array ) ) {
+            if ( isset( $path_element ) && array_key_exists( $path_element, $input_array ) ) {
                 $input_array = $input_array[ $path_element ];
                 continue;

trunk/tests/phpunit/data/html-api/token-counting-html-processor.php

@@ -24 +24 @@
         }
 
+        if ( null === $token_name ) {
+            $token_name = '';
+        }
+
         if ( ! isset( $this->token_seen_count[ $token_name ] ) ) {
             $this->token_seen_count[ $token_name ] = 1;

trunk/tests/phpunit/tests/functions/wpArrayGet.php

@@ -239 +239 @@
             true
         );
-
-        $this->assertSame(
-            _wp_array_get(
-                array(
-                    'key' => array(
-                        null => 4,
-                    ),
-                ),
-                array( 'key', null ),
-                true
-            ),
-            4
-        );
     }
 

trunk/tests/phpunit/tests/post/isPostStatusViewable.php

@@ -141 +141 @@
             array( true, false ),
             array( 20, false ),
-            array( null, false ),
             array( '', false ),
         );