Skip to content

Faster MapBuilder::build() #1089

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2025
Merged

Faster MapBuilder::build() #1089

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ee14bf
Faster MapBuilder->build()
staabm Aug 29, 2025
6e58db6
Refactor
staabm Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 30 additions & 39 deletions src/Target/MapBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

use function array_keys;
use function array_merge;
use function array_merge_recursive;
use function array_slice;
use function array_unique;
use function count;
Expand Down Expand Up @@ -72,20 +71,7 @@ public function build(Filter $filter, FileAnalyser $analyser): array
continue;
}

$file = array_keys($traits[$traitName])[0];

if (!isset($traits[$trait->namespacedName()][$file])) {
$traits[$trait->namespacedName()][$file] = $traits[$traitName][$file];

continue;
}

$traits[$trait->namespacedName()][$file] = array_unique(
array_merge(
$traits[$trait->namespacedName()][$file],
$traits[$traitName][$file],
),
);
$this->mergeLines($trait->namespacedName(), $traits[$traitName], $traits);
}
}
}
Expand All @@ -109,20 +95,7 @@ public function build(Filter $filter, FileAnalyser $analyser): array
continue;
}

foreach ($traits[$traitName] as $traitFile => $lines) {
if (!isset($classes[$class->namespacedName()][$traitFile])) {
$classes[$class->namespacedName()][$traitFile] = $lines;

continue;
}

$classes[$class->namespacedName()][$traitFile] = array_unique(
array_merge(
$classes[$class->namespacedName()][$traitFile],
$lines,
),
);
}
$this->mergeLines($class->namespacedName(), $traits[$traitName], $classes);
}

$this->processMethods($class, $file, $methods, $reverseLookup);
Expand Down Expand Up @@ -160,16 +133,7 @@ public function build(Filter $filter, FileAnalyser $analyser): array
}

foreach ($this->parentClasses($classDetails, $class) as $parentClass) {
$merged = array_merge_recursive(
$classes[$class->namespacedName()],
$classes[$parentClass->namespacedName()],
);

foreach ($merged as $mergedFile => $lines) {
$merged[$mergedFile] = array_unique($lines);
}

$classes[$class->namespacedName()] = $merged;
$this->mergeLines($class->namespacedName(), $classes[$parentClass->namespacedName()], $classes);

if (isset($classesThatExtendClass[$parentClass->namespacedName()])) {
$this->process($classesThatExtendClass, $parentClass->namespacedName(), $class->file(), $class->startLine(), $class->endLine());
Expand Down Expand Up @@ -205,6 +169,33 @@ public function build(Filter $filter, FileAnalyser $analyser): array
];
}

private function mergeLines(string $targetClass, array $sourceData, array &$data): void
{
// in big inheritance trees we might handle a lot of data.
// this loop needs to prevent unnecessary work whenever possible.

foreach ($sourceData as $file => $lines) {
if (!isset($data[$targetClass][$file])) {
$data[$targetClass][$file] = $lines;

continue;
}

if (
$data[$targetClass][$file] === $lines
) {
continue;
}

$data[$targetClass][$file] = array_unique(
array_merge(
$data[$targetClass][$file],
$lines,
),
);
}
}

private function processMethods(Class_|Trait_ $classOrTrait, string $file, array &$methods, array &$reverseLookup): void
{
foreach ($classOrTrait->methods() as $method) {
Expand Down
Loading