From a6cf78ca4d3c1968ff443556e86af757ee4497fe Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Mon, 6 Oct 2025 11:31:33 +0000
Subject: [PATCH] Code Modernization: Fix instances of using `null` as an array
 offset.

Addresses a new [https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_using_values_null_as_an_array_offset_and_when_calling_array_key_exists deprecation in PHP 8.5] in several block-related registry classes.

Follow-up to [60809].

Props mukesh27, swissspidy.
Fixes #63957.
Built from https://develop.svn.wordpress.org/trunk@60904


git-svn-id: http://core.svn.wordpress.org/trunk@60240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-block-bindings-registry.php           | 4 ++--
 wp-includes/class-wp-block-pattern-categories-registry.php | 4 ++--
 wp-includes/class-wp-block-patterns-registry.php           | 4 ++--
 wp-includes/class-wp-block-styles-registry.php             | 6 +++---
 wp-includes/class-wp-block-templates-registry.php          | 4 ++--
 wp-includes/version.php                                    | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wp-includes/class-wp-block-bindings-registry.php b/wp-includes/class-wp-block-bindings-registry.php
index dc065356c5..519453d22b 100644
--- a/wp-includes/class-wp-block-bindings-registry.php
+++ b/wp-includes/class-wp-block-bindings-registry.php
@@ -249,11 +249,11 @@ final class WP_Block_Bindings_Registry {
 	 *
 	 * @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 ] );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-block-pattern-categories-registry.php b/wp-includes/class-wp-block-pattern-categories-registry.php
index 2d5fbcf2fe..05ddce8af0 100644
--- a/wp-includes/class-wp-block-pattern-categories-registry.php
+++ b/wp-includes/class-wp-block-pattern-categories-registry.php
@@ -138,11 +138,11 @@ final class WP_Block_Pattern_Categories_Registry {
 	 *
 	 * @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 ] );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-block-patterns-registry.php b/wp-includes/class-wp-block-patterns-registry.php
index 2afa8a853f..4667979fc7 100644
--- a/wp-includes/class-wp-block-patterns-registry.php
+++ b/wp-includes/class-wp-block-patterns-registry.php
@@ -238,11 +238,11 @@ final class WP_Block_Patterns_Registry {
 	 *
 	 * @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 ] );
 	}
 
 	public function __wakeup() {
diff --git a/wp-includes/class-wp-block-styles-registry.php b/wp-includes/class-wp-block-styles-registry.php
index 8fb5e2eb23..60c7998985 100644
--- a/wp-includes/class-wp-block-styles-registry.php
+++ b/wp-includes/class-wp-block-styles-registry.php
@@ -181,12 +181,12 @@ final class WP_Block_Styles_Registry {
 	 *
 	 * @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 ] );
 	}
 
 	/**
diff --git a/wp-includes/class-wp-block-templates-registry.php b/wp-includes/class-wp-block-templates-registry.php
index 1a1c259dba..966eb1e65b 100644
--- a/wp-includes/class-wp-block-templates-registry.php
+++ b/wp-includes/class-wp-block-templates-registry.php
@@ -204,11 +204,11 @@ final class WP_Block_Templates_Registry {
 	 *
 	 * @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 ] );
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e78b6537bf..745830ae83 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60903';
+$wp_version = '6.9-alpha-60904';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.