diff --git a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php index 1d631a2fde1f2..12217e44b18e9 100644 --- a/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php +++ b/src/Symfony/Component/Form/Test/FormPerformanceTestCase.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Form\Test; -use Symfony\Component\Form\Tests\VersionAwareTest; +use Symfony\Component\Form\Tests\VersionAwareTestTrait; /** * Base class for performance tests. @@ -23,7 +23,7 @@ */ abstract class FormPerformanceTestCase extends FormIntegrationTestCase { - use VersionAwareTest; + use VersionAwareTestTrait; protected int $maxRunningTime = 0; diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php index 14b602a4b498c..6ba9c68588a12 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/BaseTypeTestCase.php @@ -12,14 +12,14 @@ namespace Symfony\Component\Form\Tests\Extension\Core\Type; use Symfony\Component\Form\Test\TypeTestCase; -use Symfony\Component\Form\Tests\VersionAwareTest; +use Symfony\Component\Form\Tests\VersionAwareTestTrait; /** * @author Bernhard Schussek */ abstract class BaseTypeTestCase extends TypeTestCase { - use VersionAwareTest; + use VersionAwareTestTrait; public const TESTED_TYPE = ''; diff --git a/src/Symfony/Component/Form/Tests/VersionAwareTest.php b/src/Symfony/Component/Form/Tests/VersionAwareTestTrait.php similarity index 95% rename from src/Symfony/Component/Form/Tests/VersionAwareTest.php rename to src/Symfony/Component/Form/Tests/VersionAwareTestTrait.php index 530c1747397a7..62e98934e3771 100644 --- a/src/Symfony/Component/Form/Tests/VersionAwareTest.php +++ b/src/Symfony/Component/Form/Tests/VersionAwareTestTrait.php @@ -14,7 +14,7 @@ /** * @deprecated since Symfony 7.2, use feature detection instead. */ -trait VersionAwareTest +trait VersionAwareTestTrait { protected static int $supportedFeatureSetVersion = 404; @@ -23,7 +23,7 @@ trait VersionAwareTest */ protected function requiresFeatureSet(int $requiredFeatureSetVersion) { - trigger_deprecation('symfony/form', '7.2', 'The "%s" trait is deprecated, use feature detection instead.', VersionAwareTest::class); + trigger_deprecation('symfony/form', '7.2', 'The "%s" trait is deprecated, use feature detection instead.', VersionAwareTestTrait::class); if ($requiredFeatureSetVersion > static::$supportedFeatureSetVersion) { $this->markTestSkipped(\sprintf('Test requires features from symfony/form %.2f but only version %.2f is supported.', $requiredFeatureSetVersion / 100, static::$supportedFeatureSetVersion / 100)); diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php deleted file mode 100644 index 9146e469100c7..0000000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php +++ /dev/null @@ -1,57 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\HttpKernel\Tests\Fixtures; - -use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\HttpKernel\Kernel; - -class KernelForTest extends Kernel -{ - public function __construct(string $environment, bool $debug, private readonly bool $fakeContainer = true) - { - parent::__construct($environment, $debug); - } - - public function getBundleMap(): array - { - return []; - } - - public function registerBundles(): iterable - { - return []; - } - - public function registerContainerConfiguration(LoaderInterface $loader): void - { - } - - public function isBooted(): bool - { - return $this->booted; - } - - public function getProjectDir(): string - { - return __DIR__; - } - - protected function initializeContainer(): void - { - if ($this->fakeContainer) { - $this->container = new ContainerBuilder(); - } else { - parent::initializeContainer(); - } - } -} diff --git a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTestWithLoadClassCache.php b/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTestWithLoadClassCache.php deleted file mode 100644 index 080953fe02afd..0000000000000 --- a/src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTestWithLoadClassCache.php +++ /dev/null @@ -1,19 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\HttpKernel\Tests\Fixtures; - -class KernelForTestWithLoadClassCache extends KernelForTest -{ - public function doLoadClassCache(): void - { - } -} diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php index e379e41bf5900..c12c2ef72a3df 100644 --- a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php @@ -29,8 +29,6 @@ use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\Kernel; -use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest; -use Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTestWithLoadClassCache; use Symfony\Component\HttpKernel\Tests\Fixtures\KernelWithoutBundles; use Symfony\Component\HttpKernel\Tests\Fixtures\ResettableService; @@ -247,7 +245,7 @@ public function testSerialize() $env = 'test_env'; $debug = true; $kernel = new KernelForTest($env, $debug); - $expected = "O:57:\"Symfony\Component\HttpKernel\Tests\Fixtures\KernelForTest\":2:{s:14:\"\0*\0environment\";s:8:\"test_env\";s:8:\"\0*\0debug\";b:1;}"; + $expected = \sprintf("O:48:\"%s\":2:{s:14:\"\0*\0environment\";s:8:\"test_env\";s:8:\"\0*\0debug\";b:1;}", KernelForTest::class); $this->assertEquals($expected, serialize($kernel)); } @@ -661,3 +659,51 @@ public function process(ContainerBuilder $container): void $container->setParameter('test.processed', true); } } + +class KernelForTest extends Kernel +{ + public function __construct(string $environment, bool $debug, private readonly bool $fakeContainer = true) + { + parent::__construct($environment, $debug); + } + + public function getBundleMap(): array + { + return []; + } + + public function registerBundles(): iterable + { + return []; + } + + public function registerContainerConfiguration(LoaderInterface $loader): void + { + } + + public function isBooted(): bool + { + return $this->booted; + } + + public function getProjectDir(): string + { + return __DIR__; + } + + protected function initializeContainer(): void + { + if ($this->fakeContainer) { + $this->container = new ContainerBuilder(); + } else { + parent::initializeContainer(); + } + } +} + +class KernelForTestWithLoadClassCache extends KernelForTest +{ + public function doLoadClassCache(): void + { + } +}