Merge pull request #2207 from nicolas-grekas/fix-wiring

Don't use FQCN as service ids

Author: greg0ire

config/dbal.php

@@ -81,6 +81,11 @@
         ->set('doctrine.dbal.schema_asset_filter_manager', SchemaAssetsFilterManager::class)
             ->abstract()
 
+        ->set('doctrine.manager_registry_aware_connection_provider', ManagerRegistryAwareConnectionProvider::class)
+            ->args([
+                service('doctrine'),
+            ])
+
         ->set('doctrine.database_create_command', CreateDatabaseDoctrineCommand::class)
             ->args([
                 service('doctrine'),
@@ -93,13 +98,13 @@
             ])
             ->tag('console.command', ['command' => 'doctrine:database:drop'])
 
-        ->set(RunSqlCommand::class)
+        ->set('doctrine.run_sql_command', RunSqlCommand::class)
             ->args([
-                service(ManagerRegistryAwareConnectionProvider::class)->nullOnInvalid(),
+                service('doctrine.manager_registry_aware_connection_provider'),
             ])
             ->tag('console.command', ['command' => 'dbal:run-sql'])
 
-        ->set(ProfilerController::class)
+        ->set('doctrine.profiler_controller', ProfilerController::class)
             ->args([
                 service('twig'),
                 service('doctrine'),

src/DependencyInjection/Compiler/RemoveProfilerControllerPass.php

@@ -4,7 +4,6 @@
 
 namespace Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler;
 
-use Doctrine\Bundle\DoctrineBundle\Controller\ProfilerController;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -17,6 +16,6 @@ public function process(ContainerBuilder $container): void
             return;
         }
 
-        $container->removeDefinition(ProfilerController::class);
+        $container->removeDefinition('doctrine.profiler_controller');
     }
 }

src/DependencyInjection/DoctrineExtension.php

@@ -9,7 +9,6 @@
 use Doctrine\Bundle\DoctrineBundle\Attribute\AsMiddleware;
 use Doctrine\Bundle\DoctrineBundle\CacheWarmer\DoctrineMetadataCacheWarmer;
 use Doctrine\Bundle\DoctrineBundle\ConnectionFactory;
-use Doctrine\Bundle\DoctrineBundle\Dbal\ManagerRegistryAwareConnectionProvider;
 use Doctrine\Bundle\DoctrineBundle\Dbal\RegexSchemaAssetFilter;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\IdGeneratorPass;
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\ServiceRepositoryCompilerPass;
@@ -639,11 +638,6 @@ private function loadDbalConnection(string $name, array $connection, ContainerBu
             $def->setClass($options['wrapperClass']);
         }
 
-        $container->setDefinition(
-            ManagerRegistryAwareConnectionProvider::class,
-            new Definition(ManagerRegistryAwareConnectionProvider::class, [$container->getDefinition('doctrine')]),
-        );
-
         $configuration->addMethodCall('setSchemaManagerFactory', [new Reference($connection['schema_manager_factory'])]);
 
         if (! isset($connection['result_cache'])) {

templates/Collector/db.html.twig

@@ -88,7 +88,7 @@
 
 {% block panel %}
     {% if 'explain' == page %}
-        {{ render(controller('Doctrine\\Bundle\\DoctrineBundle\\Controller\\ProfilerController::explainAction', {
+        {{ render(controller('doctrine.profiler_controller::explainAction', {
             token: token,
             panel: 'db',
             connectionName: request.query.get('connection'),