Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 6571e5166f1a · 2022-05-04T16:46:38.000+02:00
* 5.4:
  Remove former core members from code owners
  [Form] fix populating single widget time view data with different timezones
  [DomCrawler][VarDumper] Fix html-encoding emojis
diff --git a/Crawler.php b/Crawler.php
@@ -1075,11 +1075,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
         set_error_handler(function () { throw new \Exception(); });
 
         try {
-            return mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], $charset);
+            return mb_encode_numericentity($htmlContent, [0x80, 0x10FFFF, 0, 0x1FFFFF], $charset);
         } catch (\Exception|\ValueError $e) {
             try {
                 $htmlContent = iconv($charset, 'UTF-8', $htmlContent);
-                $htmlContent = mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
+                $htmlContent = mb_encode_numericentity($htmlContent, [0x80, 0x10FFFF, 0, 0x1FFFFF], 'UTF-8');
             } catch (\Exception|\ValueError $e) {
             }
 
diff --git a/Tests/AbstractCrawlerTest.php b/Tests/AbstractCrawlerTest.php
@@ -371,6 +371,13 @@ public function testHtml()
         $this->assertSame('my value', $this->createTestCrawler(null)->filterXPath('//ol')->html('my value'));
     }
 
+    public function testEmojis()
+    {
+        $crawler = $this->createCrawler('<body><p>Hey 👋</p></body>');
+
+        $this->assertSame('<body><p>Hey 👋</p></body>', $crawler->html());
+    }
+
     public function testExtract()
     {
         $crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,13 @@ public function testHtml()`
`371`	`371`	`$this->assertSame('my value', $this->createTestCrawler(null)->filterXPath('//ol')->html('my value'));`
`372`	`372`	`}`
`373`	`373`
	`374`	`+ public function testEmojis()`
	`375`	`+ {`
	`376`	`+ $crawler = $this->createCrawler('<body><p>Hey 👋</p></body>');`
	`377`	`+`
	`378`	`+ $this->assertSame('<body><p>Hey 👋</p></body>', $crawler->html());`
	`379`	`+ }`
	`380`	`+`
`374`	`381`	`public function testExtract()`
`375`	`382`	`{`
`376`	`383`	`$crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');`