bug #40386 [DependencyInjection][Security] Backport psr/container 1.1/2.0 compatibility (derrabus)

derrabus · derrabus · commit 869c734194e9 · 2021-03-05T21:09:10.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection][Security] Backport psr/container 1.1/2.0 compatibility | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix https://github.com/symfony/symfony/pull/40384/files#r588494278 | License | MIT | Doc PR | N/A This PR backports a fix that I had to apply to the 5.x branch in order to make it compatible with the `psr/container` 1.1 interfaces. It also updates various composer.json files: * Security Core only consumes a PSR `ContainerInterface` without providing its own implementation. I should be compatible with version 2 of the PSR package already. * ~~DependencyInjection breaks on PHP 7.2 and 7.3 if `psr/container` 1.1.0 is installed. A version 1.1.1 has already been release that fixes the issue. I've added a conflict rule to document the incompatibility.~~ Commits ------- 7f8242e Backport psr/container 1.1/2.0 compatibility
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/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();
         }
 
diff --git a/src/Symfony/Component/Security/Core/composer.json b/src/Symfony/Component/Security/Core/composer.json
@@ -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",
diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json
@@ -30,7 +30,7 @@
         "symfony/security-http": "self.version"
     },
     "require-dev": {
-        "psr/container": "^1.0",
+        "psr/container": "^1.0|^2.0",
         "symfony/finder": "^3.4|^4.0|^5.0",
         "symfony/polyfill-ctype": "~1.8",
         "symfony/polyfill-intl-icu": "~1.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`