Fix merge

nicolas-grekas · nicolas-grekas · commit d3e81e5402c3 · 2017-11-23T12:13:33.000+01:00
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -1151,7 +1151,7 @@ private function callMethod($service, $call, \SplObjectStorage $inlinedDefinitio
      */
     private function shareService(Definition $definition, $service, $id, \SplObjectStorage $inlinedDefinitions)
     {
-        if (!$definition->isShared() || self::SCOPE_PROTOTYPE === $scope = $definition->getScope()) {
+        if (!$definition->isShared() || self::SCOPE_PROTOTYPE === $scope = $definition->getScope(false)) {
             return;
         }
         if (null === $id) {

Original file line number	Diff line number	Diff line change
`@@ -1151,7 +1151,7 @@ private function callMethod($service, $call, \SplObjectStorage $inlinedDefinitio`
`1151`	`1151`	`*/`
`1152`	`1152`	`private function shareService(Definition $definition, $service, $id, \SplObjectStorage $inlinedDefinitions)`
`1153`	`1153`	`{`
`1154`		`- if (!$definition->isShared() \|\| self::SCOPE_PROTOTYPE === $scope = $definition->getScope()) {`
	`1154`	`+ if (!$definition->isShared() \|\| self::SCOPE_PROTOTYPE === $scope = $definition->getScope(false)) {`
`1155`	`1155`	`return;`
`1156`	`1156`	`}`
`1157`	`1157`	`if (null === $id) {`