Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit efc074765e98 · 2023-02-14T10:04:20.000+01:00
* 6.2:
  Fix merge
  Migrate to `static` data providers using `rector/rector`
diff --git a/Tests/CssSelectorConverterTest.php b/Tests/CssSelectorConverterTest.php
@@ -60,7 +60,7 @@ public function testCssToXPathWithoutPrefix($css, $xpath)
         $this->assertEquals($xpath, $converter->toXPath($css, ''), '->parse() parses an input string and returns a node');
     }
 
-    public function getCssToXPathWithoutPrefixTestData()
+    public static function getCssToXPathWithoutPrefixTestData()
     {
         return [
             ['h1', 'h1'],
diff --git a/Tests/Node/SpecificityTest.php b/Tests/Node/SpecificityTest.php
@@ -28,7 +28,7 @@ public function testPlusValue(Specificity $specificity, $value)
         $this->assertEquals($value + 123, $specificity->plus(new Specificity(1, 2, 3))->getValue());
     }
 
-    public function getValueTestData()
+    public static function getValueTestData()
     {
         return [
             [new Specificity(0, 0, 0), 0],
@@ -45,7 +45,7 @@ public function testCompareTo(Specificity $a, Specificity $b, $result)
         $this->assertEquals($result, $a->compareTo($b));
     }
 
-    public function getCompareTestData()
+    public static function getCompareTestData()
     {
         return [
             [new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0],
diff --git a/Tests/Parser/Handler/AbstractHandlerTestCase.php b/Tests/Parser/Handler/AbstractHandlerTestCase.php
@@ -43,9 +43,9 @@ public function testDontHandleValue($value)
         $this->assertRemainingContent($reader, $value);
     }
 
-    abstract public function getHandleValueTestData();
+    abstract public static function getHandleValueTestData();
 
-    abstract public function getDontHandleValueTestData();
+    abstract public static function getDontHandleValueTestData();
 
     abstract protected function generateHandler();
 
diff --git a/Tests/Parser/Handler/CommentHandlerTest.php b/Tests/Parser/Handler/CommentHandlerTest.php
@@ -30,7 +30,7 @@ public function testHandleValue($value, Token $unusedArgument, $remainingContent
         $this->assertRemainingContent($reader, $remainingContent);
     }
 
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             // 2nd argument only exists for inherited method compatibility
@@ -39,7 +39,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['>'],
diff --git a/Tests/Parser/Handler/HashHandlerTest.php b/Tests/Parser/Handler/HashHandlerTest.php
@@ -18,7 +18,7 @@
 
 class HashHandlerTest extends AbstractHandlerTestCase
 {
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             ['#id', new Token(Token::TYPE_HASH, 'id', 0), ''],
@@ -29,7 +29,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['id'],
diff --git a/Tests/Parser/Handler/IdentifierHandlerTest.php b/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -18,7 +18,7 @@
 
 class IdentifierHandlerTest extends AbstractHandlerTestCase
 {
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             ['foo', new Token(Token::TYPE_IDENTIFIER, 'foo', 0), ''],
@@ -29,7 +29,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['>'],
diff --git a/Tests/Parser/Handler/NumberHandlerTest.php b/Tests/Parser/Handler/NumberHandlerTest.php
@@ -17,7 +17,7 @@
 
 class NumberHandlerTest extends AbstractHandlerTestCase
 {
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             ['12', new Token(Token::TYPE_NUMBER, '12', 0), ''],
@@ -30,7 +30,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['hello'],
diff --git a/Tests/Parser/Handler/StringHandlerTest.php b/Tests/Parser/Handler/StringHandlerTest.php
@@ -18,7 +18,7 @@
 
 class StringHandlerTest extends AbstractHandlerTestCase
 {
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             ['"hello"', new Token(Token::TYPE_STRING, 'hello', 1), ''],
@@ -31,7 +31,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['hello'],
diff --git a/Tests/Parser/Handler/WhitespaceHandlerTest.php b/Tests/Parser/Handler/WhitespaceHandlerTest.php
@@ -16,7 +16,7 @@
 
 class WhitespaceHandlerTest extends AbstractHandlerTestCase
 {
-    public function getHandleValueTestData()
+    public static function getHandleValueTestData()
     {
         return [
             [' ', new Token(Token::TYPE_WHITESPACE, ' ', 0), ''],
@@ -28,7 +28,7 @@ public function getHandleValueTestData()
         ];
     }
 
-    public function getDontHandleValueTestData()
+    public static function getDontHandleValueTestData()
     {
         return [
             ['>'],
diff --git a/Tests/Parser/ParserTest.php b/Tests/Parser/ParserTest.php
@@ -91,7 +91,7 @@ public function testParseSeriesException($series)
         Parser::parseSeries($function->getArguments());
     }
 
-    public function getParserTestData()
+    public static function getParserTestData()
     {
         return [
             ['*', ['Element[*]']],
@@ -149,7 +149,7 @@ public function getParserTestData()
         ];
     }
 
-    public function getParserExceptionTestData()
+    public static function getParserExceptionTestData()
     {
         return [
             ['attributes(href)/html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],
@@ -179,7 +179,7 @@ public function getParserExceptionTestData()
         ];
     }
 
-    public function getPseudoElementsTestData()
+    public static function getPseudoElementsTestData()
     {
         return [
             ['foo', 'Element[foo]', ''],
@@ -201,7 +201,7 @@ public function getPseudoElementsTestData()
         ];
     }
 
-    public function getSpecificityTestData()
+    public static function getSpecificityTestData()
     {
         return [
             ['*', 0],
@@ -229,7 +229,7 @@ public function getSpecificityTestData()
         ];
     }
 
-    public function getParseSeriesTestData()
+    public static function getParseSeriesTestData()
     {
         return [
             ['1n+3', 1, 3],
@@ -251,7 +251,7 @@ public function getParseSeriesTestData()
         ];
     }
 
-    public function getParseSeriesExceptionTestData()
+    public static function getParseSeriesExceptionTestData()
     {
         return [
             ['foo'],
diff --git a/Tests/Parser/Shortcut/ClassParserTest.php b/Tests/Parser/Shortcut/ClassParserTest.php
@@ -32,7 +32,7 @@ public function testParse($source, $representation)
         $this->assertEquals($representation, (string) $selector->getTree());
     }
 
-    public function getParseTestData()
+    public static function getParseTestData()
     {
         return [
             ['.testclass', 'Class[Element[*].testclass]'],
diff --git a/Tests/Parser/Shortcut/ElementParserTest.php b/Tests/Parser/Shortcut/ElementParserTest.php
@@ -32,7 +32,7 @@ public function testParse($source, $representation)
         $this->assertEquals($representation, (string) $selector->getTree());
     }
 
-    public function getParseTestData()
+    public static function getParseTestData()
     {
         return [
             ['*', 'Element[*]'],
diff --git a/Tests/Parser/Shortcut/HashParserTest.php b/Tests/Parser/Shortcut/HashParserTest.php
@@ -32,7 +32,7 @@ public function testParse($source, $representation)
         $this->assertEquals($representation, (string) $selector->getTree());
     }
 
-    public function getParseTestData()
+    public static function getParseTestData()
     {
         return [
             ['#testid', 'Hash[Element[*]#testid]'],
diff --git a/Tests/XPath/TranslatorTest.php b/Tests/XPath/TranslatorTest.php
@@ -165,7 +165,7 @@ public function testOnlyOfTypeFindsSingleChildrenOfGivenType()
         $this->assertSame('A', $nodeList->item(0)->textContent);
     }
 
-    public function getXpathLiteralTestData()
+    public static function getXpathLiteralTestData()
     {
         return [
             ['foo', "'foo'"],
@@ -175,7 +175,7 @@ public function getXpathLiteralTestData()
         ];
     }
 
-    public function getCssToXPathTestData()
+    public static function getCssToXPathTestData()
     {
         return [
             ['*', '*'],
@@ -222,7 +222,7 @@ public function getCssToXPathTestData()
         ];
     }
 
-    public function getXmlLangTestData()
+    public static function getXmlLangTestData()
     {
         return [
             [':lang("EN")', ['first', 'second', 'third', 'fourth']],
@@ -237,7 +237,7 @@ public function getXmlLangTestData()
         ];
     }
 
-    public function getHtmlIdsTestData()
+    public static function getHtmlIdsTestData()
     {
         return [
             ['div', ['outer-div', 'li-div', 'foobar-div']],
@@ -362,7 +362,7 @@ public function getHtmlIdsTestData()
         ];
     }
 
-    public function getHtmlShakespearTestData()
+    public static function getHtmlShakespearTestData()
     {
         return [
             ['*', 246],

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testCssToXPathWithoutPrefix($css, $xpath)`
`60`	`60`	`$this->assertEquals($xpath, $converter->toXPath($css, ''), '->parse() parses an input string and returns a node');`
`61`	`61`	`}`
`62`	`62`
`63`		`- public function getCssToXPathWithoutPrefixTestData()`
	`63`	`+ public static function getCssToXPathWithoutPrefixTestData()`
`64`	`64`	`{`
`65`	`65`	`return [`
`66`	`66`	`['h1', 'h1'],`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function testPlusValue(Specificity $specificity, $value)`
`28`	`28`	`$this->assertEquals($value + 123, $specificity->plus(new Specificity(1, 2, 3))->getValue());`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function getValueTestData()`
	`31`	`+ public static function getValueTestData()`
`32`	`32`	`{`
`33`	`33`	`return [`
`34`	`34`	`[new Specificity(0, 0, 0), 0],`
`@@ -45,7 +45,7 @@ public function testCompareTo(Specificity $a, Specificity $b, $result)`
`45`	`45`	`$this->assertEquals($result, $a->compareTo($b));`
`46`	`46`	`}`
`47`	`47`
`48`		`- public function getCompareTestData()`
	`48`	`+ public static function getCompareTestData()`
`49`	`49`	`{`
`50`	`50`	`return [`
`51`	`51`	`[new Specificity(0, 0, 0), new Specificity(0, 0, 0), 0],`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,9 @@ public function testDontHandleValue($value)`
`43`	`43`	`$this->assertRemainingContent($reader, $value);`
`44`	`44`	`}`
`45`	`45`
`46`		`- abstract public function getHandleValueTestData();`
	`46`	`+ abstract public static function getHandleValueTestData();`
`47`	`47`
`48`		`- abstract public function getDontHandleValueTestData();`
	`48`	`+ abstract public static function getDontHandleValueTestData();`
`49`	`49`
`50`	`50`	`abstract protected function generateHandler();`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testHandleValue($value, Token $unusedArgument, $remainingContent`
`30`	`30`	`$this->assertRemainingContent($reader, $remainingContent);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function getHandleValueTestData()`
	`33`	`+ public static function getHandleValueTestData()`
`34`	`34`	`{`
`35`	`35`	`return [`
`36`	`36`	`// 2nd argument only exists for inherited method compatibility`
`@@ -39,7 +39,7 @@ public function getHandleValueTestData()`
`39`	`39`	`];`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function getDontHandleValueTestData()`
	`42`	`+ public static function getDontHandleValueTestData()`
`43`	`43`	`{`
`44`	`44`	`return [`
`45`	`45`	`['>'],`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`class HashHandlerTest extends AbstractHandlerTestCase`
`20`	`20`	`{`
`21`		`- public function getHandleValueTestData()`
	`21`	`+ public static function getHandleValueTestData()`
`22`	`22`	`{`
`23`	`23`	`return [`
`24`	`24`	`['#id', new Token(Token::TYPE_HASH, 'id', 0), ''],`
`@@ -29,7 +29,7 @@ public function getHandleValueTestData()`
`29`	`29`	`];`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function getDontHandleValueTestData()`
	`32`	`+ public static function getDontHandleValueTestData()`
`33`	`33`	`{`
`34`	`34`	`return [`
`35`	`35`	`['id'],`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`
`18`	`18`	`class NumberHandlerTest extends AbstractHandlerTestCase`
`19`	`19`	`{`
`20`		`- public function getHandleValueTestData()`
	`20`	`+ public static function getHandleValueTestData()`
`21`	`21`	`{`
`22`	`22`	`return [`
`23`	`23`	`['12', new Token(Token::TYPE_NUMBER, '12', 0), ''],`
`@@ -30,7 +30,7 @@ public function getHandleValueTestData()`
`30`	`30`	`];`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function getDontHandleValueTestData()`
	`33`	`+ public static function getDontHandleValueTestData()`
`34`	`34`	`{`
`35`	`35`	`return [`
`36`	`36`	`['hello'],`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`class WhitespaceHandlerTest extends AbstractHandlerTestCase`
`18`	`18`	`{`
`19`		`- public function getHandleValueTestData()`
	`19`	`+ public static function getHandleValueTestData()`
`20`	`20`	`{`
`21`	`21`	`return [`
`22`	`22`	`[' ', new Token(Token::TYPE_WHITESPACE, ' ', 0), ''],`
`@@ -28,7 +28,7 @@ public function getHandleValueTestData()`
`28`	`28`	`];`
`29`	`29`	`}`
`30`	`30`
`31`		`- public function getDontHandleValueTestData()`
	`31`	`+ public static function getDontHandleValueTestData()`
`32`	`32`	`{`
`33`	`33`	`return [`
`34`	`34`	`['>'],`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function testParseSeriesException($series)`
`91`	`91`	`Parser::parseSeries($function->getArguments());`
`92`	`92`	`}`
`93`	`93`
`94`		`- public function getParserTestData()`
	`94`	`+ public static function getParserTestData()`
`95`	`95`	`{`
`96`	`96`	`return [`
`97`	`97`	`['', ['Element[]']],`
`@@ -149,7 +149,7 @@ public function getParserTestData()`
`149`	`149`	`];`
`150`	`150`	`}`
`151`	`151`
`152`		`- public function getParserExceptionTestData()`
	`152`	`+ public static function getParserExceptionTestData()`
`153`	`153`	`{`
`154`	`154`	`return [`
`155`	`155`	`['attributes(href)/html/body/a', SyntaxErrorException::unexpectedToken('selector', new Token(Token::TYPE_DELIMITER, '(', 10))->getMessage()],`
`@@ -179,7 +179,7 @@ public function getParserExceptionTestData()`
`179`	`179`	`];`
`180`	`180`	`}`
`181`	`181`
`182`		`- public function getPseudoElementsTestData()`
	`182`	`+ public static function getPseudoElementsTestData()`
`183`	`183`	`{`
`184`	`184`	`return [`
`185`	`185`	`['foo', 'Element[foo]', ''],`
`@@ -201,7 +201,7 @@ public function getPseudoElementsTestData()`
`201`	`201`	`];`
`202`	`202`	`}`
`203`	`203`
`204`		`- public function getSpecificityTestData()`
	`204`	`+ public static function getSpecificityTestData()`
`205`	`205`	`{`
`206`	`206`	`return [`
`207`	`207`	`['*', 0],`
`@@ -229,7 +229,7 @@ public function getSpecificityTestData()`
`229`	`229`	`];`
`230`	`230`	`}`
`231`	`231`
`232`		`- public function getParseSeriesTestData()`
	`232`	`+ public static function getParseSeriesTestData()`
`233`	`233`	`{`
`234`	`234`	`return [`
`235`	`235`	`['1n+3', 1, 3],`
`@@ -251,7 +251,7 @@ public function getParseSeriesTestData()`
`251`	`251`	`];`
`252`	`252`	`}`
`253`	`253`
`254`		`- public function getParseSeriesExceptionTestData()`
	`254`	`+ public static function getParseSeriesExceptionTestData()`
`255`	`255`	`{`
`256`	`256`	`return [`
`257`	`257`	`['foo'],`