Merge branch '6.2' into 6.3

xabbuh · xabbuh · commit c2f9688bd115 · 2023-02-11T14:27:49.000+01:00
* 6.2:
  Fix merge
  Fix merge
  [FrameworkBundle] Improve error message in MicroKernelTrait when using deprecated configureRoutes(RouteCollectionBuilder) with symfony/routing &gt;= 6.0
  Add warning about Symfony 5.2 changing pcntl_async_signals
  [Tests] Fix static calls and Mock var annotation
  [FrameworkBundle] Fix checkboxes check assertions
  [Notifier][WebProfilerBundle] Ignore messages whose `getNotification` returns `null`
  [HttpClient] Fix over-encoding of URL parts to match browser's behavior
  Fix Psalm job
  Revert "[HttpClient] Add support for "friendsofphp/well-known-implementations""
  [HttpClient] Fix data collector
  [Tests] Migrate tests to static data providers
  [Semaphore] Fix test
  Fix: Split and clean up tests
  Remove unused data provider
  [Form] Check for `RepeatedType` child in `PasswordHasherListener`
  add Sender to the list of bypassed headers
diff --git a/Tests/Html5ParserCrawlerTest.php b/Tests/Html5ParserCrawlerTest.php
@@ -48,7 +48,7 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)
 
     public function validHtml5Provider(): iterable
     {
-        $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
+        $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
         $BOM = \chr(0xEF).\chr(0xBB).\chr(0xBF);
 
         yield 'BOM first' => [$BOM.$html];
@@ -61,7 +61,7 @@ public function validHtml5Provider(): iterable
 
     public function invalidHtml5Provider(): iterable
     {
-        $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
+        $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
 
         yield 'Text' => ['hello world'.$html];
         yield 'Text between comments' => ['<!--c--> test <!--cc-->'.$html];

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)`
`48`	`48`
`49`	`49`	`public function validHtml5Provider(): iterable`
`50`	`50`	`{`
`51`		`- $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
	`51`	`+ $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
`52`	`52`	`$BOM = \chr(0xEF).\chr(0xBB).\chr(0xBF);`
`53`	`53`
`54`	`54`	`yield 'BOM first' => [$BOM.$html];`
`@@ -61,7 +61,7 @@ public function validHtml5Provider(): iterable`
`61`	`61`
`62`	`62`	`public function invalidHtml5Provider(): iterable`
`63`	`63`	`{`
`64`		`- $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
	`64`	`+ $html = self::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';`
`65`	`65`
`66`	`66`	`yield 'Text' => ['hello world'.$html];`
`67`	`67`	`yield 'Text between comments' => ['<!--c--> test <!--cc-->'.$html];`