[DI] Dont use Container::get() when fetching private services internally

nicolas-grekas · nicolas-grekas · commit e2823070b647 · 2016-08-22T19:26:01.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -181,6 +181,7 @@ public function set($id, $service)
         if (isset($this->privates[$id])) {
             if (null === $service) {
                 @trigger_error(sprintf('Unsetting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
+                unset($this->privates[$id]);
             } else {
                 @trigger_error(sprintf('Setting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0. A new public service will be created instead.', $id), E_USER_DEPRECATED);
             }
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1376,6 +1376,9 @@ private function getServiceCall($id, Reference $reference = null)
             return '$this';
         }
 
+        if ($this->container->hasDefinition($id) && !$this->container->getDefinition($id)->isPublic()) {
+            return "\$this->services[(isset(\$this->services['$id']) || \$this->services['$id'] = \$this->{$this->generateMethodName($id)}()) && false ?: '$id']";
+        }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
         } else {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@@ -110,7 +110,7 @@ protected function getConfiguredServiceService()
     {
         $this->services['configured_service'] = $instance = new \stdClass();
 
-        $this->get('configurator_service')->configureStdClass($instance);
+        $this->services[(isset($this->services['configurator_service']) || $this->services['configurator_service'] = $this->getConfiguratorServiceService()) && false ?: 'configurator_service']->configureStdClass($instance);
 
         return $instance;
     }
@@ -127,7 +127,7 @@ protected function getConfiguredServiceSimpleService()
     {
         $this->services['configured_service_simple'] = $instance = new \stdClass();
 
-        $this->get('configurator_service_simple')->configureStdClass($instance);
+        $this->services[(isset($this->services['configurator_service_simple']) || $this->services['configurator_service_simple'] = $this->getConfiguratorServiceSimpleService()) && false ?: 'configurator_service_simple']->configureStdClass($instance);
 
         return $instance;
     }
@@ -211,7 +211,7 @@ protected function getFactoryServiceService()
      */
     protected function getFactoryServiceSimpleService()
     {
-        return $this->services['factory_service_simple'] = $this->get('factory_simple')->getInstance();
+        return $this->services['factory_service_simple'] = $this->services[(isset($this->services['factory_simple']) || $this->services['factory_simple'] = $this->getFactorySimpleService()) && false ?: 'factory_simple']->getInstance();
     }
 
     /**
@@ -279,7 +279,7 @@ protected function getFooWithInlineService()
     {
         $this->services['foo_with_inline'] = $instance = new \Foo();
 
-        $instance->setBar($this->get('inlined'));
+        $instance->setBar($this->services[(isset($this->services['inlined']) || $this->services['inlined'] = $this->getInlinedService()) && false ?: 'inlined']);
 
         return $instance;
     }
@@ -321,7 +321,7 @@ protected function getMethodCall1Service()
      */
     protected function getNewFactoryServiceService()
     {
-        $this->services['new_factory_service'] = $instance = $this->get('new_factory')->getInstance();
+        $this->services['new_factory_service'] = $instance = $this->services[(isset($this->services['new_factory']) || $this->services['new_factory'] = $this->getNewFactoryService()) && false ?: 'new_factory']->getInstance();
 
         $instance->foo = 'bar';
 

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ public function set($id, $service)`
`181`	`181`	`if (isset($this->privates[$id])) {`
`182`	`182`	`if (null === $service) {`
`183`	`183`	`@trigger_error(sprintf('Unsetting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);`
	`184`	`+ unset($this->privates[$id]);`
`184`	`185`	`} else {`
`185`	`186`	`@trigger_error(sprintf('Setting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0. A new public service will be created instead.', $id), E_USER_DEPRECATED);`
`186`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1376,6 +1376,9 @@ private function getServiceCall($id, Reference $reference = null)`
`1376`	`1376`	`return '$this';`
`1377`	`1377`	`}`
`1378`	`1378`
	`1379`	`+ if ($this->container->hasDefinition($id) && !$this->container->getDefinition($id)->isPublic()) {`
	`1380`	`+ return "\$this->services[(isset(\$this->services['$id']) \|\| \$this->services['$id'] = \$this->{$this->generateMethodName($id)}()) && false ?: '$id']";`
	`1381`	`+ }`
`1379`	`1382`	`if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {`
`1380`	`1383`	`return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);`
`1381`	`1384`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ protected function getConfiguredServiceService()`
`110`	`110`	`{`
`111`	`111`	`$this->services['configured_service'] = $instance = new \stdClass();`
`112`	`112`
`113`		`- $this->get('configurator_service')->configureStdClass($instance);`
	`113`	`+ $this->services[(isset($this->services['configurator_service']) \|\| $this->services['configurator_service'] = $this->getConfiguratorServiceService()) && false ?: 'configurator_service']->configureStdClass($instance);`
`114`	`114`
`115`	`115`	`return $instance;`
`116`	`116`	`}`
`@@ -127,7 +127,7 @@ protected function getConfiguredServiceSimpleService()`
`127`	`127`	`{`
`128`	`128`	`$this->services['configured_service_simple'] = $instance = new \stdClass();`
`129`	`129`
`130`		`- $this->get('configurator_service_simple')->configureStdClass($instance);`
	`130`	`+ $this->services[(isset($this->services['configurator_service_simple']) \|\| $this->services['configurator_service_simple'] = $this->getConfiguratorServiceSimpleService()) && false ?: 'configurator_service_simple']->configureStdClass($instance);`
`131`	`131`
`132`	`132`	`return $instance;`
`133`	`133`	`}`
`@@ -211,7 +211,7 @@ protected function getFactoryServiceService()`
`211`	`211`	`*/`
`212`	`212`	`protected function getFactoryServiceSimpleService()`
`213`	`213`	`{`
`214`		`- return $this->services['factory_service_simple'] = $this->get('factory_simple')->getInstance();`
	`214`	`+ return $this->services['factory_service_simple'] = $this->services[(isset($this->services['factory_simple']) \|\| $this->services['factory_simple'] = $this->getFactorySimpleService()) && false ?: 'factory_simple']->getInstance();`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`/**`
`@@ -279,7 +279,7 @@ protected function getFooWithInlineService()`
`279`	`279`	`{`
`280`	`280`	`$this->services['foo_with_inline'] = $instance = new \Foo();`
`281`	`281`
`282`		`- $instance->setBar($this->get('inlined'));`
	`282`	`+ $instance->setBar($this->services[(isset($this->services['inlined']) \|\| $this->services['inlined'] = $this->getInlinedService()) && false ?: 'inlined']);`
`283`	`283`
`284`	`284`	`return $instance;`
`285`	`285`	`}`
`@@ -321,7 +321,7 @@ protected function getMethodCall1Service()`
`321`	`321`	`*/`
`322`	`322`	`protected function getNewFactoryServiceService()`
`323`	`323`	`{`
`324`		`- $this->services['new_factory_service'] = $instance = $this->get('new_factory')->getInstance();`
	`324`	`+ $this->services['new_factory_service'] = $instance = $this->services[(isset($this->services['new_factory']) \|\| $this->services['new_factory'] = $this->getNewFactoryService()) && false ?: 'new_factory']->getInstance();`
`325`	`325`
`326`	`326`	`$instance->foo = 'bar';`
`327`	`327`