minor #25011 [TwigBundle][FrameworkBundle] Remove the internals from debug autowiring (Simperfit)

nicolas-grekas · nicolas-grekas · commit ae5d41c9715a · 2017-11-20T19:14:44.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBundle][FrameworkBundle] Remove the internals from debug autowiring | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no  | BC breaks? | no | Deprecations? |no  | Tests pass? | yes | Fixed tickets | #24986 | License | MIT | Doc PR | #SymfonyConHackday2017 @nicolas-grekas @weaverryan @fabpot @stof It should be OK to review and to merge. Commits ------- 491839b [TwigBundle][FrameworkBundle] Remove the internals from debug autowiring
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -13,13 +13,6 @@
 
 use Doctrine\Common\Annotations\Reader;
 use Symfony\Bridge\Monolog\Processor\DebugProcessor;
-use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;
-use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;
-use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;
-use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;
-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
-use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;
-use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
@@ -152,10 +145,10 @@ public function load(array $configs, ContainerBuilder $container)
             $loader->load('console.xml');
 
             if (!class_exists(BaseXliffLintCommand::class)) {
-                $container->removeDefinition(XliffLintCommand::class);
+                $container->removeDefinition('console.command.xliff_lint');
             }
             if (!class_exists(BaseYamlLintCommand::class)) {
-                $container->removeDefinition(YamlLintCommand::class);
+                $container->removeDefinition('console.command.yaml_lint');
             }
         }
 
@@ -251,7 +244,7 @@ public function load(array $configs, ContainerBuilder $container)
                 $container->removeDefinition('form.type_guesser.validator');
             }
         } else {
-            $container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');
+            $container->removeDefinition('console.command.form_debug');
         }
 
         $this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);
@@ -572,7 +565,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
     private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$config['enabled']) {
-            $container->removeDefinition(WorkflowDumpCommand::class);
+            $container->removeDefinition('console.command.workflow_dump');
 
             return;
         }
@@ -757,8 +750,8 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
     private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
-            $container->removeDefinition(RouterDebugCommand::class);
-            $container->removeDefinition(RouterMatchCommand::class);
+            $container->removeDefinition('console.command.router_debug');
+            $container->removeDefinition('console.command.router_match');
 
             return;
         }
