Skip to content

Faster AutowiredAttributeServicesExtension->processParameters() #4489

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 6 commits into from
Oct 28, 2025
Merged

Faster AutowiredAttributeServicesExtension->processParameters() #4489

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5342523
Faster AutowiredAttributeServicesExtension->processParameters()
staabm Oct 27, 2025
a970c8c
Update AutowiredAttributeServicesExtension.php
staabm Oct 27, 2025
15131c7
reduce duplicate work in parameter processing
staabm Oct 27, 2025
06c96cf
cs
staabm Oct 27, 2025
bd356a5
Update AutowiredAttributeServicesExtension.php
staabm Oct 27, 2025
3304f4d
fix case in-sensitivity
staabm Oct 28, 2025
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
32 changes: 18 additions & 14 deletions src/DependencyInjection/AutowiredAttributeServicesExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use stdClass;
use function explode;
use function strcasecmp;
use function strtolower;
use function substr;

final class AutowiredAttributeServicesExtension extends CompilerExtension
Expand All @@ -39,6 +40,15 @@ public function loadConfiguration(): void
$builder = $this->getContainerBuilder();

$autowiredParameters = Attributes::findTargetMethodParameters(AutowiredParameter::class);
$constructorParameters = [];
foreach ($autowiredParameters as $parameter) {
if (strcasecmp($parameter->method, '__construct') !== 0) {
continue;
}
$lowerClass = strtolower($parameter->class);
$constructorParameters[$lowerClass] ??= [];
$constructorParameters[$lowerClass][] = $parameter;
}

foreach (Attributes::findTargetClasses(AutowiredService::class) as $class) {
$reflection = new ReflectionClass($class->name);
Expand All @@ -53,7 +63,7 @@ public function loadConfiguration(): void
$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));
}

$this->processParameters($class->name, $definition, $autowiredParameters);
$this->processConstructorParameters($class->name, $definition, $constructorParameters);

foreach (ValidateServiceTagsExtension::INTERFACE_TAG_MAPPING as $interface => $tag) {
if (!$reflection->implementsInterface($interface)) {
Expand All @@ -76,7 +86,7 @@ public function loadConfiguration(): void
$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));
}

$this->processParameters($class->name, $definition, $autowiredParameters);
$this->processConstructorParameters($class->name, $definition, $constructorParameters);
}

foreach (Attributes::findTargetClasses(GenerateFactory::class) as $class) {
Expand All @@ -89,7 +99,7 @@ public function loadConfiguration(): void
}

$resultDefinition = $definition->getResultDefinition();
$this->processParameters($class->name, $resultDefinition, $autowiredParameters);
$this->processConstructorParameters($class->name, $resultDefinition, $constructorParameters);
}

/** @var stdClass&object{level: int|null} $config */
Expand All @@ -109,7 +119,7 @@ public function loadConfiguration(): void
->setAutowired($class->name)
->addTag(LazyRegistry::RULE_TAG);

$this->processParameters($class->name, $definition, $autowiredParameters);
$this->processConstructorParameters($class->name, $definition, $constructorParameters);
}

foreach (Attributes::findTargetClasses(RegisteredCollector::class) as $class) {
Expand All @@ -123,24 +133,18 @@ public function loadConfiguration(): void
->setAutowired($class->name)
->addTag(RegistryFactory::COLLECTOR_TAG);

$this->processParameters($class->name, $definition, $autowiredParameters);
$this->processConstructorParameters($class->name, $definition, $constructorParameters);
}
}

/**
* @param class-string $className
* @param TargetMethodParameter<AutowiredParameter>[] $autowiredParameters
* @param array<lowercase-string, non-empty-list<TargetMethodParameter<AutowiredParameter>>> $constructorParameters
*/
private function processParameters(string $className, ServiceDefinition $definition, array $autowiredParameters): void
private function processConstructorParameters(string $className, ServiceDefinition $definition, array $constructorParameters): void
{
$builder = $this->getContainerBuilder();
foreach ($autowiredParameters as $autowiredParameter) {
if (strcasecmp($autowiredParameter->method, '__construct') !== 0) {
continue;
}
if (strcasecmp($autowiredParameter->class, $className) !== 0) {
continue;
}
foreach ($constructorParameters[strtolower($className)] ?? [] as $autowiredParameter) {
$ref = $autowiredParameter->attribute->ref;
if ($ref === null) {
$argument = Helpers::expand(
Expand Down
Loading