bug #534 Fixing #530 by manually looking at #488 and reverting (weave…

…rryan) This PR was merged into the 5.1.x-dev branch. Discussion ---------- Fixing #530 by manually looking at #488 and reverting Hi guys! #530 was basically meant to revert #488, but it was not done perfectly. I approved it too quickly - my apologies for that. This fixes #532 I looked at each line in #488 and manually (and carefully) changed the code to use the old service id's everywhere. I believe this should fix the issues! Cheers! Commits ------- cb0851b Fixing #530 by manually looking at #488 and reverting
sensiolabs · Nov 30, 2017 · 4fc5d5b · 4fc5d5b
2 parents 1cdd44b + cb0851b
commit 4fc5d5b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/DependencyInjection/Compiler/OptimizerPass.php b/DependencyInjection/Compiler/OptimizerPass.php
@@ -28,7 +28,7 @@ public function process(ContainerBuilder $container)
         }
 
         if (!$container->hasDefinition('twig')) {
-            $container->removeDefinition('DependencyInjection/Compiler/OptimizerPass.php');
+            $container->removeDefinition('sensio_framework_extra.view.listener');
         }
     }
 }
diff --git a/DependencyInjection/SensioFrameworkExtraExtension.php b/DependencyInjection/SensioFrameworkExtraExtension.php
@@ -55,9 +55,9 @@ public function load(array $configs, ContainerBuilder $container)
 
             $container->addResource(new ClassExistenceResource(ExpressionLanguage::class));
             if (class_exists(ExpressionLanguage::class)) {
-                $container->setAlias('sensio_framework_extra.converter.doctrine.orm.expression_language', new Alias('Symfony\Component\ExpressionLanguage\ExpressionLanguage', false));
+                $container->setAlias('sensio_framework_extra.converter.doctrine.orm.expression_language', new Alias('sensio_framework_extra.converter.doctrine.orm.expression_language.default', false));
             } else {
-                $container->removeDefinition('Symfony\Component\ExpressionLanguage\ExpressionLanguage');
+                $container->removeDefinition('sensio_framework_extra.converter.doctrine.orm.expression_language.default');
             }
 
             if (PHP_VERSION_ID < 70000) {
@@ -131,7 +131,7 @@ public function load(array $configs, ContainerBuilder $container)
             }
 
             if ($config['request']['converters']) {
-                $container->getDefinition('Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener')->replaceArgument(1, $config['request']['auto_convert']);
+                $container->getDefinition('sensio_framework_extra.converter.listener')->replaceArgument(1, $config['request']['auto_convert']);
             }
         }
 

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="framework_extra_bundle.event.controller" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ControllerListener" public="false">
+        <service id="sensio_framework_extra.controller.listener" 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="framework_extra_bundle.event.http_cache" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\HttpCacheListener" public="false">
+        <service id="sensio_framework_extra.cache.listener" 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
@@ -5,15 +5,15 @@
     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\ParamConverterListener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" public="false">
+        <service id="sensio_framework_extra.converter.listener" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\ParamConverterListener" public="false">
             <tag name="kernel.event_subscriber" />
             <argument type="service" id="sensio_framework_extra.converter.manager" />
             <argument>true</argument>
         </service>
 
         <service id="sensio_framework_extra.converter.manager" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterManager" />
 
-        <service id="framework_extra_bundle.doctrine_param_converter" class="Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\DoctrineParamConverter" public="false">
+        <service id="sensio_framework_extra.converter.doctrine.orm" 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" />
@@ -23,6 +23,6 @@
             <tag name="request.param_converter" converter="datetime" />
         </service>
 
-        <service id="framework_extra_bundle.expression_language" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
+        <service id="sensio_framework_extra.converter.doctrine.orm.expression_language.default" class="Symfony\Component\ExpressionLanguage\ExpressionLanguage" public="false" />
     </services>
 </container>
diff --git a/Resources/config/psr7.xml b/Resources/config/psr7.xml
@@ -5,16 +5,16 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
-        <service id="Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory" class="Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory" public="false" />
-        <service id="Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory" class="Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory" public="false" />
+        <service id="sensio_framework_extra.psr7.http_message_factory" class="Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory" public="false" />
+        <service id="sensio_framework_extra.psr7.http_foundation_factory" class="Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory" public="false" />
 
         <service id="sensio_framework_extra.psr7.argument_value_resolver.server_request" class="Sensio\Bundle\FrameworkExtraBundle\Request\ArgumentValueResolver\Psr7ServerRequestResolver" public="false">
-            <argument type="service" id="Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory" />
+            <argument type="service" id="sensio_framework_extra.psr7.http_message_factory" />
             <tag name="controller.argument_value_resolver" />
         </service>
 
         <service id="sensio_framework_extra.psr7.listener.response" class="Sensio\Bundle\FrameworkExtraBundle\EventListener\PsrResponseListener" public="false">
-            <argument type="service" id="Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory" />
+            <argument type="service" id="sensio_framework_extra.psr7.http_foundation_factory" />
             <tag name="kernel.event_subscriber" />
         </service>
     </services>

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="framework_extra_bundle.loader.annotation_directory" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
+        <service id="sensio_framework_extra.routing.loader.annot_dir" class="Symfony\Component\Routing\Loader\AnnotationDirectoryLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
-            <argument type="service" id="framework_extra_bundle.controller.annotated_route" />
+            <argument type="service" id="sensio_framework_extra.routing.loader.annot_class" />
         </service>
 
-        <service id="framework_extra_bundle.loader.annotation_file" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
+        <service id="sensio_framework_extra.routing.loader.annot_file" class="Symfony\Component\Routing\Loader\AnnotationFileLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="file_locator" />
-            <argument type="service" id="framework_extra_bundle.controller.annotated_route" />
+            <argument type="service" id="sensio_framework_extra.routing.loader.annot_class" />
         </service>
 
-        <service id="framework_extra_bundle.controller.annotated_route" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
+        <service id="sensio_framework_extra.routing.loader.annot_class" class="Sensio\Bundle\FrameworkExtraBundle\Routing\AnnotatedRouteControllerLoader" public="false">
             <tag name="routing.loader" />
             <argument type="service" id="annotation_reader" />
         </service>