prevent calling get() for service_container service

xabbuh · xabbuh · commit 64f8a7e02592 · 2016-05-19T20:52:14.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);
     }
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -412,7 +412,7 @@ public function has($id)
     public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
         if (!$this->compiled) {
-            @trigger_error(sprintf('Calling %s before compiling the container is deprecated since version 3.2 and will throw an exception in 4.0.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling %s() before compiling the container is deprecated since version 3.2 and will throw an exception in 4.0.', __METHOD__), E_USER_DEPRECATED);
         }
 
         $id = strtolower($id);

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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ public function has($id)`
`412`	`412`	`public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)`
`413`	`413`	`{`
`414`	`414`	`if (!$this->compiled) {`
`415`		`- @trigger_error(sprintf('Calling %s before compiling the container is deprecated since version 3.2 and will throw an exception in 4.0.', __METHOD__), E_USER_DEPRECATED);`
	`415`	`+ @trigger_error(sprintf('Calling %s() before compiling the container is deprecated since version 3.2 and will throw an exception in 4.0.', __METHOD__), E_USER_DEPRECATED);`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`$id = strtolower($id);`