Fix merge
This commit is contained in:
parent
10ec39e850
commit
37baa1de51
@ -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) {
|
||||||
|
Reference in New Issue
Block a user