Skip to content

[DependencyInjection] Fix parsing nested AutowireInline attributes #58631

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.

Sign up for GitHub

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 1 commit into from
Oct 22, 2024
Merged

[DependencyInjection] Fix parsing nested AutowireInline attributes #58631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/Symfony/Component/DependencyInjection/Compiler/ResolveAutowireInlineAttributesPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ class ResolveAutowireInlineAttributesPass extends AbstractRecursivePass
{
protected bool $skipScalars = true;

private int $counter;

protected function processValue(mixed $value, bool $isRoot = false): mixed
{
$value = parent::processValue($value, $isRoot);
Expand All @@ -36,6 +38,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
return $value;
}

if ($isRoot) {
$this->counter = 0;
}

$isChildDefinition = $value instanceof ChildDefinition;

try {
Expand Down Expand Up @@ -92,10 +98,14 @@ private function registerAutowireInlineAttributes(\ReflectionFunctionAbstract $m
}

if (\array_key_exists('$'.$parameter->name, $arguments) || (\array_key_exists($index, $arguments) && '' !== $arguments[$index])) {
$attribute = \array_key_exists('$'.$parameter->name, $arguments) ? $arguments['$'.$parameter->name] : $arguments[$index];
if (!$attribute instanceof AutowireInline) {
continue;
}
} elseif (!$attribute = $parameter->getAttributes(AutowireInline::class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null) {
continue;
}
if (!$attribute = $parameter->getAttributes(AutowireInline::class, \ReflectionAttribute::IS_INSTANCEOF)[0] ?? null) {
continue;
} else {
$attribute = $attribute->newInstance();
}

$type = ProxyHelper::exportType($parameter, true);
Expand All @@ -104,25 +114,18 @@ private function registerAutowireInlineAttributes(\ReflectionFunctionAbstract $m
continue;
}

$attribute = $attribute->newInstance();
$definition = $attribute->buildDefinition($attribute->value, $type, $parameter);

$paramResolverContainer->setDefinition('.autowire_inline', $definition);
(new ResolveParameterPlaceHoldersPass(false, false))->process($paramResolverContainer);

$id = '.autowire_inline.'.ContainerBuilder::hash([$this->currentId, $method->class ?? null, $method->name, (string) $parameter]);
$id = '.autowire_inline.'.$this->currentId.'.'.++$this->counter;

$this->container->setDefinition($id, $definition);
$arguments[$isChildDefinition ? '$'.$parameter->name : $index] = new Reference($id);

if ($definition->isAutowired()) {
$currentId = $this->currentId;
try {
$this->currentId = $id;
$this->processValue($definition, true);
} finally {
$this->currentId = $currentId;
}
$this->processValue($definition);
}
}

Expand Down
18 changes: 18 additions & 0 deletions .../Component/DependencyInjection/Tests/Compiler/ResolveAutowireInlineAttributesPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
use Symfony\Component\DependencyInjection\Compiler\ResolveChildDefinitionsPass;
use Symfony\Component\DependencyInjection\Compiler\ResolveNamedArgumentsPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Reference;

require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';

Expand Down Expand Up @@ -66,4 +68,20 @@ public function testChildDefinition()

$this->assertSame(['$inlined'], array_keys($container->getDefinition('autowire_inline1')->getArguments()));
}

public function testNestedAttribute()
{
$container = new ContainerBuilder();

$container->register('nested_autowire_inline', NestedAutowireInlineAttribute::class)
->setAutowired(true);

(new ResolveAutowireInlineAttributesPass())->process($container);

$this->assertEquals([new Reference('.autowire_inline.nested_autowire_inline.1')], $container->getDefinition('nested_autowire_inline')->getArguments());
$this->assertSame(AutowireInlineAttributesBar::class, $container->getDefinition('.autowire_inline.nested_autowire_inline.1')->getClass());

$this->assertEquals([new Reference('.autowire_inline.nested_autowire_inline.2'), 'testString'], $container->getDefinition('.autowire_inline.nested_autowire_inline.1')->getArguments());
$this->assertSame(Foo::class, $container->getDefinition('.autowire_inline.nested_autowire_inline.2')->getClass());
}
}
15 changes: 15 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_80.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,18 @@ public function __construct(
) {
}
}

class NestedAutowireInlineAttribute
{
public function __construct(
#[AutowireInline(
AutowireInlineAttributesBar::class,
arguments: [
new AutowireInline(Foo::class),
'testString',
],
)]
public AutowireInlineAttributesBar $inlined,
) {
}
}