Backport psr/container 1.1/2.0 compatibility

derrabus · derrabus · commit b5f97557faa4 · 2021-03-05T19:16:26.000+01:00
diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -146,7 +146,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):
         $this->decoratedClass = null;
         $this->getPreviousValue = null;
 
-        if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && $this->container->has($this->decoratedId = $definition->innerServiceId)) {
+        if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && null !== ($this->decoratedId = $definition->innerServiceId) && $this->container->has($this->decoratedId)) {
             $this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):`
`146`	`146`	`$this->decoratedClass = null;`
`147`	`147`	`$this->getPreviousValue = null;`
`148`	`148`
`149`		`- if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && $this->container->has($this->decoratedId = $definition->innerServiceId)) {`
	`149`	`+ if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && null !== ($this->decoratedId = $definition->innerServiceId) && $this->container->has($this->decoratedId)) {`
`150`	`150`	`$this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();`
`151`	`151`	`}`
`152`	`152`