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 }, { 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/phpunit.xml.dist b/phpunit.xml.dist index a63bdf44d..7ee7ace92 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,6 @@ 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 @@ $options - * - * @dataProvider provideForceOption - */ + /** @param array $options */ + #[DataProvider('provideForceOption')] public function testExecute(array $options): void { $connectionName = 'default'; @@ -61,11 +61,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/Command/ImportMappingDoctrineCommandTest.php b/tests/Command/ImportMappingDoctrineCommandTest.php index 04cb6d834..622dc5667 100644 --- a/tests/Command/ImportMappingDoctrineCommandTest.php +++ b/tests/Command/ImportMappingDoctrineCommandTest.php @@ -1,5 +1,7 @@ createContainer(static function (ContainerBuilder $container) use ($middlewareClass) { @@ -105,11 +108,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 +135,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/Compiler/RemoveLoggingMiddlewarePassTest.php b/tests/DependencyInjection/Compiler/RemoveLoggingMiddlewarePassTest.php index eab5cc6f4..cdbca1a14 100644 --- a/tests/DependencyInjection/Compiler/RemoveLoggingMiddlewarePassTest.php +++ b/tests/DependencyInjection/Compiler/RemoveLoggingMiddlewarePassTest.php @@ -1,5 +1,7 @@ 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 +1162,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/Fixtures/Bundles/AttributesBundle/AttributesBundle.php b/tests/DependencyInjection/Fixtures/Bundles/AttributesBundle/AttributesBundle.php index 9d7488cb3..8ee70e6cf 100644 --- a/tests/DependencyInjection/Fixtures/Bundles/AttributesBundle/AttributesBundle.php +++ b/tests/DependencyInjection/Fixtures/Bundles/AttributesBundle/AttributesBundle.php @@ -1,5 +1,7 @@