bug #41177 [DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass (nicolas-grekas)
This PR was merged into the 5.3-dev branch.
Discussion
----------
[DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass
| Q | A
| ------------- | ---
| Branch? | 5.x
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | Fix #40868
| License | MIT
| Doc PR | -
Commits
-------
5c3ee39cfd
[DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass
This commit is contained in:
commit
094b507a05
@ -48,8 +48,10 @@ final class AttributeAutoconfigurationPass extends AbstractRecursivePass
|
||||
$configurator($conditionals, $attribute->newInstance(), $reflector);
|
||||
}
|
||||
}
|
||||
if (!isset($instanceof[$reflector->getName()]) && new ChildDefinition('') != $conditionals) {
|
||||
$instanceof[$reflector->getName()] = $conditionals;
|
||||
$value->setInstanceofConditionals($instanceof);
|
||||
}
|
||||
|
||||
return parent::processValue($value, $isRoot);
|
||||
}
|
||||
|
@ -0,0 +1,36 @@
|
||||
<?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\Attribute\AsTaggedItem;
|
||||
use Symfony\Component\DependencyInjection\Compiler\AttributeAutoconfigurationPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
|
||||
/**
|
||||
* @requires PHP 8
|
||||
*/
|
||||
class AttributeAutoconfigurationPassTest extends TestCase
|
||||
{
|
||||
public function testProcessAddsNoEmptyInstanceofConditionals()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
$container->registerAttributeForAutoconfiguration(AsTaggedItem::class, static function () {});
|
||||
$container->register('foo', \stdClass::class)
|
||||
->setAutoconfigured(true)
|
||||
;
|
||||
|
||||
(new AttributeAutoconfigurationPass())->process($container);
|
||||
|
||||
$this->assertSame([], $container->getDefinition('foo')->getInstanceofConditionals());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user