diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #41177 [DependencyInjection] fix empty instanceof-conditionals created by AttributeAutoconfigurationPass (nicolas-grekas)

Browse Source 
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:
Nicolas Grekas 2021-05-11 19:00:41 +02:00
commit 094b507a05
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php
View File

@ -48,8 +48,10 @@ final class AttributeAutoconfigurationPass extends AbstractRecursivePass
$configurator($conditionals, $attribute->newInstance(), $reflector);
}
}
$instanceof[$reflector->getName()] = $conditionals;
$value->setInstanceofConditionals($instanceof);
if (!isset($instanceof[$reflector->getName()]) && new ChildDefinition('') != $conditionals) {
$instanceof[$reflector->getName()] = $conditionals;
$value->setInstanceofConditionals($instanceof);
}
return parent::processValue($value, $isRoot);
}

36
src/Symfony/Component/DependencyInjection/Tests/Compiler/AttributeAutoconfigurationPassTest.php Normal file
View File

@ -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());
}
}