Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DependencyInjection] Fallback to default value when autowiring undefined parameters for optional arguments #50022

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
Apr 19, 2023
Merged

[DependencyInjection] Fallback to default value when autowiring undefined parameters for optional arguments #50022

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
14 changes: 11 additions & 3 deletions src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\TypedReference;
Expand Down Expand Up @@ -279,9 +280,16 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
if ($checkAttributes) {
foreach ($parameter->getAttributes() as $attribute) {
if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {
$arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());

continue 2;
try {
$arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
continue 2;
} catch (ParameterNotFoundException $e) {
if (!$parameter->isDefaultValueAvailable()) {
throw new AutowiringFailedException($this->currentId, $e->getMessage(), 0, $e);
}
$arguments[$index] = clone $this->defaultArgument;
$arguments[$index]->value = $parameter->getDefaultValue();
}
}
}
}
Expand Down
32 changes: 32 additions & 0 deletions src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,6 +1217,38 @@ public function testAutowireAttribute()
$this->assertNull($service->invalid);
}

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

$container->register('foo', AutowireAttributeNullFallback::class)
->setAutowired(true)
->setPublic(true)
;

$this->expectException(AutowiringFailedException::class);
$this->expectExceptionMessage('You have requested a non-existent parameter "required.parameter".');
(new AutowirePass())->process($container);
}

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

$container->register('foo', AutowireAttributeNullFallback::class)
->setAutowired(true)
->setPublic(true)
;

$container->setParameter('required.parameter', 'foo');

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

$definition = $container->getDefinition('foo');

$this->assertSame(['foo'], $definition->getArguments());
}

public function testAsDecoratorAttribute()
{
$container = new ContainerBuilder();
Expand Down
11 changes: 11 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 @@ -56,6 +56,17 @@ public function __construct(
}
}

class AutowireAttributeNullFallback
{
public function __construct(
#[Autowire('%required.parameter%')]
public string $required,
#[Autowire('%optional.parameter%')]
public ?string $optional = null,
) {
}
}

interface AsDecoratorInterface
{
}
Expand Down