Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit f1afbc24a516 · 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\ExpressionLanguage\Compiler;
 
-abstract class AbstractNodeTest extends TestCase
+abstract class AbstractNodeTestCase extends TestCase
 {
     /**
      * @dataProvider getEvaluateData
diff --git a/Tests/Node/ArrayNodeTest.php b/Tests/Node/ArrayNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ArrayNodeTest extends AbstractNodeTest
+class ArrayNodeTest extends AbstractNodeTestCase
 {
     public function testSerialization()
     {
diff --git a/Tests/Node/BinaryNodeTest.php b/Tests/Node/BinaryNodeTest.php
@@ -18,7 +18,7 @@
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 use Symfony\Component\ExpressionLanguage\SyntaxError;
 
-class BinaryNodeTest extends AbstractNodeTest
+class BinaryNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/ConditionalNodeTest.php b/Tests/Node/ConditionalNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ConditionalNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ConditionalNodeTest extends AbstractNodeTest
+class ConditionalNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/ConstantNodeTest.php b/Tests/Node/ConstantNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
-class ConstantNodeTest extends AbstractNodeTest
+class ConstantNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/FunctionNodeTest.php b/Tests/Node/FunctionNodeTest.php
@@ -15,7 +15,7 @@
 use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
 
-class FunctionNodeTest extends AbstractNodeTest
+class FunctionNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/GetAttrNodeTest.php b/Tests/Node/GetAttrNodeTest.php
@@ -16,7 +16,7 @@
 use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 
-class GetAttrNodeTest extends AbstractNodeTest
+class GetAttrNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/NameNodeTest.php b/Tests/Node/NameNodeTest.php
@@ -13,7 +13,7 @@
 
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
 
-class NameNodeTest extends AbstractNodeTest
+class NameNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {
diff --git a/Tests/Node/UnaryNodeTest.php b/Tests/Node/UnaryNodeTest.php
@@ -14,7 +14,7 @@
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
 
-class UnaryNodeTest extends AbstractNodeTest
+class UnaryNodeTest extends AbstractNodeTestCase
 {
     public static function getEvaluateData(): array
     {

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\ExpressionLanguage\Compiler;`
`16`	`16`
`17`		`-abstract class AbstractNodeTest extends TestCase`
	`17`	`+abstract class AbstractNodeTestCase extends TestCase`
`18`	`18`	`{`
`19`	`19`	`/**`
`20`	`20`	`* @dataProvider getEvaluateData`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`use Symfony\Component\ExpressionLanguage\Node\NameNode;`
`19`	`19`	`use Symfony\Component\ExpressionLanguage\SyntaxError;`
`20`	`20`
`21`		`-class BinaryNodeTest extends AbstractNodeTest`
	`21`	`+class BinaryNodeTest extends AbstractNodeTestCase`
`22`	`22`	`{`
`23`	`23`	`public static function getEvaluateData(): array`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\ExpressionLanguage\Node\ConstantNode;`
`15`	`15`
`16`		`-class ConstantNodeTest extends AbstractNodeTest`
	`16`	`+class ConstantNodeTest extends AbstractNodeTestCase`
`17`	`17`	`{`
`18`	`18`	`public static function getEvaluateData(): array`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\ExpressionLanguage\Node\FunctionNode;`
`16`	`16`	`use Symfony\Component\ExpressionLanguage\Node\Node;`
`17`	`17`
`18`		`-class FunctionNodeTest extends AbstractNodeTest`
	`18`	`+class FunctionNodeTest extends AbstractNodeTestCase`
`19`	`19`	`{`
`20`	`20`	`public static function getEvaluateData(): array`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;`
`17`	`17`	`use Symfony\Component\ExpressionLanguage\Node\NameNode;`
`18`	`18`
`19`		`-class GetAttrNodeTest extends AbstractNodeTest`
	`19`	`+class GetAttrNodeTest extends AbstractNodeTestCase`
`20`	`20`	`{`
`21`	`21`	`public static function getEvaluateData(): array`
`22`	`22`	`{`