From c9a5292ab0807fd6e14ab7b9bc06596a7a22e228 Mon Sep 17 00:00:00 2001 From: Claudio Zizza Date: Mon, 8 Sep 2025 21:35:08 +0200 Subject: [PATCH 1/4] Set branchname for versions without tags --- .doctrine-project.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index 177ad9984..ca091627a 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -6,17 +6,19 @@ "versions": [ { "name": "3.0", + "branchName": "3.0.x", "slug": "latest", "upcoming": true }, { "name": "2.17", + "branchName": "2.17.x", "slug": "2.17", "upcoming": true }, { "name": "2.16", - "slug": "latest", + "slug": "2.16", "current": true }, { From 8cd1553c5885bb7461eb8a53ec6ea47aa3f57d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 8 Sep 2025 22:19:50 +0200 Subject: [PATCH 2/4] Migrate to attributes for PHPUnit --- tests/Command/DropDatabaseDoctrineTest.php | 15 +++++---------- .../Compiler/EntityListenerPassTest.php | 3 ++- .../Compiler/MiddlewarePassTest.php | 12 +++++------- .../DoctrineExtensionTest.php | 16 +++++----------- tests/DependencyInjection/XMLSchemaTest.php | 3 ++- 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/tests/Command/DropDatabaseDoctrineTest.php b/tests/Command/DropDatabaseDoctrineTest.php index 55ee29754..8b7d2a23c 100644 --- a/tests/Command/DropDatabaseDoctrineTest.php +++ b/tests/Command/DropDatabaseDoctrineTest.php @@ -11,6 +11,7 @@ use Doctrine\DBAL\Schema\DefaultSchemaManagerFactory; use Doctrine\Persistence\ManagerRegistry; use Generator; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Console\Tester\CommandTester; @@ -23,11 +24,8 @@ /** @psalm-import-type Params from DriverManager */ class DropDatabaseDoctrineTest extends TestCase { - /** - * @param array $options - * - * @dataProvider provideForceOption - */ + /** @param array $options */ + #[DataProvider('provideForceOption')] public function testExecute(array $options): void { $connectionName = 'default'; @@ -61,11 +59,8 @@ public function testExecute(array $options): void ); } - /** - * @param array $options - * - * @dataProvider provideIncompatibleDriverOptions - */ + /** @param array $options */ + #[DataProvider('provideIncompatibleDriverOptions')] public function testItThrowsWhenUsingIfExistsWithAnIncompatibleDriver(array $options): void { $this->expectException(DBALException::class); diff --git a/tests/DependencyInjection/Compiler/EntityListenerPassTest.php b/tests/DependencyInjection/Compiler/EntityListenerPassTest.php index ffb2e225a..f14c7055f 100644 --- a/tests/DependencyInjection/Compiler/EntityListenerPassTest.php +++ b/tests/DependencyInjection/Compiler/EntityListenerPassTest.php @@ -8,6 +8,7 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Events; use Doctrine\ORM\Tools\AttachEntityListenersListener; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use stdClass; use Symfony\Component\DependencyInjection\ContainerBuilder; @@ -26,7 +27,7 @@ public static function setUpBeforeClass(): void self::markTestSkipped('This test requires ORM'); } - /** @dataProvider provideEvents */ + #[DataProvider('provideEvents')] public function testEntityListenersAreRegistered(string|null $event, string|null $method, string|null $expectedMethod): void { $container = new ContainerBuilder(); diff --git a/tests/DependencyInjection/Compiler/MiddlewarePassTest.php b/tests/DependencyInjection/Compiler/MiddlewarePassTest.php index a840312a2..8768c4d18 100644 --- a/tests/DependencyInjection/Compiler/MiddlewarePassTest.php +++ b/tests/DependencyInjection/Compiler/MiddlewarePassTest.php @@ -9,6 +9,7 @@ use Doctrine\Bundle\DoctrineBundle\Middleware\IdleConnectionMiddleware; use Doctrine\DBAL\Driver; use Doctrine\DBAL\Driver\Middleware; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Psr\Log\NullLogger; use Symfony\Bridge\Doctrine\Middleware\IdleConnection\Listener; @@ -33,7 +34,7 @@ public static function provideAddMiddleware(): array ]; } - /** @dataProvider provideAddMiddleware */ + #[DataProvider('provideAddMiddleware')] public function testAddMiddlewareWithExplicitTag(string $middlewareClass, bool $connectionNameAware): void { $container = $this->createContainer(static function (ContainerBuilder $container) use ($middlewareClass) { @@ -105,11 +106,8 @@ public static function provideAddMiddlewareWithAttributeForAutoconfiguration(): ]; } - /** - * @param class-string $className - * - * @dataProvider provideAddMiddlewareWithAttributeForAutoconfiguration - */ + /** @param class-string $className */ + #[DataProvider('provideAddMiddlewareWithAttributeForAutoconfiguration')] public function testAddMiddlewareWithAttributeForAutoconfiguration(string $className, bool $registeredOnConn1): void { $container = $this->createContainer(static function (ContainerBuilder $container) use ($className) { @@ -135,7 +133,7 @@ public function testAddMiddlewareWithAttributeForAutoconfiguration(string $class $this->assertMiddlewareInjected($container, 'conn2', $className); } - /** @dataProvider provideAddMiddleware */ + #[DataProvider('provideAddMiddleware')] public function testDontAddMiddlewareWhenDbalIsNotUsed(string $middlewareClass): void { $container = $this->createContainer(static function (ContainerBuilder $container) use ($middlewareClass) { diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php index 4915c919b..09ef2fc9c 100644 --- a/tests/DependencyInjection/DoctrineExtensionTest.php +++ b/tests/DependencyInjection/DoctrineExtensionTest.php @@ -296,11 +296,8 @@ public static function getAutomappingConfigurations(): array ]; } - /** - * @param mixed[][][][] $entityManagers - * - * @dataProvider getAutomappingConfigurations - */ + /** @param mixed[][][][] $entityManagers */ + #[DataProvider('getAutomappingConfigurations')] public static function testAutomapping(array $entityManagers): void { if (! interface_exists(EntityManagerInterface::class)) { @@ -1042,11 +1039,8 @@ public function testInvalidCacheConfiguration(): void $extension->load([$config], $container); } - /** - * @param array{pool?: string, type: ?string, id?: string} $cacheConfig - * - * @dataProvider cacheConfigurationProvider - */ + /** @param array{pool?: string, type: ?string, id?: string} $cacheConfig */ + #[DataProvider('cacheConfigurationProvider')] public function testCacheConfiguration(string $expectedAliasName, string $expectedTarget, string $cacheName, array $cacheConfig): void { if (! interface_exists(EntityManagerInterface::class)) { @@ -1166,7 +1160,7 @@ public static function provideAttributeExcludedFromContainer(): array ]; } - /** @dataProvider provideAttributeExcludedFromContainer */ + #[DataProvider('provideAttributeExcludedFromContainer')] public function testEntityAttributeExcludesFromContainer(string $class) { if (! interface_exists(EntityManagerInterface::class)) { diff --git a/tests/DependencyInjection/XMLSchemaTest.php b/tests/DependencyInjection/XMLSchemaTest.php index 3dd8a10b0..418db5f53 100644 --- a/tests/DependencyInjection/XMLSchemaTest.php +++ b/tests/DependencyInjection/XMLSchemaTest.php @@ -4,6 +4,7 @@ use DirectoryIterator; use DOMDocument; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use function basename; @@ -27,7 +28,7 @@ public static function dataValidateSchemaFiles(): array return $schemaFiles; } - /** @dataProvider dataValidateSchemaFiles */ + #[DataProvider('dataValidateSchemaFiles')] public function testValidateSchema(string $file): void { $found = false; From d1fdacc6069c5aa8158eb4043addc8e40e087de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 8 Sep 2025 22:28:52 +0200 Subject: [PATCH 3/4] Remove bootstrap file It does something that is already achieved by the following configuration: --- phpunit.xml.dist | 1 - tests/bootstrap.php | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 tests/bootstrap.php diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a63bdf44d..7ee7ace92 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,6 @@ Date: Sat, 6 Sep 2025 09:43:54 +0200 Subject: [PATCH 4/4] Enable strict types It is in our coding standard, and doing so is not a breaking change. --- config/dbal.php | 22 ++++++------ config/messenger.php | 2 ++ config/middlewares.php | 2 ++ config/orm.php | 34 ++++++++++--------- phpcs.xml.dist | 1 - src/Attribute/AsDoctrineListener.php | 2 ++ src/Attribute/AsEntityListener.php | 2 ++ src/Attribute/AsMiddleware.php | 2 ++ .../DoctrineMetadataCacheWarmer.php | 2 ++ src/Command/CreateDatabaseDoctrineCommand.php | 2 ++ src/Command/DoctrineCommand.php | 2 ++ src/Command/DropDatabaseDoctrineCommand.php | 2 ++ src/Command/ImportMappingDoctrineCommand.php | 2 ++ .../ClearMetadataCacheDoctrineCommand.php | 2 ++ .../Proxy/ClearQueryCacheDoctrineCommand.php | 2 ++ .../Proxy/ClearResultCacheDoctrineCommand.php | 2 ++ .../Proxy/CollectionRegionDoctrineCommand.php | 2 ++ .../Proxy/ConvertMappingDoctrineCommand.php | 2 ++ .../Proxy/CreateSchemaDoctrineCommand.php | 2 ++ src/Command/Proxy/DoctrineCommandHelper.php | 2 ++ .../Proxy/DropSchemaDoctrineCommand.php | 2 ++ ...nsureProductionSettingsDoctrineCommand.php | 2 ++ .../EntityRegionCacheDoctrineCommand.php | 2 ++ src/Command/Proxy/InfoDoctrineCommand.php | 2 ++ src/Command/Proxy/OrmProxyCommand.php | 2 ++ .../Proxy/QueryRegionCacheDoctrineCommand.php | 2 ++ src/Command/Proxy/RunDqlDoctrineCommand.php | 2 ++ src/Command/Proxy/RunSqlDoctrineCommand.php | 2 ++ .../Proxy/UpdateSchemaDoctrineCommand.php | 2 ++ src/Command/Proxy/ValidateSchemaCommand.php | 2 ++ src/ConnectionFactory.php | 2 ++ src/Controller/ProfilerController.php | 2 ++ src/DataCollector/DoctrineDataCollector.php | 2 ++ src/Dbal/BlacklistSchemaAssetFilter.php | 2 ++ ...ManagerRegistryAwareConnectionProvider.php | 2 ++ src/Dbal/RegexSchemaAssetFilter.php | 2 ++ src/Dbal/SchemaAssetsFilterManager.php | 2 ++ .../Compiler/CacheCompatibilityPass.php | 6 ++-- .../Compiler/CacheSchemaSubscriberPass.php | 2 ++ .../Compiler/DbalSchemaFilterPass.php | 2 ++ .../Compiler/DoctrineOrmMappingsPass.php | 2 ++ .../Compiler/EntityListenerPass.php | 2 ++ .../Compiler/IdGeneratorPass.php | 2 ++ .../Compiler/MiddlewaresPass.php | 2 ++ .../Compiler/RemoveLoggingMiddlewarePass.php | 2 ++ .../Compiler/RemoveProfilerControllerPass.php | 2 ++ .../ServiceRepositoryCompilerPass.php | 2 ++ src/DependencyInjection/Configuration.php | 2 ++ src/DependencyInjection/DoctrineExtension.php | 2 ++ src/DoctrineBundle.php | 2 ++ .../EventSubscriberInterface.php | 2 ++ src/ManagerConfigurator.php | 2 ++ src/Mapping/ClassMetadataCollection.php | 2 ++ src/Mapping/ClassMetadataFactory.php | 2 ++ .../ContainerEntityListenerResolver.php | 2 ++ src/Mapping/DisconnectedMetadataFactory.php | 2 ++ src/Mapping/EntityListenerServiceResolver.php | 2 ++ src/Mapping/MappingDriver.php | 2 ++ src/Middleware/BacktraceDebugDataHolder.php | 2 ++ .../ConnectionNameAwareInterface.php | 2 ++ src/Middleware/DebugMiddleware.php | 2 ++ src/Middleware/IdleConnectionMiddleware.php | 2 ++ ...agerRegistryAwareEntityManagerProvider.php | 2 ++ src/Registry.php | 2 ++ src/Repository/ContainerRepositoryFactory.php | 2 ++ .../LazyServiceEntityRepository.php | 2 ++ .../RepositoryFactoryCompatibility.php | 2 ++ src/Repository/ServiceEntityRepository.php | 2 ++ .../ServiceEntityRepositoryInterface.php | 2 ++ src/Twig/DoctrineExtension.php | 2 ++ tests/Builder/BundleConfigurationBuilder.php | 2 ++ tests/BundleTest.php | 2 ++ tests/CacheSchemaSubscriberTest.php | 2 ++ tests/Command/CreateDatabaseDoctrineTest.php | 2 ++ tests/Command/DropDatabaseDoctrineTest.php | 2 ++ .../ImportMappingDoctrineCommandTest.php | 2 ++ .../Command/Proxy/InfoDoctrineCommandTest.php | 2 ++ tests/ConnectionFactoryTest.php | 2 ++ tests/ContainerTest.php | 2 ++ .../DoctrineDataCollectorTest.php | 2 ++ tests/Dbal/RegexSchemaAssetFilterTest.php | 2 ++ tests/Dbal/SchemaAssetsFilterManagerTest.php | 2 ++ .../AbstractDoctrineExtensionTestCase.php | 2 ++ .../Compiler/CacheCompatibilityPassTest.php | 2 ++ .../Compiler/EntityListenerPassTest.php | 2 ++ .../Compiler/IdGeneratorPassTest.php | 2 ++ .../Compiler/MiddlewarePassTest.php | 2 ++ .../RemoveLoggingMiddlewarePassTest.php | 2 ++ .../DoctrineExtensionTest.php | 2 ++ .../AttributesBundle/AttributesBundle.php | 2 ++ .../AttributesBundle/Entity/TestClass.php | 2 ++ .../Entity/TestCustomIdGeneratorEntity.php | 2 ++ .../NewXmlBundle/src/Entity/TestClass.php | 2 ++ .../Bundles/NewXmlBundle/src/NewXmlBundle.php | 2 ++ .../Entity/TestCustomClassRepoEntity.php | 2 ++ .../Entity/TestCustomServiceRepoEntity.php | 2 ++ .../Entity/TestDefaultRepoEntity.php | 2 ++ .../TestCustomClassRepoRepository.php | 2 ++ .../TestCustomServiceRepoRepository.php | 2 ++ .../RepositoryServiceBundle.php | 2 ++ .../AnnotationsBundle/AnnotationsBundle.php | 2 ++ .../AnnotationsBundle/Entity/TestClass.php | 2 ++ .../Bundles/XmlBundle/Entity/TestClass.php | 2 ++ .../Fixtures/Bundles/XmlBundle/XmlBundle.php | 2 ++ .../Bundles/YamlBundle/Entity/TestClass.php | 2 ++ .../Bundles/YamlBundle/YamlBundle.php | 2 ++ .../CustomEntityListenerServiceResolver.php | 2 ++ .../Fixtures/CustomIdGenerator.php | 2 ++ .../Fixtures/DbalTestKernel.php | 2 ++ .../Fixtures/InvokableEntityListener.php | 2 ++ .../Fixtures/Php8EntityListener.php | 2 ++ .../Fixtures/Php8EventListener.php | 2 ++ .../Fixtures/TestKernel.php | 2 ++ .../TestDatetimeFunction.php | 2 ++ tests/DependencyInjection/TestFilter.php | 2 ++ .../TestNumericFunction.php | 2 ++ .../TestStringFunction.php | 2 ++ tests/DependencyInjection/TestType.php | 2 ++ tests/DependencyInjection/XMLSchemaTest.php | 2 ++ .../XmlDoctrineExtensionTest.php | 2 ++ .../YamlDoctrineExtensionTest.php | 2 ++ tests/LazyLoadingEntityManagerInterface.php | 2 ++ tests/LazyObjectEntityManagerInterface.php | 2 ++ tests/LockStoreSchemaListenerTest.php | 2 ++ .../ContainerEntityListenerResolverTest.php | 2 ++ .../DisconnectedMetadataFactoryTest.php | 2 ++ .../BacktraceDebugDataHolderTest.php | 2 ++ tests/Middleware/DebugMiddlewareTest.php | 2 ++ .../IdleConnectionMiddlewareTest.php | 2 ++ tests/ProfilerTest.php | 2 ++ tests/RegistryTest.php | 2 ++ .../ContainerRepositoryFactoryTest.php | 2 ++ .../ServiceEntityRepositoryTest.php | 2 ++ tests/ServiceRepositoryTest.php | 2 ++ tests/TestCase.php | 2 ++ tests/TestCaseAllPublicCompilerPass.php | 2 ++ tests/Twig/DoctrineExtensionTest.php | 2 ++ tests/UrlOverrideTest.php | 2 ++ 138 files changed, 302 insertions(+), 29 deletions(-) diff --git a/config/dbal.php b/config/dbal.php index fa710b495..b4d4cde4b 100644 --- a/config/dbal.php +++ b/config/dbal.php @@ -1,5 +1,7 @@ alias(ManagerRegistry::class, 'doctrine') ->alias(LegacyManagerRegistry::class, 'doctrine') - ->set('data_collector.doctrine', param('doctrine.data_collector.class')) + ->set('data_collector.doctrine', (string) param('doctrine.data_collector.class')) ->args([ service('doctrine'), true, @@ -52,9 +54,9 @@ ]) ->tag('data_collector', ['template' => '@Doctrine/Collector/db.html.twig', 'id' => 'db', 'priority' => 250]) - ->set('doctrine.dbal.connection_factory', param('doctrine.dbal.connection_factory.class')) + ->set('doctrine.dbal.connection_factory', (string) param('doctrine.dbal.connection_factory.class')) ->args([ - param('doctrine.dbal.connection_factory.types'), + (string) param('doctrine.dbal.connection_factory.types'), service('doctrine.dbal.connection_factory.dsn_parser'), ]) @@ -67,23 +69,23 @@ ->abstract() ->factory([service('doctrine.dbal.connection_factory'), 'createConnection']) - ->set('doctrine.dbal.connection.event_manager', param('doctrine.dbal.connection.event_manager.class')) + ->set('doctrine.dbal.connection.event_manager', (string) param('doctrine.dbal.connection.event_manager.class')) ->abstract() ->args([ service('service_container'), ]) - ->set('doctrine.dbal.connection.configuration', param('doctrine.dbal.configuration.class')) + ->set('doctrine.dbal.connection.configuration', (string) param('doctrine.dbal.configuration.class')) ->abstract() - ->set('doctrine', param('doctrine.class')) + ->set('doctrine', (string) param('doctrine.class')) ->public() ->args([ service('service_container'), - param('doctrine.connections'), - param('doctrine.entity_managers'), - param('doctrine.default_connection'), - param('doctrine.default_entity_manager'), + (string) param('doctrine.connections'), + (string) param('doctrine.entity_managers'), + (string) param('doctrine.default_connection'), + (string) param('doctrine.default_entity_manager'), ]) ->tag('kernel.reset', ['method' => 'reset']) diff --git a/config/messenger.php b/config/messenger.php index 80ba1f35f..54eb42934 100644 --- a/config/messenger.php +++ b/config/messenger.php @@ -1,5 +1,7 @@ alias('doctrine.orm.metadata.annotation_reader', 'annotation_reader') - ->set('doctrine.orm.proxy_cache_warmer', param('doctrine.orm.proxy_cache_warmer.class')) + ->set('doctrine.orm.proxy_cache_warmer', (string) param('doctrine.orm.proxy_cache_warmer.class')) ->tag('kernel.cache_warmer') ->args([ service('doctrine'), ]) - ->set('form.type_guesser.doctrine', param('form.type_guesser.doctrine.class')) + ->set('form.type_guesser.doctrine', (string) param('form.type_guesser.doctrine.class')) ->tag('form.type_guesser') ->args([ service('doctrine'), @@ -160,10 +162,10 @@ service('doctrine'), ]) - ->set('doctrine.orm.configuration', param('doctrine.orm.configuration.class')) + ->set('doctrine.orm.configuration', (string) param('doctrine.orm.configuration.class')) ->abstract() - ->set('doctrine.orm.entity_manager.abstract', param('doctrine.orm.entity_manager.class')) + ->set('doctrine.orm.entity_manager.abstract', (string) param('doctrine.orm.entity_manager.class')) ->abstract() ->lazy() @@ -174,32 +176,32 @@ ]), ]) - ->set('doctrine.orm.manager_configurator.abstract', param('doctrine.orm.manager_configurator.class')) + ->set('doctrine.orm.manager_configurator.abstract', (string) param('doctrine.orm.manager_configurator.class')) ->abstract() ->args([ [], [], ]) - ->set('doctrine.orm.validator.unique', param('doctrine.orm.validator.unique.class')) + ->set('doctrine.orm.validator.unique', (string) param('doctrine.orm.validator.unique.class')) ->tag('validator.constraint_validator', ['alias' => 'doctrine.orm.validator.unique']) ->args([ service('doctrine'), ]) - ->set('doctrine.orm.validator_initializer', param('doctrine.orm.validator_initializer.class')) + ->set('doctrine.orm.validator_initializer', (string) param('doctrine.orm.validator_initializer.class')) ->tag('validator.initializer') ->args([ service('doctrine'), ]) - ->set('doctrine.orm.security.user.provider', param('doctrine.orm.security.user.provider.class')) + ->set('doctrine.orm.security.user.provider', (string) param('doctrine.orm.security.user.provider.class')) ->abstract() ->args([ service('doctrine'), ]) - ->set('doctrine.orm.listeners.resolve_target_entity', param('doctrine.orm.listeners.resolve_target_entity.class')) + ->set('doctrine.orm.listeners.resolve_target_entity', (string) param('doctrine.orm.listeners.resolve_target_entity.class')) ->set('doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', DoctrineDbalCacheAdapterSchemaListener::class) ->args([ @@ -225,21 +227,21 @@ ]) ->tag('doctrine.event_listener', ['event' => 'postGenerateSchema']) - ->set('doctrine.orm.naming_strategy.default', param('doctrine.orm.naming_strategy.default.class')) + ->set('doctrine.orm.naming_strategy.default', (string) param('doctrine.orm.naming_strategy.default.class')) - ->set('doctrine.orm.naming_strategy.underscore', param('doctrine.orm.naming_strategy.underscore.class')) + ->set('doctrine.orm.naming_strategy.underscore', (string) param('doctrine.orm.naming_strategy.underscore.class')) - ->set('doctrine.orm.naming_strategy.underscore_number_aware', param('doctrine.orm.naming_strategy.underscore.class')) + ->set('doctrine.orm.naming_strategy.underscore_number_aware', (string) param('doctrine.orm.naming_strategy.underscore.class')) ->args([ CASE_LOWER, true, ]) - ->set('doctrine.orm.quote_strategy.default', param('doctrine.orm.quote_strategy.default.class')) + ->set('doctrine.orm.quote_strategy.default', (string) param('doctrine.orm.quote_strategy.default.class')) - ->set('doctrine.orm.quote_strategy.ansi', param('doctrine.orm.quote_strategy.ansi.class')) + ->set('doctrine.orm.quote_strategy.ansi', (string) param('doctrine.orm.quote_strategy.ansi.class')) - ->set('doctrine.orm.typed_field_mapper.default', param('doctrine.orm.typed_field_mapper.default.class')) + ->set('doctrine.orm.typed_field_mapper.default', (string) param('doctrine.orm.typed_field_mapper.default.class')) ->set('doctrine.ulid_generator', 'Symfony\\Bridge\\Doctrine\\IdGenerator\\UlidGenerator') ->args([ @@ -360,7 +362,7 @@ ->set('doctrine.mapping_import_command', ImportMappingDoctrineCommand::class) ->args([ service('doctrine'), - param('kernel.bundles'), + (string) param('kernel.bundles'), ]) ->tag('console.command', ['command' => 'doctrine:mapping:import']); }; diff --git a/phpcs.xml.dist b/phpcs.xml.dist index e1db9f6d3..376d21685 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -18,7 +18,6 @@ tests - diff --git a/src/Attribute/AsDoctrineListener.php b/src/Attribute/AsDoctrineListener.php index 43489c523..0c11e0308 100644 --- a/src/Attribute/AsDoctrineListener.php +++ b/src/Attribute/AsDoctrineListener.php @@ -1,5 +1,7 @@ getDefinition($factoryMethodCall[1][0]); + $regionDefinition = $container->getDefinition((string) $factoryMethodCall[1][0]); // Get inner service for FileLock if ($regionDefinition->getClass() === '%doctrine.orm.second_level_cache.filelock_region.class%') { - $regionDefinition = $container->getDefinition($regionDefinition->getArgument(0)); + $regionDefinition = $container->getDefinition((string) $regionDefinition->getArgument(0)); } // We don't know how to adjust custom region classes diff --git a/src/DependencyInjection/Compiler/CacheSchemaSubscriberPass.php b/src/DependencyInjection/Compiler/CacheSchemaSubscriberPass.php index a317d7a87..f576fe212 100644 --- a/src/DependencyInjection/Compiler/CacheSchemaSubscriberPass.php +++ b/src/DependencyInjection/Compiler/CacheSchemaSubscriberPass.php @@ -1,5 +1,7 @@