Commit 20f2f27

authored

Faster AutowiredAttributeServicesExtension->processParameters() (#4489)

1 parent a29b29d commit 20f2f27Copy full SHA for 20f2f27

File tree

1 file changed

+18

-14

lines changed

src/DependencyInjection
- AutowiredAttributeServicesExtension.php

1 file changed

+18

-14

lines changed

`‎src/DependencyInjection/AutowiredAttributeServicesExtension.php‎`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`use stdClass;`
`20`	`20`	`use function explode;`
`21`	`21`	`use function strcasecmp;`
	`22`	`+use function strtolower;`
`22`	`23`	`use function substr;`
`23`	`24`
`24`	`25`	`final class AutowiredAttributeServicesExtension extends CompilerExtension`
`@@ -39,6 +40,15 @@ public function loadConfiguration(): void`
`39`	`40`	`$builder = $this->getContainerBuilder();`
`40`	`41`
`41`	`42`	`$autowiredParameters = Attributes::findTargetMethodParameters(AutowiredParameter::class);`
	`43`	`+ $constructorParameters = [];`
	`44`	`+ foreach ($autowiredParameters as $parameter) {`
	`45`	`+ if (strcasecmp($parameter->method, '__construct') !== 0) {`
	`46`	`+ continue;`
	`47`	`+ }`
	`48`	`+ $lowerClass = strtolower($parameter->class);`
	`49`	`+ $constructorParameters[$lowerClass] ??= [];`
	`50`	`+ $constructorParameters[$lowerClass][] = $parameter;`
	`51`	`+ }`
`42`	`52`
`43`	`53`	`foreach (Attributes::findTargetClasses(AutowiredService::class) as $class) {`
`44`	`54`	`$reflection = new ReflectionClass($class->name);`
`@@ -53,7 +63,7 @@ public function loadConfiguration(): void`
`53`	`63`	`$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));`
`54`	`64`	`}`
`55`	`65`
`56`		`- $this->processParameters($class->name, $definition, $autowiredParameters);`
	`66`	`+ $this->processConstructorParameters($class->name, $definition, $constructorParameters);`
`57`	`67`
`58`	`68`	`foreach (ValidateServiceTagsExtension::INTERFACE_TAG_MAPPING as $interface => $tag) {`
`59`	`69`	`if (!$reflection->implementsInterface($interface)) {`
`@@ -76,7 +86,7 @@ public function loadConfiguration(): void`
`76`	`86`	`$definition->setFactory(new Statement([new Reference(substr($ref, 1)), $method]));`
`77`	`87`	`}`
`78`	`88`
`79`		`- $this->processParameters($class->name, $definition, $autowiredParameters);`
	`89`	`+ $this->processConstructorParameters($class->name, $definition, $constructorParameters);`
`80`	`90`	`}`
`81`	`91`
`82`	`92`	`foreach (Attributes::findTargetClasses(GenerateFactory::class) as $class) {`
`@@ -89,7 +99,7 @@ public function loadConfiguration(): void`
`89`	`99`	`}`
`90`	`100`
`91`	`101`	`$resultDefinition = $definition->getResultDefinition();`
`92`		`- $this->processParameters($class->name, $resultDefinition, $autowiredParameters);`
	`102`	`+ $this->processConstructorParameters($class->name, $resultDefinition, $constructorParameters);`
`93`	`103`	`}`
`94`	`104`
`95`	`105`	`/** @var stdClass&object{level: int\|null} $config */`
`@@ -109,7 +119,7 @@ public function loadConfiguration(): void`
`109`	`119`	`->setAutowired($class->name)`
`110`	`120`	`->addTag(LazyRegistry::RULE_TAG);`
`111`	`121`
`112`		`- $this->processParameters($class->name, $definition, $autowiredParameters);`
	`122`	`+ $this->processConstructorParameters($class->name, $definition, $constructorParameters);`
`113`	`123`	`}`
`114`	`124`
`115`	`125`	`foreach (Attributes::findTargetClasses(RegisteredCollector::class) as $class) {`
`@@ -123,24 +133,18 @@ public function loadConfiguration(): void`
`123`	`133`	`->setAutowired($class->name)`
`124`	`134`	`->addTag(RegistryFactory::COLLECTOR_TAG);`
`125`	`135`
`126`		`- $this->processParameters($class->name, $definition, $autowiredParameters);`
	`136`	`+ $this->processConstructorParameters($class->name, $definition, $constructorParameters);`
`127`	`137`	`}`
`128`	`138`	`}`
`129`	`139`
`130`	`140`	`/**`
`131`	`141`	`* @param class-string $className`
`132`		`- * @param TargetMethodParameter<AutowiredParameter>[] $autowiredParameters`
	`142`	`+ * @param array<lowercase-string, non-empty-list<TargetMethodParameter<AutowiredParameter>>> $constructorParameters`
`133`	`143`	`*/`
`134`		`- private function processParameters(string $className, ServiceDefinition $definition, array $autowiredParameters): void`
	`144`	`+ private function processConstructorParameters(string $className, ServiceDefinition $definition, array $constructorParameters): void`
`135`	`145`	`{`
`136`	`146`	`$builder = $this->getContainerBuilder();`
`137`		`- foreach ($autowiredParameters as $autowiredParameter) {`
`138`		`- if (strcasecmp($autowiredParameter->method, '__construct') !== 0) {`
`139`		`- continue;`
`140`		`- }`
`141`		`- if (strcasecmp($autowiredParameter->class, $className) !== 0) {`
`142`		`- continue;`
`143`		`- }`
	`147`	`+ foreach ($constructorParameters[strtolower($className)] ?? [] as $autowiredParameter) {`
`144`	`148`	`$ref = $autowiredParameter->attribute->ref;`
`145`	`149`	`if ($ref === null) {`
`146`	`150`	`$argument = Helpers::expand(`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 20f2f27

File tree

1 file changed

1 file changed

`‎src/DependencyInjection/AutowiredAttributeServicesExtension.php‎`

0 commit comments