Fix passing a null input to h function

Fix the following deprecation warning: Deprecated (8192): htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated [APP/Vendor/cakephp/cakephp/lib/Cake/basics.php, line 231]
kamilwylegala · Dec 19, 2023 · 8473730 · 8473730
1 parent 219d13c
commit 8473730
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/Cake/Test/Case/BasicsTest.php b/lib/Cake/Test/Case/BasicsTest.php
@@ -243,6 +243,9 @@ public function testH() {
 		$obj = new CakeResponse(array('body' => 'Body content'));
 		$result = h($obj);
 		$this->assertEquals('Body content', $result);
+
+		$result = h(null);
+		$this->assertEquals('', $result);
 	}
 
 /**

diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
@@ -215,6 +215,8 @@ function h($text, $double = true, $charset = null) {
 			}
 		} elseif (is_bool($text)) {
 			return $text;
+		} elseif (is_null($text)) {
+			return '';
 		}
 
 		static $defaultCharset = false;