forked from symfony/symfony
-
Notifications
You must be signed in to change notification settings - Fork 0
Autowire arguments using attributes #1
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
derrabus
merged 1 commit into
derrabus:feature/bind-arguments
from
nicolas-grekas:feature/bind-arguments
Apr 11, 2021
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,102 +11,46 @@ | |
|
|
||
| namespace Symfony\Component\DependencyInjection\Compiler; | ||
|
|
||
| use Symfony\Component\DependencyInjection\Argument\BoundArgument; | ||
| use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument; | ||
| use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument; | ||
| use Symfony\Component\DependencyInjection\Attribute\BindTaggedIterator; | ||
| use Symfony\Component\DependencyInjection\Attribute\BindTaggedLocator; | ||
| use Symfony\Component\DependencyInjection\ChildDefinition; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
| use Symfony\Component\DependencyInjection\Definition; | ||
| use Symfony\Component\DependencyInjection\Exception\LogicException; | ||
|
|
||
| /** | ||
| * @author Alexander M. Turek <[email protected]> | ||
| */ | ||
| final class AttributeAutoconfigurationPass extends AbstractRecursivePass | ||
| { | ||
| /** @var array<string, callable>|null */ | ||
| private $argumentConfigurators; | ||
|
|
||
| public function process(ContainerBuilder $container): void | ||
| { | ||
| if (80000 > \PHP_VERSION_ID) { | ||
| if (80000 > \PHP_VERSION_ID || !$container->getAutoconfiguredAttributes()) { | ||
| return; | ||
| } | ||
|
|
||
| $this->argumentConfigurators = [ | ||
| BindTaggedIterator::class => static function (BindTaggedIterator $attribute) { | ||
| return new TaggedIteratorArgument($attribute->tag, $attribute->indexAttribute); | ||
| }, | ||
| BindTaggedLocator::class => static function (BindTaggedLocator $attribute) { | ||
| return new ServiceLocatorArgument(new TaggedIteratorArgument($attribute->tag, $attribute->indexAttribute)); | ||
| }, | ||
| ]; | ||
|
|
||
| parent::process($container); | ||
|
|
||
| $this->argumentConfigurators = null; | ||
| } | ||
|
|
||
| protected function processValue($value, bool $isRoot = false) | ||
| { | ||
| if ($value instanceof Definition | ||
| && $value->isAutoconfigured() | ||
| && !$value->isAbstract() | ||
| && !$value->hasTag('container.ignore_attributes') | ||
| if (!$value instanceof Definition | ||
| || !$value->isAutoconfigured() | ||
| || $value->isAbstract() | ||
| || $value->hasTag('container.ignore_attributes') | ||
| || !($reflector = $this->container->getReflectionClass($value->getClass(), false)) | ||
| ) { | ||
| $value = $this->processDefinition($value); | ||
| } | ||
|
|
||
| return parent::processValue($value, $isRoot); | ||
| } | ||
|
|
||
| private function processDefinition(Definition $definition): Definition | ||
| { | ||
| if (!$reflector = $this->container->getReflectionClass($definition->getClass(), false)) { | ||
| return $definition; | ||
| return parent::processValue($value, $isRoot); | ||
| } | ||
|
|
||
| $autoconfiguredAttributes = $this->container->getAutoconfiguredAttributes(); | ||
|
|
||
| $instanceof = $definition->getInstanceofConditionals(); | ||
| $instanceof = $value->getInstanceofConditionals(); | ||
| $conditionals = $instanceof[$reflector->getName()] ?? new ChildDefinition(''); | ||
| foreach ($reflector->getAttributes() as $attribute) { | ||
| if ($configurator = $autoconfiguredAttributes[$attribute->getName()] ?? null) { | ||
| $configurator($conditionals, $attribute->newInstance(), $reflector); | ||
| } | ||
| } | ||
|
|
||
| if ($constructor = $this->getConstructor($definition, false)) { | ||
| $definition = $this->bindArguments($definition, $constructor); | ||
| } | ||
|
|
||
| $instanceof[$reflector->getName()] = $conditionals; | ||
| $definition->setInstanceofConditionals($instanceof); | ||
|
|
||
| return $definition; | ||
| } | ||
|
|
||
| private function bindArguments(Definition $definition, \ReflectionFunctionAbstract $constructor): Definition | ||
| { | ||
| $bindings = $definition->getBindings(); | ||
| foreach ($constructor->getParameters() as $reflectionParameter) { | ||
| $argument = null; | ||
| foreach ($reflectionParameter->getAttributes() as $attribute) { | ||
| if (!$configurator = $this->argumentConfigurators[$attribute->getName()] ?? null) { | ||
| continue; | ||
| } | ||
| if ($argument) { | ||
| throw new LogicException(sprintf('Cannot autoconfigure argument "$%s": More than one autoconfigurable attribute found.', $reflectionParameter->getName())); | ||
| } | ||
| $argument = $configurator($attribute->newInstance()); | ||
| } | ||
| if ($argument) { | ||
| $bindings['$'.$reflectionParameter->getName()] = new BoundArgument($argument); | ||
| } | ||
| } | ||
| $value->setInstanceofConditionals($instanceof); | ||
|
|
||
| return $definition->setBindings($bindings); | ||
| return parent::processValue($value, $isRoot); | ||
| } | ||
| } | ||
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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
I don't think that the behavior that this test case checks is desired. Better deal with this in a fifo way. That's less code for us, to deal with a situation that we don't have to deal with in the first place.
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.
The intention here was to make a developer's mistake visible. But we can remove the check if you think we don't need it.