Commit6fbdf41

committed

[DependencyInjection] Do not preload functions: check if the factory is the built-in method in thegetClasses.

1 parentcfb6b07 commit6fbdf41Copy full SHA for 6fbdf41

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ class %s extends {$options['class']}`
`353`	`353`	`EOF;`
`354`	`354`
`355`	`355`	`foreach ($this->preloadas$class) {`
`356`		`-if (!$class \|\|str_contains($class,'$') \|\|\in_array($class, ['int','float','string','bool','resource','object','array','null','callable','iterable','mixed','void','never'],true) \|\|\function_exists($class)) {`
	`356`	`+if (!$class \|\|str_contains($class,'$') \|\|\in_array($class, ['int','float','string','bool','resource','object','array','null','callable','iterable','mixed','void','never'],true)) {`
`357`	`357`	`continue;`
`358`	`358`	`}`
`359`	`359`	`if (!(class_exists($class,false) \|\|interface_exists($class,false) \|\|trait_exists($class,false)) \|\| (new \ReflectionClass($class))->isUserDefined()) {`
`@@ -2316,6 +2316,10 @@ private function getClasses(Definition $definition, string $id): array`
`2316`	`2316`	`if (\is_string($factory[0])) {`
`2317`	`2317`	`$factory[0] =$resolve($factory[0]);`
`2318`	`2318`
	`2319`	`+if (\function_exists($factory[0])) {`
	`2320`	`+break;`
	`2321`	`+ }`
	`2322`	`+`
`2319`	`2323`	`if (false !==$i =strrpos($factory[0],'::')) {`
`2320`	`2324`	`$factory[0] =substr($factory[0],0,$i);`
`2321`	`2325`	`}`

Comments

(0)