Skip to content

Commit e660f4f

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param prevent calling get() for service_container service call get() after the container was compiled Fixed readme of OptionsResolver [DependencyInjection] Suggest ExpressionLanguage in composer.json
2 parents 9f5a58c + 4125407 commit e660f4f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Console/Descriptor/Descriptor.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
274274
return $builder->getAlias($serviceId);
275275
}
276276

277+
if ('service_container' === $serviceId) {
278+
return $builder;
279+
}
280+
277281
// the service has been injected in some special way, just return the service
278282
return $builder->get($serviceId);
279283
}

0 commit comments

Comments
 (0)