PHP 8.5 | Utility/CaseInsensitiveDictionary: fix another set of "Usin…

…g null as an array offset" deprecation notices Fixes deprecation notices which occur if `$offset` is `null`. Fixed now via some extra defensive coding. This change is already covered via the existing tests. Ref: https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_using_values_null_as_an_array_offset_and_when_calling_array_key_exists
WordPress · jrfnl · Nov 21, 2025 · Jan 21, 2025 · Jan 21, 2025 · Feb 11, 2025
commit 3a9aeaf05d6b887a1d48d322dc1084f148d3b1d8
diff --git a/src/Utility/CaseInsensitiveDictionary.php b/src/Utility/CaseInsensitiveDictionary.php
@@ -49,6 +49,10 @@ public function offsetExists($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		return isset($this->data[$offset]);
 	}
 
@@ -64,6 +68,10 @@ public function offsetGet($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		if (!isset($this->data[$offset])) {
 			return null;
 		}
@@ -89,6 +97,10 @@ public function offsetSet($offset, $value) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		$this->data[$offset] = $value;
 	}
 
@@ -103,6 +115,10 @@ public function offsetUnset($offset) {
 			$offset = strtolower($offset);
 		}
 
+		if ($offset === null) {
+			$offset = '';
+		}
+
 		unset($this->data[$offset]);
 	}