Skip to content

Commit 41802f6

Browse files
Merge branch '6.4' into 7.0
* 6.4: typo fix typo fix
2 parents e56c6e4 + b86b1e2 commit 41802f6

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

Dumper/PhpDumper.php

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

573-
$r = $this->container->getReflectionClass($class);
574-
do {
575-
$file = $r->getFileName();
576-
if (str_ends_with($file, ') : eval()\'d code')) {
577-
$file = substr($file, 0, strrpos($file, '(', -17));
578-
}
579-
if (is_file($file)) {
580-
$this->container->addResource(new FileResource($file));
573+
foreach (array_column($definition->getTag('proxy'), 'interface') ?: [$class] as $r) {
574+
if (!$r = $this->container->getReflectionClass($r)) {
575+
continue;
581576
}
582-
$r = $r->getParentClass() ?: null;
583-
} while ($r?->isUserDefined());
577+
do {
578+
$file = $r->getFileName();
579+
if (str_ends_with($file, ') : eval()\'d code')) {
580+
$file = substr($file, 0, strrpos($file, '(', -17));
581+
}
582+
if (is_file($file)) {
583+
$this->container->addResource(new FileResource($file));
584+
}
585+
$r = $r->getParentClass() ?: null;
586+
} while ($r?->isUserDefined());
587+
}
584588

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

0 commit comments

Comments
 (0)