8000 Merge branch '6.3' into 6.4 · symfony/symfony@9d68d28 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9d68d28

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.3' into 6.4
* 6.3: typo fix typo fix
2 parents 98d91e1 + f06bd17 commit 9d68d28

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -583,17 +583,21 @@ private function generateProxyClasses(): array
583583
}
584584
$alreadyGenerated[$asGhostObject][$class] = true;
585585

586-
$r = $this->container->getReflectionClass($class);
587-
do {
588-
$file = $r->getFileName();
589-
if (str_ends_with($file, ') : eval()\'d code')) {
590-
$file = substr($file, 0, strrpos($file, '(', -17));
591-
}
592-
if (is_file($file)) {
593-
$this->container->addResource(new FileResource($file));
586+
foreach (array_column($definition->getTag('proxy'), 'interface') ?: [$class] as $r) {
587+
if (!$r = $this->container->getReflectionClass($r)) {
588+
continue;
594589
}
595-
$r = $r->getParentClass() ?: null;
596-
} while ($r?->isUserDefined());
590+
do {
591+
$file = $r->getFileName();
592+
if (str_ends_with($file, ') : eval()\'d code')) {
593+
$file = substr($file, 0, strrpos($file, '(', -17));
594+
}
595+
if (is_file($file)) {
596+
$this->container->addResource(new FileResource($file));
597+
}
598+
$r = $r->getParentClass() ?: null;
599+
} while ($r?->isUserDefined());
600+
}
597601

598602
if ("\n" === $proxyCode = "\n".$proxyDumper->getProxyCode($definition, $id)) {
599603
continue;

‎src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function process(ContainerBuilder $container)
9191

9292
if (null !== ($class = $container->getDefinition($id)->getClass()) && ($r = $container->getReflectionClass($class, false)) && !$r->hasMethod($event['method'])) {
9393
if (!$r->hasMethod('__invoke')) {
94-
throw new InvalidArgumentException(sprintf('None of the "%s" or "__invoke" methods exist for the service "foo". Please define the "method" attribute on "kernel.event_listener" tags.', $event['method'], $id, $this->listenerTag));
94+
throw new InvalidArgumentException(sprintf('None of the "%s" or "__invoke" methods exist for the service "foo". Please define the "method" attribute on "kernel.event_listener" tags.', $event['method'], $id));
9595
}
9696

9797
$event['method'] = '__invoke';

0 commit comments

Comments
 (0)
0