minor #49253 [PHPUnit 10] Use TestCase suffix for abstract tests in /Tests/ (OskarStark)

nicolas-grekas · nicolas-grekas · commit fc7442b19069 · 2023-02-07T10:38:40.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Refs symfony/symfony#49233 | License | MIT | Doc PR | n/a Replaces #49234 Using `Test` suffix is deprecated since PHPUnit 10 Spotted in * symfony/symfony#49233 Commits ------- cb3db968e4 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/`
diff --git a/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php b/Tests/Extension/AbstractBootstrap3HorizontalLayoutTestCase.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Tests\Extension;
 
-abstract class AbstractBootstrap3HorizontalLayoutTest extends AbstractBootstrap3LayoutTest
+abstract class AbstractBootstrap3HorizontalLayoutTestCase extends AbstractBootstrap3LayoutTestCase
 {
     public function testLabelOnForm()
     {
diff --git a/Tests/Extension/AbstractBootstrap3LayoutTestCase.php b/Tests/Extension/AbstractBootstrap3LayoutTestCase.php
@@ -13,9 +13,9 @@
 
 use Symfony\Component\Form\Extension\Core\Type\PercentType;
 use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\Tests\AbstractLayoutTest;
+use Symfony\Component\Form\Tests\AbstractLayoutTestCase;
 
-abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
+abstract class AbstractBootstrap3LayoutTestCase extends AbstractLayoutTestCase
 {
     public function testLabelOnForm()
     {
diff --git a/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php b/Tests/Extension/AbstractBootstrap4HorizontalLayoutTestCase.php
@@ -18,7 +18,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4LayoutTest
+abstract class AbstractBootstrap4HorizontalLayoutTestCase extends AbstractBootstrap4LayoutTestCase
 {
     public function testRow()
     {
diff --git a/Tests/Extension/AbstractBootstrap4LayoutTestCase.php b/Tests/Extension/AbstractBootstrap4LayoutTestCase.php
@@ -28,7 +28,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest
+abstract class AbstractBootstrap4LayoutTestCase extends AbstractBootstrap3LayoutTestCase
 {
     public function testRow()
     {
diff --git a/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php b/Tests/Extension/AbstractBootstrap5HorizontalLayoutTestCase.php
@@ -24,7 +24,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-abstract class AbstractBootstrap5HorizontalLayoutTest extends AbstractBootstrap5LayoutTest
+abstract class AbstractBootstrap5HorizontalLayoutTestCase extends AbstractBootstrap5LayoutTestCase
 {
     public function testRow()
     {
diff --git a/Tests/Extension/AbstractBootstrap5LayoutTestCase.php b/Tests/Extension/AbstractBootstrap5LayoutTestCase.php
@@ -36,7 +36,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-abstract class AbstractBootstrap5LayoutTest extends AbstractBootstrap4LayoutTest
+abstract class AbstractBootstrap5LayoutTestCase extends AbstractBootstrap4LayoutTestCase
 {
     public function testRow()
     {
diff --git a/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php b/Tests/Extension/FormExtensionBootstrap3HorizontalLayoutTest.php
@@ -21,7 +21,7 @@
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest
+class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionBootstrap3LayoutTest.php b/Tests/Extension/FormExtensionBootstrap3LayoutTest.php
@@ -21,7 +21,7 @@
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTest
+class FormExtensionBootstrap3LayoutTest extends AbstractBootstrap3LayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php b/Tests/Extension/FormExtensionBootstrap4HorizontalLayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTest
+class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionBootstrap4LayoutTest.php b/Tests/Extension/FormExtensionBootstrap4LayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Hidde Wieringa <hidde@hiddewieringa.nl>
  */
-class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTest
+class FormExtensionBootstrap4LayoutTest extends AbstractBootstrap4LayoutTestCase
 {
     use RuntimeLoaderProvider;
     /**
diff --git a/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php b/Tests/Extension/FormExtensionBootstrap5HorizontalLayoutTest.php
@@ -26,7 +26,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-class FormExtensionBootstrap5HorizontalLayoutTest extends AbstractBootstrap5HorizontalLayoutTest
+class FormExtensionBootstrap5HorizontalLayoutTest extends AbstractBootstrap5HorizontalLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionBootstrap5LayoutTest.php b/Tests/Extension/FormExtensionBootstrap5LayoutTest.php
@@ -28,7 +28,7 @@
  *
  * @author Romain Monteil <monteil.romain@gmail.com>
  */
-class FormExtensionBootstrap5LayoutTest extends AbstractBootstrap5LayoutTest
+class FormExtensionBootstrap5LayoutTest extends AbstractBootstrap5LayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionDivLayoutTest.php b/Tests/Extension/FormExtensionDivLayoutTest.php
@@ -18,12 +18,12 @@
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractDivLayoutTest;
+use Symfony\Component\Form\Tests\AbstractDivLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionDivLayoutTest extends AbstractDivLayoutTest
+class FormExtensionDivLayoutTest extends AbstractDivLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/Tests/Extension/FormExtensionTableLayoutTest.php b/Tests/Extension/FormExtensionTableLayoutTest.php
@@ -17,12 +17,12 @@
 use Symfony\Bridge\Twig\Tests\Extension\Fixtures\StubTranslator;
 use Symfony\Component\Form\FormRenderer;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\Form\Tests\AbstractTableLayoutTest;
+use Symfony\Component\Form\Tests\AbstractTableLayoutTestCase;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
-class FormExtensionTableLayoutTest extends AbstractTableLayoutTest
+class FormExtensionTableLayoutTest extends AbstractTableLayoutTestCase
 {
     use RuntimeLoaderProvider;
 
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
         "symfony/asset": "^4.4|^5.0|^6.0",
         "symfony/dependency-injection": "^4.4|^5.0|^6.0",
         "symfony/finder": "^4.4|^5.0|^6.0",
-        "symfony/form": "^5.3|^6.0",
+        "symfony/form": "^5.4.21|^6.2.7",
         "symfony/http-foundation": "^5.3|^6.0",
         "symfony/http-kernel": "^4.4|^5.0|^6.0",
         "symfony/intl": "^4.4|^5.0|^6.0",
@@ -56,7 +56,7 @@
         "phpdocumentor/reflection-docblock": "<3.2.2",
         "phpdocumentor/type-resolver": "<1.4.0",
         "symfony/console": "<5.3",
-        "symfony/form": "<5.3",
+        "symfony/form": "<5.4.21|>=6,<6.2.7",
         "symfony/http-foundation": "<5.3",
         "symfony/http-kernel": "<4.4",
         "symfony/translation": "<5.2",

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Bridge\Twig\Tests\Extension;`
`13`	`13`
`14`		`-abstract class AbstractBootstrap3HorizontalLayoutTest extends AbstractBootstrap3LayoutTest`
	`14`	`+abstract class AbstractBootstrap3HorizontalLayoutTestCase extends AbstractBootstrap3LayoutTestCase`
`15`	`15`	`{`
`16`	`16`	`public function testLabelOnForm()`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`
`14`	`14`	`use Symfony\Component\Form\Extension\Core\Type\PercentType;`
`15`	`15`	`use Symfony\Component\Form\FormError;`
`16`		`-use Symfony\Component\Form\Tests\AbstractLayoutTest;`
	`16`	`+use Symfony\Component\Form\Tests\AbstractLayoutTestCase;`
`17`	`17`
`18`		`-abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest`
	`18`	`+abstract class AbstractBootstrap3LayoutTestCase extends AbstractLayoutTestCase`
`19`	`19`	`{`
`20`	`20`	`public function testLabelOnForm()`
`21`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Hidde Wieringa <[email protected]>`
`20`	`20`	`*/`
`21`		`-abstract class AbstractBootstrap4HorizontalLayoutTest extends AbstractBootstrap4LayoutTest`
	`21`	`+abstract class AbstractBootstrap4HorizontalLayoutTestCase extends AbstractBootstrap4LayoutTestCase`
`22`	`22`	`{`
`23`	`23`	`public function testRow()`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*`
`29`	`29`	`* @author Hidde Wieringa <[email protected]>`
`30`	`30`	`*/`
`31`		`-abstract class AbstractBootstrap4LayoutTest extends AbstractBootstrap3LayoutTest`
	`31`	`+abstract class AbstractBootstrap4LayoutTestCase extends AbstractBootstrap3LayoutTestCase`
`32`	`32`	`{`
`33`	`33`	`public function testRow()`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* @author Romain Monteil <[email protected]>`
`26`	`26`	`*/`
`27`		`-abstract class AbstractBootstrap5HorizontalLayoutTest extends AbstractBootstrap5LayoutTest`
	`27`	`+abstract class AbstractBootstrap5HorizontalLayoutTestCase extends AbstractBootstrap5LayoutTestCase`
`28`	`28`	`{`
`29`	`29`	`public function testRow()`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* @author Romain Monteil <[email protected]>`
`38`	`38`	`*/`
`39`		`-abstract class AbstractBootstrap5LayoutTest extends AbstractBootstrap4LayoutTest`
	`39`	`+abstract class AbstractBootstrap5LayoutTestCase extends AbstractBootstrap4LayoutTestCase`
`40`	`40`	`{`
`41`	`41`	`public function testRow()`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`use Twig\Environment;`
`22`	`22`	`use Twig\Loader\FilesystemLoader;`
`23`	`23`
`24`		`-class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTest`
	`24`	`+class FormExtensionBootstrap3HorizontalLayoutTest extends AbstractBootstrap3HorizontalLayoutTestCase`
`25`	`25`	`{`
`26`	`26`	`use RuntimeLoaderProvider;`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Hidde Wieringa <[email protected]>`
`28`	`28`	`*/`
`29`		`-class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTest`
	`29`	`+class FormExtensionBootstrap4HorizontalLayoutTest extends AbstractBootstrap4HorizontalLayoutTestCase`
`30`	`30`	`{`
`31`	`31`	`use RuntimeLoaderProvider;`
`32`	`32`