[#14553] - Allow null in escapeHtml

phalcon · Nov 22, 2019 · cef5d49 · cef5d49
1 parent 4ac8ee8
commit cef5d49
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/phalcon/Escaper.zep b/phalcon/Escaper.zep
@@ -121,7 +121,7 @@ class Escaper implements EscaperInterface
     /**
      * Escapes a HTML string. Internally uses htmlspecialchars
      */
-    public function escapeHtml(string text) -> string
+    public function escapeHtml(string text = null) -> string
     {
         return htmlspecialchars(
             text,
@@ -134,7 +134,7 @@ class Escaper implements EscaperInterface
     /**
      * Escapes a HTML attribute string
      */
-    public function escapeHtmlAttr(string attribute) -> string
+    public function escapeHtmlAttr(string attribute = null) -> string
     {
         return htmlspecialchars(
             attribute,

diff --git a/tests/unit/Escaper/EscapeHtmlAttrCest.php b/tests/unit/Escaper/EscapeHtmlAttrCest.php
@@ -74,6 +74,29 @@ private function escaperEscapeHtmlAttrProvider(): array
                 'expected'      => 'That&#039;s right',
                 'text'          => "That's right",
             ],
+            [
+                'htmlQuoteType' => ENT_HTML401,
+                'expected'      => '',
+                'text'          => null,
+            ],
+
+            [
+                'htmlQuoteType' => ENT_XML1,
+                'expected'      => '',
+                'text'          => null,
+            ],
+
+            [
+                'htmlQuoteType' => ENT_XHTML,
+                'expected'      => '',
+                'text'          => null,
+            ],
+
+            [
+                'htmlQuoteType' => ENT_HTML5,
+                'expected'      => '',
+                'text'          => null,
+            ],
         ];
     }
 }
diff --git a/tests/unit/Escaper/EscapeHtmlCest.php b/tests/unit/Escaper/EscapeHtmlCest.php
@@ -34,4 +34,22 @@ public function escaperEscapeHtml(UnitTester $I)
             $escaper->escapeHtml('<h1></h1>')
         );
     }
+
+    /**
+     * Tests Phalcon\Escaper :: escapeHtml() - null
+     *
+     * @author Phalcon Team <[email protected]>
+     * @since  2019-11-22
+     */
+    public function escaperEscapeHtmlNull(UnitTester $I)
+    {
+        $I->wantToTest('Escaper - escapeHtml() - null');
+
+        $escaper = new Escaper();
+
+        $I->assertEquals(
+            '',
+            $escaper->escapeHtml(null)
+        );
+    }
 }