Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 9db71953599c · 2023-01-20T18:48:01.000+01:00
* 6.2:
  Update ComposerPlugin.php
  [Notifier] [OvhCloud] handle invalid receiver
  [Security] Return default value instead of deferring to lower prio resolvers when using #[CurrentUser] and no user is found
  [Cache] fix collecting cache stats when nesting computations
  [VarDumper] Fix JS to expand / collapse
  [Validator] Fix Email validator logic
  Fix user_identifier support after username has been deprecated in favor of it.
  [Tests] Remove `$this` occurrences in future static data providers
  [PropertyInfo] Fixes constructor extractor for mixed type
  use method_exists() instead of catching reflection exceptions
diff --git a/Tests/Html5ParserCrawlerTest.php b/Tests/Html5ParserCrawlerTest.php
@@ -48,20 +48,20 @@ public function testHtml5ParserWithInvalidHeadedContent(string $content)
 
     public function validHtml5Provider(): iterable
     {
-        $html = $this->getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
+        $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
         $BOM = \chr(0xEF).\chr(0xBB).\chr(0xBF);
 
         yield 'BOM first' => [$BOM.$html];
         yield 'Single comment' => ['<!-- comment -->'.$html];
         yield 'Multiline comment' => ["<!-- \n multiline comment \n -->".$html];
         yield 'Several comments' => ['<!--c--> <!--cc-->'.$html];
         yield 'Whitespaces' => ['    '.$html];
-        yield 'All together' => [$BOM.'  '.'<!--c-->'.$html];
+        yield 'All together' => [$BOM.'  <!--c-->'.$html];
     }
 
     public function invalidHtml5Provider(): iterable
     {
-        $html = $this->getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
+        $html = static::getDoctype().'<html><body><h1><p>Foo</p></h1></body></html>';
 
         yield 'Text' => ['hello world'.$html];
         yield 'Text between comments' => ['<!--c--> test <!--cc-->'.$html];
