Fix ErrorHandler quoting tests

rob006 · May 30, 2024 · ff3aee3 · ff3aee3
1 parent 920ce26
commit ff3aee3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -0,0 +1 @@
+{"version":1,"defects":{"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #0":3,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #2":3,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #3":3,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncodeWithUnicodeSequence":3},"times":{"yiiunit\\framework\\web\\ErrorHandlerTest::testCorrectResponseCodeInErrorView":0.005,"yiiunit\\framework\\web\\ErrorHandlerTest::testFormatRaw":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testFormatXml":0.001,"yiiunit\\framework\\web\\ErrorHandlerTest::testClearAssetFilesInErrorView":0.001,"yiiunit\\framework\\web\\ErrorHandlerTest::testClearAssetFilesInErrorActionView":0.002,"yiiunit\\framework\\web\\ErrorHandlerTest::testRenderCallStackItem":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #0":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #1":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #2":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #3":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #4":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncode with data set #5":0,"yiiunit\\framework\\web\\ErrorHandlerTest::testHtmlEncodeWithUnicodeSequence":0}}
diff --git a/tests/framework/web/ErrorHandlerTest.php b/tests/framework/web/ErrorHandlerTest.php
@@ -131,19 +131,19 @@ public function dataHtmlEncode()
         return [
             [
                 "a \t=<>&\"'\x80`\n",
-                "a \t=&lt;&gt;&amp;\"'�`\n",
+                "a \t=&lt;&gt;&amp;&quot;&apos;�`\n",
             ],
             [
                 '<b>test</b>',
                 '&lt;b&gt;test&lt;/b&gt;',
             ],
             [
                 '"hello"',
-                '"hello"',
+                '&quot;hello&quot;',
             ],
             [
                 "'hello world'",
-                "'hello world'",
+                "&apos;hello world&apos;",
             ],
             [
                 'Chip&amp;Dale',
@@ -171,7 +171,7 @@ public function testHtmlEncodeWithUnicodeSequence()
         $handler = Yii::$app->getErrorHandler();
 
         $text = "a \t=<>&\"'\x80\u{20bd}`\u{000a}\u{000c}\u{0000}";
-        $expected = "a \t=&lt;&gt;&amp;\"'�₽`\n\u{000c}\u{0000}";
+        $expected = "a \t=&lt;&gt;&amp;&quot;&apos;�₽`\n\u{000c}\u{0000}";
 
         $this->assertSame($expected, $handler->htmlEncode($text));
     }