Merge branch '5.4' into 6.2

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

Author: nicolas-grekas

Tests/Form/Type/EntityTypeTest.php

@@ -35,12 +35,12 @@
 use Symfony\Component\Form\Exception\RuntimeException;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\Form\Forms;
-use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTest;
+use Symfony\Component\Form\Tests\Extension\Core\Type\BaseTypeTestCase;
 use Symfony\Component\Form\Tests\Extension\Core\Type\FormTypeTest;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
 use Symfony\Component\OptionsResolver\Exception\MissingOptionsException;
 
-class EntityTypeTest extends BaseTypeTest
+class EntityTypeTest extends BaseTypeTestCase
 {
     public const TESTED_TYPE = 'Symfony\Bridge\Doctrine\Form\Type\EntityType';
 

composer.json

@@ -29,7 +29,7 @@
         "symfony/cache": "^5.4|^6.0",
         "symfony/config": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
-        "symfony/form": "^5.4.9|^6.0.9",
+        "symfony/form": "^5.4.21|^6.2.7",
         "symfony/http-kernel": "^6.2",
         "symfony/messenger": "^5.4|^6.0",
         "symfony/doctrine-messenger": "^5.4|^6.0",
@@ -56,7 +56,7 @@
         "phpunit/phpunit": "<5.4.3",
         "symfony/cache": "<5.4",
         "symfony/dependency-injection": "<5.4",
-        "symfony/form": "<5.4",
+        "symfony/form": "<5.4.21|>=6,<6.2.7",
         "symfony/http-kernel": "<6.2",
         "symfony/messenger": "<5.4",
         "symfony/property-info": "<5.4",