Fix merge

This commit is contained in:
Nicolas Grekas 2017-11-23 12:13:33 +01:00
parent 10ec39e850
commit 37baa1de51

View File

@ -1151,7 +1151,7 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
*/ */
private function shareService(Definition $definition, $service, $id, \SplObjectStorage $inlinedDefinitions) 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; return;
} }
if (null === $id) { if (null === $id) {