diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.1'

Browse Source 
* 4.1:
  [DI] fix undefined offset in InlineServiceDefinitionsPass
  [Security/Http] Fix deps conflict
This commit is contained in:
Nicolas Grekas 2018-05-25 13:58:16 +02:00
commit 0fba5b1660
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
View File

@ -120,6 +120,6 @@ class InlineServiceDefinitionsPass extends AbstractRecursivePass implements Repe
return false;
}
return $this->container->getDefinition($ids[0])->isShared();
return !$ids || $this->container->getDefinition($ids[0])->isShared();
}
}

2
src/Symfony/Component/Security/Http/composer.json
View File

@ -29,7 +29,7 @@
"psr/log": "~1.0"
},
"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": {
"symfony/security-csrf": "For using tokens to protect authentication/logout attempts",