prevent calling get() for service_container service

xabbuh · xabbuh · commit 2d46bd481211 · 2016-05-09T17:08:24.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -274,6 +274,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
             return $builder->getAlias($serviceId);
         }
 
+        if ('service_container' === $serviceId) {
+            return $builder;
+        }
+
         // the service has been injected in some special way, just return the service
         return $builder->get($serviceId);
     }

Original file line number	Diff line number	Diff line change
`@@ -274,6 +274,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI`
`274`	`274`	`return $builder->getAlias($serviceId);`
`275`	`275`	`}`
`276`	`276`
	`277`	`+ if ('service_container' === $serviceId) {`
	`278`	`+ return $builder;`
	`279`	`+ }`
	`280`	`+`
`277`	`281`	`// the service has been injected in some special way, just return the service`
`278`	`282`	`return $builder->get($serviceId);`
`279`	`283`	`}`