Merge branch '4.1'
* 4.1: [DI] fix undefined offset in InlineServiceDefinitionsPass [Security/Http] Fix deps conflict
This commit is contained in:
commit
0fba5b1660
@ -120,6 +120,6 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->container->getDefinition($ids[0])->isShared();
|
return !$ids || $this->container->getDefinition($ids[0])->isShared();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
"psr/log": "~1.0"
|
"psr/log": "~1.0"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"symfony/security-csrf": ">=3.4.0,<3.4.11 || >=4.0.0,<4.0.11"
|
"symfony/security-csrf": "<3.4.11|~4.0,<4.0.11|~4.1,<=4.1.0-beta2"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"symfony/security-csrf": "For using tokens to protect authentication/logout attempts",
|
"symfony/security-csrf": "For using tokens to protect authentication/logout attempts",
|
||||||
|
Reference in New Issue
Block a user