[DependencyInjection] Fix #[AutowireCallable] sometimes incorrectly inlined
#62755
+72
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
reviewed
Dec 12, 2025
| } else { | ||
| $container->removeDefinition($id); | ||
| $analyzedContainer->removeDefinition($id); | ||
| if (!isset($this->autowireInline[$id])) { |
Member
There was a problem hiding this comment.
Why doing this special case here not removing the definition ? If it can be inlined, there is no reason to keep it.
Maybe the fix is to avoid considering it as inlineable.
Member
Author
There was a problem hiding this comment.
The issue is not that the service itself is being inlined. The real problem occurs when one of the service's arguments is an AutowireCallable. If the parent service is removed, then \count($srcIds) for the argument service becomes 1, which is incorrect. As a result, the argument service is inlined when it should not be.
nicolas-grekas
approved these changes
Dec 14, 2025
|
|
||
| $this->assertStringEqualsFile(self::$fixturesPath.'/php/autowire_callable_with_service_locator.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_AutowireCallable_With_ServiceLocator'])); | ||
|
|
||
| require self::$fixturesPath.'/php/autowire_callable_with_service_locator.php'; |
Member
There was a problem hiding this comment.
what about using an inline eval and skip committing the generated code?
HypeMC
force-pushed
the
fix-autowirecallable-with-servicelocator
branch
from
6b5f7d9 to
3b22fc2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using a combination of
#[AutowireCallable]and a service locator, services may be incorrectly inlined, resulting in a broken compiled container. For example, before and after the fix (namespaces removed for readability):/** * Gets the private 'Listener1' shared autowired service. * * @return \Listener1 */ protected static function getListener1Service($container) { - return $container->privates['Listener1'] = new \Listener1(($container->services['MyInlineService'] ?? $container->get('MyInlineService'))->someMethod1(...)); + return $container->privates['Listener1'] = new \Listener1(($container->privates['MyInlineService'] ??= new \MyInlineService())->someMethod1(...)); } /** * Gets the private 'Listener2' shared autowired service. * * @return \Listener2 */ protected static function getListener2Service($container) { - return $container->privates['Listener2'] = new \Listener2((new \MyInlineService())->someMethod1(...), new \stdClass()); + return $container->privates['Listener2'] = new \Listener2(($container->privates['MyInlineService'] ??= new \MyInlineService())->someMethod2(...), new \stdClass()); }The
getListener1Service()method was broken because$container->get('MyInlineService')throws an exception:The issue is not present in 6.4.