Skip to content

Commit b86b1e2

Browse files
Merge branch '6.3' into 6.4
* 6.3: typo fix typo fix
2 parents 0eb33e3 + 22d8487 commit b86b1e2

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
@@ -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;

0 commit comments

Comments
 (0)