Improved null handling

packaged · Oct 4, 2022 · 4811632 · 4811632
1 parent 6f2139a
commit 4811632
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/SafeHtml.php b/src/SafeHtml.php
@@ -70,6 +70,11 @@ public function append(...$html)
    */
   public static function escape($input, $arrayGlue = ' ')
   {
+    if($input === null)
+    {
+      return new static('');
+    }
+
     if($input instanceof SafeHtml)
     {
       return $input;
@@ -85,6 +90,10 @@ public static function escape($input, $arrayGlue = ' ')
       $return = '';
       foreach($input as $iv)
       {
+        if($iv === null)
+        {
+          continue;
+        }
         $return .= $arrayGlue . static::escape($iv, $arrayGlue)->getContent();
       }
       return new static(substr($return, strlen($arrayGlue)));