Skip to content

Commit b752633

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [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 top-level anonymous services must be public [DependencyInjection] Suggest ExpressionLanguage in composer.json added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+
2 parents 6bfae24 + e660f4f commit b752633

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
@@ -256,6 +256,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
256256
return $builder->getAlias($serviceId);
257257
}
258258

259+
if ('service_container' === $serviceId) {
260+
return $builder;
261+
}
262+
259263
// the service has been injected in some special way, just return the service
260264
return $builder->get($serviceId);
261265
}

0 commit comments

Comments
 (0)