Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit aa66a47233da · 2018-05-25T13:57:52.000+02:00
* 3.4:
  [DI] fix undefined offset in InlineServiceDefinitionsPass
  [Security/Http] Fix deps conflict
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -120,6 +120,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
-        return $this->container->getDefinition($ids[0])->isShared();
+        return !$ids || $this->container->getDefinition($ids[0])->isShared();
     }
 }
diff --git a/src/Symfony/Component/Security/Http/composer.json b/src/Symfony/Component/Security/Http/composer.json
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`120`	`120`	`return false;`
`121`	`121`	`}`
`122`	`122`
`123`		`- return $this->container->getDefinition($ids[0])->isShared();`
	`123`	`+ return !$ids \|\| $this->container->getDefinition($ids[0])->isShared();`
`124`	`124`	`}`
`125`	`125`	`}`