-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
[DI] skip preloading dependencies of non-preloaded services #36535
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
100 changes: 100 additions & 0 deletions
100
src/Symfony/Component/DependencyInjection/Compiler/ResolveNoPreloadPass.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\DependencyInjection\Compiler; | ||
|
|
||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Definition; | ||
| use Symfony\Component\DependencyInjection\Reference; | ||
|
|
||
| /** | ||
| * Propagate the "container.no_preload" tag. | ||
| * | ||
| * @author Nicolas Grekas <p@tchwork.com> | ||
| */ | ||
| class ResolveNoPreloadPass extends AbstractRecursivePass | ||
| { | ||
| private const DO_PRELOAD_TAG = '.container.do_preload'; | ||
|
|
||
| private $tagName; | ||
| private $resolvedIds = []; | ||
|
|
||
| public function __construct(string $tagName = 'container.no_preload') | ||
| { | ||
| $this->tagName = $tagName; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function process(ContainerBuilder $container) | ||
| { | ||
| $this->container = $container; | ||
|
|
||
| try { | ||
| foreach ($container->getDefinitions() as $id => $definition) { | ||
| if ($definition->isPublic() && !$definition->isPrivate() && !isset($this->resolvedIds[$id])) { | ||
| $this->resolvedIds[$id] = true; | ||
| $this->processValue($definition, true); | ||
| } | ||
| } | ||
|
|
||
| foreach ($container->getAliases() as $alias) { | ||
| if ($alias->isPublic() && !$alias->isPrivate() && !isset($this->resolvedIds[$id = (string) $alias]) && $container->has($id)) { | ||
| $this->resolvedIds[$id] = true; | ||
| $this->processValue($container->getDefinition($id), true); | ||
| } | ||
| } | ||
| } finally { | ||
| $this->resolvedIds = []; | ||
| $this->container = null; | ||
| } | ||
|
|
||
| foreach ($container->getDefinitions() as $definition) { | ||
| if ($definition->hasTag(self::DO_PRELOAD_TAG)) { | ||
| $definition->clearTag(self::DO_PRELOAD_TAG); | ||
| } elseif (!$definition->isDeprecated() && !$definition->hasErrors()) { | ||
| $definition->addTag($this->tagName); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| protected function processValue($value, bool $isRoot = false) | ||
| { | ||
| if ($value instanceof Reference && ContainerBuilder::IGNORE_ON_UNINITIALIZED_REFERENCE !== $value->getInvalidBehavior() && $this->container->has($id = (string) $value)) { | ||
| $definition = $this->container->findDefinition($id); | ||
|
|
||
| if (!isset($this->resolvedIds[$id])) { | ||
| $this->resolvedIds[$id] = true; | ||
| $this->processValue($definition, true); | ||
| } | ||
|
|
||
| return $value; | ||
| } | ||
|
|
||
| if (!$value instanceof Definition) { | ||
| return parent::processValue($value, $isRoot); | ||
| } | ||
|
|
||
| if ($value->hasTag($this->tagName) || $value->isDeprecated() || $value->hasErrors()) { | ||
| return $value; | ||
| } | ||
|
|
||
| if ($isRoot) { | ||
| $value->addTag(self::DO_PRELOAD_TAG); | ||
| } | ||
|
|
||
| return parent::processValue($value, $isRoot); | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveNoPreloadPassTest.php
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\DependencyInjection\Tests\Compiler; | ||
|
|
||
| use PHPUnit\Framework\TestCase; | ||
| use Symfony\Component\DependencyInjection\Compiler\ResolveNoPreloadPass; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Reference; | ||
|
|
||
| class ResolveNoPreloadPassTest extends TestCase | ||
| { | ||
| public function testProcess() | ||
| { | ||
| $container = new ContainerBuilder(); | ||
|
|
||
| $container->register('entry_point') | ||
| ->setPublic(true) | ||
| ->addArgument(new Reference('preloaded')) | ||
| ->addArgument(new Reference('not_preloaded')); | ||
|
|
||
| $container->register('preloaded') | ||
| ->addArgument(new Reference('preloaded_dep')) | ||
| ->addArgument(new Reference('common_dep')); | ||
|
|
||
| $container->register('not_preloaded') | ||
| ->setPublic(true) | ||
| ->addTag('container.no_preload') | ||
| ->addArgument(new Reference('not_preloaded_dep')) | ||
| ->addArgument(new Reference('common_dep')); | ||
|
|
||
| $container->register('preloaded_dep'); | ||
| $container->register('not_preloaded_dep'); | ||
| $container->register('common_dep'); | ||
|
|
||
| (new ResolveNoPreloadPass())->process($container); | ||
|
|
||
| $this->assertFalse($container->getDefinition('entry_point')->hasTag('container.no_preload')); | ||
| $this->assertFalse($container->getDefinition('preloaded')->hasTag('container.no_preload')); | ||
| $this->assertFalse($container->getDefinition('preloaded_dep')->hasTag('container.no_preload')); | ||
| $this->assertFalse($container->getDefinition('common_dep')->hasTag('container.no_preload')); | ||
| $this->assertTrue($container->getDefinition('not_preloaded')->hasTag('container.no_preload')); | ||
| $this->assertTrue($container->getDefinition('not_preloaded_dep')->hasTag('container.no_preload')); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What if a class is both a subscriber and tagged with additional
kernel.listenertags ?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then we don't really care IMHO: it should be exceptional, thus not worth any extra complexity. And the outcome is minor anyway.