symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Container.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Container.php
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+5Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+5Lines changed: 5 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+5-5Lines changed: 5 additions & 5 deletions
@@ -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);
             }
 
@@ -1376,6 +1376,11 @@ private function getServiceCall($id, Reference $reference = null)
             return '$this';
         }
 
+        if ($this->container->hasDefinition($id) && !$this->container->getDefinition($id)->isPublic()) {
+            // The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? \$this->{$this->generateMethodName($id)}())" on PHP>=7.0
+
+            return "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : \$this->{$this->generateMethodName($id)}()) && false ?: '_'}";
+        }
         if (null !== $reference && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $reference->getInvalidBehavior()) {
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
         } else {
 
@@ -110,7 +110,7 @@ protected function getConfiguredServiceService()
     {
         $this->services['configured_service'] = $instance = new \stdClass();
 
-        $this->get('configurator_service')->configureStdClass($instance);
+        ${($_ = isset($this->services['configurator_service']) ? $this->services['configurator_service'] : $this->getConfiguratorServiceService()) && false ?: '_'}->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);
+        ${($_ = isset($this->services['configurator_service_simple']) ? $this->services['configurator_service_simple'] : $this->getConfiguratorServiceSimpleService()) && false ?: '_'}->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'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->getFactorySimpleService()) && false ?: '_'}->getInstance();
     }
 
     /**
@@ -279,7 +279,7 @@ protected function getFooWithInlineService()
     {
         $this->services['foo_with_inline'] = $instance = new \Foo();
 
-        $instance->setBar($this->get('inlined'));
+        $instance->setBar(${($_ = isset($this->services['inlined']) ? $this->services['inlined'] : $this->getInlinedService()) && false ?: '_'});
 
         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 = ${($_ = isset($this->services['new_factory']) ? $this->services['new_factory'] : $this->getNewFactoryService()) && false ?: '_'}->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
`@@ -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`	`+ ${($_ = isset($this->services['configurator_service']) ? $this->services['configurator_service'] : $this->getConfiguratorServiceService()) && false ?: '_'}->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`	`+ ${($_ = isset($this->services['configurator_service_simple']) ? $this->services['configurator_service_simple'] : $this->getConfiguratorServiceSimpleService()) && false ?: '_'}->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'] = ${($_ = isset($this->services['factory_simple']) ? $this->services['factory_simple'] : $this->getFactorySimpleService()) && false ?: '_'}->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(${($_ = isset($this->services['inlined']) ? $this->services['inlined'] : $this->getInlinedService()) && false ?: '_'});`
`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 = ${($_ = isset($this->services['new_factory']) ? $this->services['new_factory'] : $this->getNewFactoryService()) && false ?: '_'}->getInstance();`
`325`	`325`
`326`	`326`	`$instance->foo = 'bar';`
`327`	`327`