Skip to content

Commit fe6b1d0

Browse files
GromNaNGromNaN
committed
Rename method to getAttributeAutoconfigurators
1 parent 924f263 commit fe6b1d0

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

‎UPGRADE-7.3.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Console
4242
DependencyInjection
4343
-------------------
4444

45-
* Deprecate `ContainerBuilder::getAutoconfiguredAttributes()` in favor of the `getAttributeConfigurators()` method.
45+
* Deprecate `ContainerBuilder::getAutoconfiguredAttributes()` in favor of the `getAttributeAutoconfigurators()` method.
4646

4747
FrameworkBundle
4848
---------------

‎src/Symfony/Component/DependencyInjection/CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ CHANGELOG
99
* Don't skip classes with private constructor when autodiscovering
1010
* Add `Definition::addResourceTag()` and `ContainerBuilder::findTaggedResourceIds()`
1111
for auto-configuration of classes excluded from the service container
12+
* Accept multiple auto-configuration callbacks for the same attribute class
1213
* Leverage native lazy objects when possible for lazy services
13-
* Accept multiple attribute autoconfiguration callbacks for the same class
1414

1515
7.2
1616
---

‎src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ final class AttributeAutoconfigurationPass extends AbstractRecursivePass
3131

3232
public function process(ContainerBuilder $container): void
3333
{
34-
if (!$container->getAttributeConfigurators()) {
34+
if (!$container->getAttributeAutoconfigurators()) {
3535
return;
3636
}
3737

38-
foreach ($container->getAttributeConfigurators() as $attributeName => $callables) {
38+
foreach ($container->getAttributeAutoconfigurators() as $attributeName => $callables) {
3939
foreach ($callables as $callable) {
4040
$callableReflector = new \ReflectionFunction($callable(...));
4141
if ($callableReflector->getNumberOfParameters() <= 2) {

‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ public function merge(self $container): void
717717
$this->autoconfiguredInstanceof[$interface] = $childDefinition;
718718
}
719719

720-
foreach ($container->getAttributeConfigurators() as $attribute => $configurators) {
720+
foreach ($container->getAttributeAutoconfigurators() as $attribute => $configurators) {
721721
$this->autoconfiguredAttributes[$attribute] = array_merge(
722722
$this->autoconfiguredAttributes[$attribute] ?? [],
723723
$configurators)
@@ -1490,16 +1490,16 @@ public function getAutoconfiguredInstanceof(): array
14901490
/**
14911491
* @return array<class-string, callable>
14921492
*
1493-
* @deprecated Use {@see getAttributeConfigurators()} instead
1493+
* @deprecated Use {@see getAttributeAutoconfigurators()} instead
14941494
*/
14951495
public function getAutoconfiguredAttributes(): array
14961496
{
1497-
trigger_deprecation('symfony/dependency-injection', '7.3', 'The "%s()" method is deprecated, use "getAttributeConfigurators()" instead.', __METHOD__);
1497+
trigger_deprecation('symfony/dependency-injection', '7.3', 'The "%s()" method is deprecated, use "getAttributeAutoconfigurators()" instead.', __METHOD__);
14981498

14991499
$autoconfiguredAttributes = [];
15001500
foreach ($this->autoconfiguredAttributes as $attribute => $configurators) {
15011501
if (count($configurators) > 1) {
1502-
throw new LogicException(\sprintf('The "%s" attribute has %d configurators. Use "getAttributeConfigurators()" to get all of them.', $attribute, count($configurators)));
1502+
throw new LogicException(\sprintf('The "%s" attribute has %d configurators. Use "getAttributeAutoconfigurators()" to get all of them.', $attribute, count($configurators)));
15031503
}
15041504

15051505
$autoconfiguredAttributes[$attribute] = $configurators[0];
@@ -1511,7 +1511,7 @@ public function getAutoconfiguredAttributes(): array
15111511
/**
15121512
* @return array<class-string, callable[]>
15131513
*/
1514-
public function getAttributeConfigurators(): array
1514+
public function getAttributeAutoconfigurators(): array
15151515
{
15161516
return $this->autoconfiguredAttributes;
15171517
}

‎src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ public function testMergeAttributeAutoconfiguration()
839839
$config->registerAttributeForAutoconfiguration(AsTaggedItem::class, $c2 = function (Definition $definition) {});
840840

841841
$container->merge($config);
842-
$this->assertSame([AsTaggedItem::class => [$c1, $c2]], $container->getAttributeConfigurators());
842+
$this->assertSame([AsTaggedItem::class => [$c1, $c2]], $container->getAttributeAutoconfigurators());
843843
}
844844

845845
/**
@@ -850,7 +850,7 @@ public function testGetAutoconfiguredAttributes()
850850
$container = new ContainerBuilder();
851851
$container->registerAttributeForAutoconfiguration(AsTaggedItem::class, $c = static function () {});
852852

853-
$this->expectUserDeprecationMessage('Since symfony/dependency-injection 7.3: The "Symfony\Component\DependencyInjection\ContainerBuilder::getAutoconfiguredAttributes()" method is deprecated, use "getAttributeConfigurators()" instead.');
853+
$this->expectUserDeprecationMessage('Since symfony/dependency-injection 7.3: The "Symfony\Component\DependencyInjection\ContainerBuilder::getAutoconfiguredAttributes()" method is deprecated, use "getAttributeAutoconfigurators()" instead.');
854854
$configurators = $container->getAutoconfiguredAttributes();
855855
$this->assertSame($c, $configurators[AsTaggedItem::class]);
856856

0 commit comments

Comments
 (0)