Changeset 60904

Timestamp:

10/06/2025 11:29:14 AM (4 months ago)

Author:

swissspidy

Message:

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

Addresses a new ​deprecation in PHP 8.5 in several block-related registry classes.

Follow-up to [60809].

Props mukesh27, swissspidy.
Fixes #63957.

Location:

trunk

Files:

• src/wp-includes/class-wp-block-bindings-registry.php (modified) (1 diff)
• src/wp-includes/class-wp-block-pattern-categories-registry.php (modified) (1 diff)
• src/wp-includes/class-wp-block-patterns-registry.php (modified) (1 diff)
• src/wp-includes/class-wp-block-styles-registry.php (modified) (1 diff)
• src/wp-includes/class-wp-block-templates-registry.php (modified) (1 diff)
• tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php (modified) (1 diff)
• tests/phpunit/tests/block-pattern (added)
• tests/phpunit/tests/block-pattern/wpBlockPatternCategoriesRegistry.php (added)
• tests/phpunit/tests/block-templates/WpBlockTemplatesRegistry.php (modified) (1 diff)
• tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php (modified) (1 diff)
• tests/phpunit/tests/blocks/wpBlockStylesRegistry.php (modified) (1 diff)

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

@@ -250 +250 @@
      * @since 6.5.0
      *
-     * @param string $source_name The name of the source.
+     * @param string|null $source_name The name of the source.
      * @return bool `true` if the block bindings source is registered, `false` otherwise.
      */
     public function is_registered( $source_name ) {
-        return isset( $this->sources[ $source_name ] );
+        return isset( $source_name, $this->sources[ $source_name ] );
     }
 

trunk/src/wp-includes/class-wp-block-pattern-categories-registry.php

@@ -139 +139 @@
      * @since 5.5.0
      *
-     * @param string $category_name Pattern category name including namespace.
+     * @param string|null $category_name Pattern category name including namespace.
      * @return bool True if the pattern category is registered, false otherwise.
      */
     public function is_registered( $category_name ) {
-        return isset( $this->registered_categories[ $category_name ] );
+        return isset( $category_name, $this->registered_categories[ $category_name ] );
     }
 

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

@@ -239 +239 @@
      * @since 5.5.0
      *
-     * @param string $pattern_name Block pattern name including namespace.
+     * @param string|null $pattern_name Block pattern name including namespace.
      * @return bool True if the pattern is registered, false otherwise.
      */
     public function is_registered( $pattern_name ) {
-        return isset( $this->registered_patterns[ $pattern_name ] );
+        return isset( $pattern_name, $this->registered_patterns[ $pattern_name ] );
     }
 

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

@@ -182 +182 @@
      * @since 5.3.0
      *
-     * @param string $block_name       Block type name including namespace.
-     * @param string $block_style_name Block style name.
+     * @param string|null $block_name       Block type name including namespace.
+     * @param string|null $block_style_name Block style name.
      * @return bool True if the block style is registered, false otherwise.
      */
     public function is_registered( $block_name, $block_style_name ) {
-        return isset( $this->registered_block_styles[ $block_name ][ $block_style_name ] );
+        return isset( $block_name, $block_style_name, $this->registered_block_styles[ $block_name ][ $block_style_name ] );
     }
 

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

@@ -205 +205 @@
      * @since 6.7.0
      *
-     * @param string $template_name Template name.
+     * @param string|null $template_name Template name.
      * @return bool True if the template is registered, false otherwise.
      */
     public function is_registered( $template_name ) {
-        return isset( $this->registered_templates[ $template_name ] );
+        return isset( $template_name, $this->registered_templates[ $template_name ] );
     }
 

trunk/tests/phpunit/tests/block-bindings/wpBlockBindingsRegistry.php

@@ -345 +345 @@
         $this->assertTrue( $result );
     }
+
+    /**
+     * Should return false when checking registration with a null source name.
+     *
+     * @ticket 63957
+     *
+     * @covers WP_Block_Bindings_Registry::is_registered
+     */
+    public function test_is_registered_with_null_source_name() {
+        $result = $this->registry->is_registered( null );
+        $this->assertFalse( $result );
+    }
 }

trunk/tests/phpunit/tests/block-templates/WpBlockTemplatesRegistry.php

@@ -246 +246 @@
 
         self::$registry->unregister( $template_name );
+    }
+
+    /**
+     * @ticket 63957
+     *
+     * @covers ::is_registered
+     */
+    public function test_is_registered_with_null_template_name() {
+        $this->assertFalse( self::$registry->is_registered( null ) );
     }
 

trunk/tests/phpunit/tests/blocks/wpBlockPatternsRegistry.php

@@ -696 +696 @@
         }
     }
+
+    /**
+     * @ticket 63957
+     */
+    public function test_is_registered_with_null_pattern_name() {
+        $this->assertFalse( $this->registry->is_registered( null ) );
+    }
 }

trunk/tests/phpunit/tests/blocks/wpBlockStylesRegistry.php

@@ -67 +67 @@
         $this->assertTrue( $this->registry->is_registered( 'core/group', 'plain' ) );
     }
+
+    /**
+     * @ticket 63957
+     */
+    public function test_is_registered_returns_false_for_null_block_name() {
+        $style_name = 'fancy-style';
+        $this->assertFalse(
+            $this->registry->is_registered( null, $style_name ),
+            'Empty block name should return false.'
+        );
+    }
+
+    /**
+     * @ticket 63957
+     */
+    public function test_is_registered_returns_false_for_null_style_name() {
+        $block_name = 'core/paragraph';
+        $this->assertFalse(
+            $this->registry->is_registered( $block_name, null ),
+            'Empty style name should return false.'
+        );
+    }
+
+    /**
+     * @ticket 63957
+     */
+    public function test_is_registered_returns_false_for_both_null_params() {
+        $this->assertFalse(
+            $this->registry->is_registered( null, null ),
+            'Both empty block and style name should return false.'
+        );
+    }
 }