Return empty string if null is passed to escape view helper

monthly-basis · Jul 15, 2021 · 1baedec · 1baedec
1 parent 17551b0
commit 1baedec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/View/Helper/Escape.php b/src/View/Helper/Escape.php
@@ -12,13 +12,7 @@ public function __construct(
         $this->escapeService = $escapeService;
     }
 
-    /**
-     * Invoke.
-     *
-     * @param string $string
-     * @return string
-     */
-    public function __invoke(string $string) : string
+    public function __invoke(string $string = null): string
     {
         return $this->escapeService->escape($string);
     }

diff --git a/test/View/Helper/EscapeTest.php b/test/View/Helper/EscapeTest.php
@@ -15,14 +15,6 @@ protected function setUp(): void
         );
     }
 
-    public function testInitialize()
-    {
-        $this->assertInstanceOf(
-            StringHelper\Escape::class,
-            $this->escapeHelper
-        );
-    }
-
     public function testInvoke()
     {
         $this->assertSame(
@@ -41,5 +33,10 @@ public function testInvoke()
             '&quot;&gt;attempt injection after attribute',
             $this->escapeHelper->__invoke($string)
         );
+
+        $this->assertSame(
+            '',
+            $this->escapeHelper->__invoke(null)
+        );
     }
 }