Remove internals from autowiring

sensiolabs · Nov 18, 2017 · 055fde3 · 055fde3
1 parent da05b73
commit 055fde3
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/DependencyInjection/SensioFrameworkExtraExtension.php b/DependencyInjection/SensioFrameworkExtraExtension.php
@@ -103,10 +103,10 @@ public function load(array $configs, ContainerBuilder $container)
                 if (class_exists(SecurityExpressionLanguage::class)) {
                     $container->setAlias('sensio_framework_extra.security.expression_language', new Alias($config['security']['expression_language'], false));
                 } else {
-                    $container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
+                    $container->removeDefinition('framework_extra_bundle.expression_language');
                 }
             } else {
-                $container->removeDefinition('Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage');
+                $container->removeDefinition('framework_extra_bundle.expression_language');
             }
 
             if (PHP_VERSION_ID < 70000) {
@@ -137,7 +137,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         if (!empty($config['templating']['controller_patterns'])) {
             $container
-                ->getDefinition('Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser')
+                ->getDefinition('framework_extra_bundle.templating.guesser')
                 ->addArgument($config['templating']['controller_patterns']);
         }
 

diff --git a/Resources/config/annotations.xml b/Resources/config/annotations.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" public="false">
+        <service id="framework_extra_bundle.event.controller" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" public="false">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="annotation_reader" />
         </service>

diff --git a/Resources/config/cache.xml b/Resources/config/cache.xml
@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" public="false">
+        <service id="framework_extra_bundle.event.http_cache" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" public="false">
             <tag name="kernel.event_subscriber" />
         </service>
     </services>

diff --git a/Resources/config/converters.xml b/Resources/config/converters.xml
@@ -7,22 +7,22 @@
     <services>
         <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" public="false">
             <tag name="kernel.event_subscriber" />
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
+            <argument type="service" id="framework_extra_bundle.doctrine_param_converter_manager" />
             <argument>true</argument>
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
+        <service id="framework_extra_bundle.doctrine_param_converter_manager" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" public="false">
+        <service id="framework_extra_bundle.doctrine_param_converter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" public="false">
             <tag name="request.param_converter" converter="doctrine.orm" />
             <argument type="service" id="doctrine" on-invalid="ignore" />
             <argument type="service" id="sensio_framework_extra.converter.doctrine.orm.expression_language" on-invalid="null" />
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" public="false">
+        <service id="framework_extra_bundle.date_time_param_converter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DateTimeParamConverter" public="false">
             <tag name="request.param_converter" converter="datetime" />
         </service>
 
-        <service id="Symfony\Component\ExpressionLanguage\ExpressionLanguage" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
+        <service id="framework_extra_bundle.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
     </services>
 </container>
diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml
@@ -5,19 +5,19 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
+        <service id="framework_extra_bundle.loader.annotation_directory" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" />
+            <argument type="service" id="framework_extra_bundle.controller.annotated_route" />
         </service>
 
-        <service id="Symfony\Component\Routing\Loader\AnnotationFileLoader" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
+        <service id="framework_extra_bundle.loader.annotation_file" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" />
+            <argument type="service" id="framework_extra_bundle.controller.annotated_route" />
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
+        <service id="framework_extra_bundle.controller.annotated_route" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="annotation_reader" />
         </service>

diff --git a/Resources/config/security.xml b/Resources/config/security.xml
@@ -5,8 +5,8 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" public="false">
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" />
+        <service id="framework_extra_bundle.event.security" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\SecurityListener" public="false">
+            <argument type="service" id="framework_extra_bundle.argument_name_convertor" />
             <argument type="service" id="sensio_framework_extra.security.expression_language" on-invalid="null" />
             <argument type="service" id="security.authentication.trust_resolver" on-invalid="null" />
             <argument type="service" id="security.role_hierarchy" on-invalid="null" />
@@ -16,15 +16,15 @@
             <tag name="kernel.event_subscriber" />
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" class="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" public="false" />
+        <service id="framework_extra_bundle.expression_language" class="Sensio\Bundle\FrameworkExtraBundle\Security\ExpressionLanguage" public="false" />
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" public="false">
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" />
+        <service id="framework_extra_bundle.event.is_granted" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\IsGrantedListener" public="false">
+            <argument type="service" id="framework_extra_bundle.argument_name_convertor" />
             <argument type="service" id="security.authorization_checker" on-invalid="null" />
             <tag name="kernel.event_subscriber" />
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" public="false">
+        <service id="framework_extra_bundle.argument_name_convertor" class="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentNameConverter" public="false">
             <argument type="service" id="argument_metadata_factory" />
         </service>
     </services>

diff --git a/Resources/config/view.xml b/Resources/config/view.xml
@@ -5,13 +5,13 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" class="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" public="false">
+        <service id="framework_extra_bundle.templating.guesser" class="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" public="false">
             <argument type="service" id="kernel" />
         </service>
 
-        <service id="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" public="false">
+        <service id="framework_extra_bundle.templating.listener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\TemplateListener" public="false">
             <tag name="kernel.event_subscriber" />
-            <argument type="service" id="Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser" />
+            <argument type="service" id="framework_extra_bundle.templating.guesser" />
             <argument type="service" id="twig" on-invalid="null" />
         </service>
     </services>

diff --git a/Tests/DependencyInjection/SensioFrameworkExtraExtensionTest.php b/Tests/DependencyInjection/SensioFrameworkExtraExtensionTest.php
@@ -58,7 +58,7 @@ public function testTemplatingControllerPatterns()
 
         $extension->load(array($config), $container);
 
-        $this->assertEquals($patterns, $container->getDefinition('Sensio\Bundle\FrameworkExtraBundle\Templating\TemplateGuesser')->getArgument(1));
+        $this->assertEquals($patterns, $container->getDefinition('framework_extra_bundle.templating.guesser')->getArgument(1));
     }
 
     private function assertAlias(ContainerBuilder $container, $value, $key)