diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 23e65483b03d3..8719ce967e784 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -353,7 +353,7 @@ class %s extends {$options['class']}
EOF;
foreach ($this->preload as $class) {
- if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void'], true)) {
+ if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void', 'never'], true)) {
continue;
}
if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
@@ -846,8 +846,7 @@ private function addService(string $id, Definition $definition): array
if ($class = $definition->getClass()) {
$class = $class instanceof Parameter ? '%'.$class.'%' : $this->container->resolveEnvPlaceholders($class);
$return[] = sprintf(str_starts_with($class, '%') ? '@return object A %1$s instance' : '@return \%s', ltrim($class, '\\'));
- } elseif ($definition->getFactory()) {
- $factory = $definition->getFactory();
+ } elseif ($factory = $definition->getFactory()) {
if (\is_string($factory) && !str_starts_with($factory, '@=')) {
$return[] = sprintf('@return object An instance returned by %s()', $factory);
} elseif (\is_array($factory) && (\is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
@@ -1170,9 +1169,7 @@ private function addNewInstance(Definition $definition, string $return = '', ?st
$arguments[] = (\is_string($i) ? $i.': ' : '').$this->dumpValue($value);
}
- if (null !== $definition->getFactory()) {
- $callable = $definition->getFactory();
-
+ if ($callable = $definition->getFactory()) {
if ('current' === $callable && [0] === array_keys($definition->getArguments()) && \is_array($value) && [0] === array_keys($value)) {
return $return.$this->dumpValue($value[0]).$tail;
}
@@ -2293,7 +2290,6 @@ private function getAutoloadFile(): ?string
private function getClasses(Definition $definition, string $id): array
{
$classes = [];
- $resolve = $this->container->getParameterBag()->resolveValue(...);
while ($definition instanceof Definition) {
foreach ($definition->getTag($this->preloadTags[0]) as $tag) {
@@ -2305,24 +2301,24 @@ private function getClasses(Definition $definition, string $id): array
}
if ($class = $definition->getClass()) {
- $classes[] = trim($resolve($class), '\\');
+ $classes[] = trim($class, '\\');
}
$factory = $definition->getFactory();
+ if (\is_string($factory) && !str_starts_with($factory, '@=') && str_contains($factory, '::')) {
+ $factory = explode('::', $factory);
+ }
+
if (!\is_array($factory)) {
- $factory = [$factory];
+ $definition = $factory;
+ continue;
}
- if (\is_string($factory[0])) {
- $factory[0] = $resolve($factory[0]);
+ $definition = $factory[0] ?? null;
- if (false !== $i = strrpos($factory[0], '::')) {
- $factory[0] = substr($factory[0], 0, $i);
- }
+ if (\is_string($definition)) {
$classes[] = trim($factory[0], '\\');
}
-
- $definition = $factory[0];
}
return $classes;
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy