10000 Backport psr/cache 1.1/2.0 compatibility · symfony/symfony@0814e29 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0814e29

Browse files
derrabusderrabus
committed
Backport psr/cache 1.1/2.0 compatibility
1 parent 2536e17 commit 0814e29

File tree

5 files changed

+6
-4
lines changed

5 files changed

+6
-4
lines changed

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@
148148
"phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
149149
"phpdocumentor/type-resolver": "<0.3.0|1.3.*",
150150
"ocramius/proxy-manager": "<2.1",
151-
"phpunit/phpunit": "<5.4.3"
151+
"phpunit/phpunit": "<5.4.3",
152+
"psr/container": "1.1.0"
152153
},
153154
"autoload": {
154155
"psr-4": {

‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):
146146
$this->decoratedClass = null;
147147
$this->getPreviousValue = null;
148148

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)) {
150150
$this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
151151
}
152152

‎src/Symfony/Component/DependencyInjection/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
3434
},
3535
"conflict": {
36+
"psr/container": "1.1.0",
3637
"symfony/config": "<4.3|>=5.0",
3738
"symfony/finder": "<3.4",
3839
"symfony/proxy-manager-bridge": "<3.4",

‎src/Symfony/Component/Security/Core/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"symfony/service-contracts": "^1.1.6|^2"
2222
},
2323
"require-dev": {
24-
"psr/container": "^1.0",
24+
"psr/container": "^1.0|^2.0",
2525
"symfony/event-dispatcher": "^4.3",
2626
"symfony/expression-language": "^3.4|^4.0|^5.0",
2727
"symfony/http-foundation": "^3.4|^4.0|^5.0",

‎src/Symfony/Component/Security/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"symfony/security-http": "self.version"
3131
},
3232
"require-dev": {
33-
"psr/container": "^1.0",
33+
"psr/container": "^1.0|^2.0",
3434
"symfony/finder": "^3.4|^4.0|^5.0",
3535
"symfony/polyfill-ctype": "~1.8",
3636
"symfony/polyfill-intl-icu": "~1.0",

0 commit comments

Comments
 (0)
0