@@ -1087,8 +1080,8 @@ private function createVersion(ContainerBuilder $container, $version, $format, $
     private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)
     {
         if (!$this->isConfigEnabled($container, $config)) {
-            $container->removeDefinition(TranslationDebugCommand::class);
-            $container->removeDefinition(TranslationUpdateCommand::class);
+            $container->removeDefinition('console.command.translation_debug');
+            $container->removeDefinition('console.command.translation_update');
 
             return;
         }
diff --git a/Resources/config/console.xml b/Resources/config/console.xml
@@ -13,95 +13,95 @@
             <tag name="monolog.logger" channel="console" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
+        <service id="console.command.about" class="Symfony\Bundle\FrameworkBundle\Command\AboutCommand">
             <tag name="console.command" command="about" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
+        <service id="console.command.assets_install" class="Symfony\Bundle\FrameworkBundle\Command\AssetsInstallCommand">
             <argument type="service" id="filesystem" />
             <tag name="console.command" command="assets:install" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
+        <service id="console.command.cache_clear" class="Symfony\Bundle\FrameworkBundle\Command\CacheClearCommand">
             <argument type="service" id="cache_clearer" />
             <argument type="service" id="filesystem" />
             <tag name="console.command" command="cache:clear" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
+        <service id="console.command.cache_pool_clear" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand">
             <argument type="service" id="cache.global_clearer" />
             <tag name="console.command" command="cache:pool:clear" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
+        <service id="console.command.cache_pool_prune" class="Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand">
             <argument type="iterator" />
             <tag name="console.command" command="cache:pool:prune" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
+        <service id="console.command.cache_warmup" class="Symfony\Bundle\FrameworkBundle\Command\CacheWarmupCommand">
             <argument type="service" id="cache_warmer" />
             <tag name="console.command" command="cache:warmup" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
+        <service id="console.command.config_debug" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDebugCommand">
             <tag name="console.command" command="debug:config" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
+        <service id="console.command.config_dump_reference" class="Symfony\Bundle\FrameworkBundle\Command\ConfigDumpReferenceCommand">
             <tag name="console.command" command="config:dump-reference" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
+        <service id="console.command.container_debug" class="Symfony\Bundle\FrameworkBundle\Command\ContainerDebugCommand">
             <tag name="console.command" command="debug:container" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
+        <service id="console.command.debug_autowiring" class="Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand">
             <tag name="console.command" command="debug:autowiring" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
+        <service id="console.command.event_dispatcher_debug" class="Symfony\Bundle\FrameworkBundle\Command\EventDispatcherDebugCommand">
             <argument type="service" id="event_dispatcher" />
             <tag name="console.command" command="debug:event-dispatcher" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
+        <service id="console.command.router_debug" class="Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand">
             <argument type="service" id="router" />
             <tag name="console.command" command="debug:router" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
+        <service id="console.command.router_match" class="Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand">
             <argument type="service" id="router" />
             <tag name="console.command" command="router:match" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
+        <service id="console.command.translation_debug" class="Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand">
             <argument type="service" id="translator" />
             <argument type="service" id="translation.reader" />
             <argument type="service" id="translation.extractor" />
             <tag name="console.command" command="debug:translation" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
+        <service id="console.command.translation_update" class="Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand">
             <argument type="service" id="translation.writer" />
             <argument type="service" id="translation.reader" />
             <argument type="service" id="translation.extractor" />
             <argument>%kernel.default_locale%</argument>
             <tag name="console.command" command="translation:update" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
+        <service id="console.command.workflow_dump" class="Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand">
             <tag name="console.command" command="workflow:dump" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
+        <service id="console.command.xliff_lint" class="Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand">
             <tag name="console.command" command="lint:xliff" />
         </service>
 
-        <service id="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
+        <service id="console.command.yaml_lint" class="Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand">
             <tag name="console.command" command="lint:yaml" />
         </service>
 
-        <service id="Symfony\Component\Form\Command\DebugCommand">
+        <service id="console.command.form_debug" class="Symfony\Component\Form\Command\DebugCommand">
             <argument type="service" id="form.registry" />
             <argument type="collection" /> <!-- All form types namespaces are stored here by FormPass -->
             <argument type="collection" /> <!-- All services form types are stored here by FormPass -->
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -68,12 +68,12 @@
             <argument type="tagged" tag="config_cache.resource_checker" />
         </service>
 
-        <service id="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
+        <service id="dependency_injection.config.container_parameters_resource_checker" class="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">
             <argument type="service" id="service_container" />
             <tag name="config_cache.resource_checker" priority="-980" />
         </service>
 
-        <service id="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
+        <service id="config.resource.self_checking_resource_checker" class="Symfony\Component\Config\Resource\SelfCheckingResourceChecker">
             <tag name="config_cache.resource_checker" priority="-990" />
         </service>
 
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
 
 use Doctrine\Common\Annotations\Annotation;
-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
 use Symfony\Bundle\FullStack;
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
@@ -314,7 +313,7 @@ public function testWorkflowServicesCanBeEnabled()
         $container = $this->createContainerFromFile('workflows_enabled');
 
         $this->assertTrue($container->has(Registry::class));
-        $this->assertTrue($container->hasDefinition(WorkflowDumpCommand::class));
+        $this->assertTrue($container->hasDefinition('console.command.workflow_dump'));
     }
 
     public function testRouter()

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,6 @@`
`13`	`13`
`14`	`14`	`use Doctrine\Common\Annotations\Reader;`
`15`	`15`	`use Symfony\Bridge\Monolog\Processor\DebugProcessor;`
`16`		`-use Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand;`
`17`		`-use Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand;`
`18`		`-use Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand;`
`19`		`-use Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand;`
`20`		`-use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;`
`21`		`-use Symfony\Bundle\FrameworkBundle\Command\XliffLintCommand;`
`22`		`-use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;`
`23`	`16`	`use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;`
`24`	`17`	`use Symfony\Bundle\FrameworkBundle\Controller\Controller;`
`25`	`18`	`use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;`
`@@ -152,10 +145,10 @@ public function load(array $configs, ContainerBuilder $container)`
`152`	`145`	`$loader->load('console.xml');`
`153`	`146`
`154`	`147`	`if (!class_exists(BaseXliffLintCommand::class)) {`
`155`		`- $container->removeDefinition(XliffLintCommand::class);`
	`148`	`+ $container->removeDefinition('console.command.xliff_lint');`
`156`	`149`	`}`
`157`	`150`	`if (!class_exists(BaseYamlLintCommand::class)) {`
`158`		`- $container->removeDefinition(YamlLintCommand::class);`
	`151`	`+ $container->removeDefinition('console.command.yaml_lint');`
`159`	`152`	`}`
`160`	`153`	`}`
`161`	`154`
`@@ -251,7 +244,7 @@ public function load(array $configs, ContainerBuilder $container)`
`251`	`244`	`$container->removeDefinition('form.type_guesser.validator');`
`252`	`245`	`}`
`253`	`246`	`} else {`
`254`		`- $container->removeDefinition('Symfony\Component\Form\Command\DebugCommand');`
	`247`	`+ $container->removeDefinition('console.command.form_debug');`
`255`	`248`	`}`
`256`	`249`
`257`	`250`	`$this->registerSecurityCsrfConfiguration($config['csrf_protection'], $container, $loader);`
`@@ -572,7 +565,7 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $`
`572`	`565`	`private function registerWorkflowConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`573`	`566`	`{`
`574`	`567`	`if (!$config['enabled']) {`
`575`		`- $container->removeDefinition(WorkflowDumpCommand::class);`
	`568`	`+ $container->removeDefinition('console.command.workflow_dump');`
`576`	`569`
`577`	`570`	`return;`
`578`	`571`	`}`
`@@ -757,8 +750,8 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con`
`757`	`750`	`private function registerRouterConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
`758`	`751`	`{`
`759`	`752`	`if (!$this->isConfigEnabled($container, $config)) {`
`760`		`- $container->removeDefinition(RouterDebugCommand::class);`
`761`		`- $container->removeDefinition(RouterMatchCommand::class);`
	`753`	`+ $container->removeDefinition('console.command.router_debug');`
	`754`	`+ $container->removeDefinition('console.command.router_match');`
`762`	`755`
`763`	`756`	`return;`
`764`	`757`	`}`
`@@ -1087,8 +1080,8 @@ private function createVersion(ContainerBuilder $container, $version, $format, $`
`1087`	`1080`	`private function registerTranslatorConfiguration(array $config, ContainerBuilder $container, LoaderInterface $loader)`
`1088`	`1081`	`{`
`1089`	`1082`	`if (!$this->isConfigEnabled($container, $config)) {`
`1090`		`- $container->removeDefinition(TranslationDebugCommand::class);`
`1091`		`- $container->removeDefinition(TranslationUpdateCommand::class);`
	`1083`	`+ $container->removeDefinition('console.command.translation_debug');`
	`1084`	`+ $container->removeDefinition('console.command.translation_update');`
`1092`	`1085`
`1093`	`1086`	`return;`
`1094`	`1087`	`}`