prevent calling get() for service_container service

xabbuh · xabbuh · commit 42860ebb8bb1 · 2016-05-09T17:40:32.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -256,6 +256,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
`@@ -256,6 +256,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI`
`256`	`256`	`return $builder->getAlias($serviceId);`
`257`	`257`	`}`
`258`	`258`
	`259`	`+ if ('service_container' === $serviceId) {`
	`260`	`+ return $builder;`
	`261`	`+ }`
	`262`	`+`
`259`	`263`	`// the service has been injected in some special way, just return the service`
`260`	`264`	`return $builder->get($serviceId);`
`261`	`265`	`}`