symfony
diff --git a/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+2-1Lines changed: 2 additions & 1 deletion b/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/DependencyInjection/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/composer.json
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/DependencyInjection/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/composer.json
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Component/Security/Core/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/composer.json
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/Core/composer.json
Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/composer.json
+1-1Lines changed: 1 addition & 1 deletion
@@ -148,7 +148,8 @@
         "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
         "phpdocumentor/type-resolver": "<0.3.0|1.3.*",
         "ocramius/proxy-manager": "<2.1",
-        "phpunit/phpunit": "<5.4.3"
+        "phpunit/phpunit": "<5.4.3",
+        "psr/container": "1.1.0"
     },
     "autoload": {
         "psr-4": {
 
@@ -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();
         }
 
 
@@ -33,6 +33,7 @@
         "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
     },
     "conflict": {
+        "psr/container": "1.1.0",
         "symfony/config": "<4.3|>=5.0",
         "symfony/finder": "<3.4",
         "symfony/proxy-manager-bridge": "<3.4",
 
@@ -21,7 +21,7 @@
         "symfony/service-contracts": "^1.1.6|^2"
     },
     "require-dev": {
-        "psr/container": "^1.0",
+        "psr/container": "^1.0|^2.0",
         "symfony/event-dispatcher": "^4.3",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/http-foundation": "^3.4|^4.0|^5.0",
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`