Merge branch '6.2' into 6.3

* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`

Author: nicolas-grekas

Tests/HtmlSanitizerAllTest.php

@@ -38,7 +38,7 @@ public function testSanitizeHead(string $input, string $expected)
         $this->assertSame($expected, $this->createSanitizer()->sanitizeFor('head', $input));
     }
 
-    public function provideSanitizeHead()
+    public static function provideSanitizeHead()
     {
         $cases = [
             // Scripts
@@ -71,7 +71,7 @@ public function testSanitizeBody(string $input, string $expected)
         $this->assertSame($expected, $this->createSanitizer()->sanitize($input));
     }
 
-    public function provideSanitizeBody()
+    public static function provideSanitizeBody()
     {
         $cases = [
             // Text

Tests/TextSanitizer/StringSanitizerTest.php

@@ -16,7 +16,7 @@
 
 class StringSanitizerTest extends TestCase
 {
-    public function provideHtmlLower()
+    public static function provideHtmlLower()
     {
         $cases = [
             'exampleAttr' => 'exampleattr',
@@ -38,7 +38,7 @@ public function testHtmlLower(string $input, string $expected)
         $this->assertSame($expected, StringSanitizer::htmlLower($input));
     }
 
-    public function provideEncodeHtmlEntites()
+    public static function provideEncodeHtmlEntites()
     {
         $cases = [
             '' => '',

Tests/TextSanitizer/UrlSanitizerTest.php

@@ -24,7 +24,7 @@ public function testSanitize(?string $input, ?array $allowedSchemes, ?array $all
         $this->assertSame($expected, UrlSanitizer::sanitize($input, $allowedSchemes, $forceHttps, $allowedHosts, $allowRelative));
     }
 
-    public function provideSanitize()
+    public static function provideSanitize()
     {
         // Simple accepted cases
         yield [
@@ -312,7 +312,7 @@ public function testParse(string $url, ?array $expected)
         }
     }
 
-    public function provideParse(): iterable
+    public static function provideParse(): iterable
     {
         $urls = [
             '' => null,