Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 7cb4a0705faa · 2023-02-07T10:48:05.000+01:00
* 5.4:
  minor #49253 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` (OskarStark)
diff --git a/Tests/Node/AbstractNodeTestCase.php b/Tests/Node/AbstractNodeTestCase.php
@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\CssSelector\Node\NodeInterface;
 
-abstract class AbstractNodeTest extends TestCase
+abstract class AbstractNodeTestCase extends TestCase
 {
     /** @dataProvider getToStringConversionTestData */
     public function testToStringConversion(NodeInterface $node, $representation)
diff --git a/Tests/Node/AttributeNodeTest.php b/Tests/Node/AttributeNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\AttributeNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class AttributeNodeTest extends AbstractNodeTest
+class AttributeNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/ClassNodeTest.php b/Tests/Node/ClassNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ClassNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class ClassNodeTest extends AbstractNodeTest
+class ClassNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/CombinedSelectorNodeTest.php b/Tests/Node/CombinedSelectorNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\CombinedSelectorNode;
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class CombinedSelectorNodeTest extends AbstractNodeTest
+class CombinedSelectorNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/ElementNodeTest.php b/Tests/Node/ElementNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\CssSelector\Node\ElementNode;
 
-class ElementNodeTest extends AbstractNodeTest
+class ElementNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/FunctionNodeTest.php b/Tests/Node/FunctionNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Node\FunctionNode;
 use Symfony\Component\CssSelector\Parser\Token;
 
-class FunctionNodeTest extends AbstractNodeTest
+class FunctionNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/HashNodeTest.php b/Tests/Node/HashNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\HashNode;
 
-class HashNodeTest extends AbstractNodeTest
+class HashNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/NegationNodeTest.php b/Tests/Node/NegationNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\NegationNode;
 
-class NegationNodeTest extends AbstractNodeTest
+class NegationNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/PseudoNodeTest.php b/Tests/Node/PseudoNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\PseudoNode;
 
-class PseudoNodeTest extends AbstractNodeTest
+class PseudoNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Node/SelectorNodeTest.php b/Tests/Node/SelectorNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Node\ElementNode;
 use Symfony\Component\CssSelector\Node\SelectorNode;
 
-class SelectorNodeTest extends AbstractNodeTest
+class SelectorNodeTest extends AbstractNodeTestCase
 {
     public static function getToStringConversionTestData()
     {
diff --git a/Tests/Parser/Handler/AbstractHandlerTestCase.php b/Tests/Parser/Handler/AbstractHandlerTestCase.php
@@ -19,7 +19,7 @@
 /**
  * @author Jean-François Simon <contact@jfsimon.fr>
  */
-abstract class AbstractHandlerTest extends TestCase
+abstract class AbstractHandlerTestCase extends TestCase
 {
     /** @dataProvider getHandleValueTestData */
     public function testHandleValue($value, Token $expectedToken, $remainingContent)
diff --git a/Tests/Parser/Handler/CommentHandlerTest.php b/Tests/Parser/Handler/CommentHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\TokenStream;
 
-class CommentHandlerTest extends AbstractHandlerTest
+class CommentHandlerTest extends AbstractHandlerTestCase
 {
     /** @dataProvider getHandleValueTestData */
     public function testHandleValue($value, Token $unusedArgument, $remainingContent)
diff --git a/Tests/Parser/Handler/HashHandlerTest.php b/Tests/Parser/Handler/HashHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class HashHandlerTest extends AbstractHandlerTest
+class HashHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/Tests/Parser/Handler/IdentifierHandlerTest.php b/Tests/Parser/Handler/IdentifierHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class IdentifierHandlerTest extends AbstractHandlerTest
+class IdentifierHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/Tests/Parser/Handler/NumberHandlerTest.php b/Tests/Parser/Handler/NumberHandlerTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\CssSelector\Parser\Token;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class NumberHandlerTest extends AbstractHandlerTest
+class NumberHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/Tests/Parser/Handler/StringHandlerTest.php b/Tests/Parser/Handler/StringHandlerTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerEscaping;
 use Symfony\Component\CssSelector\Parser\Tokenizer\TokenizerPatterns;
 
-class StringHandlerTest extends AbstractHandlerTest
+class StringHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {
diff --git a/Tests/Parser/Handler/WhitespaceHandlerTest.php b/Tests/Parser/Handler/WhitespaceHandlerTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\CssSelector\Parser\Handler\WhitespaceHandler;
 use Symfony\Component\CssSelector\Parser\Token;
 
-class WhitespaceHandlerTest extends AbstractHandlerTest
+class WhitespaceHandlerTest extends AbstractHandlerTestCase
 {
     public function getHandleValueTestData()
     {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
`15`	`15`	`use Symfony\Component\CssSelector\Node\NodeInterface;`
`16`	`16`
`17`		`-abstract class AbstractNodeTest extends TestCase`
	`17`	`+abstract class AbstractNodeTestCase extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/** @dataProvider getToStringConversionTestData */`
`20`	`20`	`public function testToStringConversion(NodeInterface $node, $representation)`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\CssSelector\Node\ElementNode;`
`15`	`15`
`16`		`-class ElementNodeTest extends AbstractNodeTest`
	`16`	`+class ElementNodeTest extends AbstractNodeTestCase`
`17`	`17`	`{`
`18`	`18`	`public static function getToStringConversionTestData()`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\CssSelector\Node\FunctionNode;`
`16`	`16`	`use Symfony\Component\CssSelector\Parser\Token;`
`17`	`17`
`18`		`-class FunctionNodeTest extends AbstractNodeTest`
	`18`	`+class FunctionNodeTest extends AbstractNodeTestCase`
`19`	`19`	`{`
`20`	`20`	`public static function getToStringConversionTestData()`
`21`	`21`	`{`