Skip to content

Improve NamespaceLayerResolver performance by pre-compute normalised layers #47

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
samsonasik merged 1 commit into from
May 16, 2026
Merged

Improve NamespaceLayerResolver performance by pre-compute normalised layers #47

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 23 additions & 17 deletions src/LayerResolver/Resolvers/NamespaceLayerResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,27 @@
*/
final readonly class NamespaceLayerResolver implements LayerResolverInterface
{
/** @var array<string, list<string>> */
private array $normalisedLayers;

/**
* @param array<string, string|list<string>> $layers Map of layer name → path prefixes
*/
public function __construct(
private array $layers,
private string $basePath,
array $layers,
string $basePath,
) {
$normalisedLayers = [];

foreach ($layers as $layerName => $layerPaths) {
foreach ((array) $layerPaths as $layerPath) {
$normalisedLayers[$layerName][] = $this->normalisePath(
$basePath . DIRECTORY_SEPARATOR . trim($layerPath, '/')
);
}
}

$this->normalisedLayers = $normalisedLayers;
}

public function resolve(string $className, string $filePath): ?string
Expand All @@ -39,14 +53,10 @@ public function resolve(string $className, string $filePath): ?string
$matchedLayer = null;
$matchedLength = -1;

foreach ($this->layers as $layerName => $layerPaths) {
foreach ((array) $layerPaths as $layerPath) {
$normalisedLayer = $this->normalisePath(
$this->basePath . DIRECTORY_SEPARATOR . trim($layerPath, '/')
);

if (str_starts_with($normalised, $normalisedLayer)) {
$length = strlen($normalisedLayer);
foreach ($this->normalisedLayers as $layerName => $layerPaths) {
foreach ($layerPaths as $layerPath) {
if (str_starts_with($normalised, $layerPath)) {
$length = strlen($layerPath);

if ($length > $matchedLength) {
$matchedLayer = $layerName;
Expand All @@ -67,13 +77,9 @@ public function resolveAll(string $className, string $filePath): array
$normalised = $this->normalisePath($filePath);
$matched = [];

foreach ($this->layers as $layerName => $layerPaths) {
foreach ((array) $layerPaths as $layerPath) {
$normalisedLayer = $this->normalisePath(
$this->basePath . DIRECTORY_SEPARATOR . trim($layerPath, '/')
);

if (str_starts_with($normalised, $normalisedLayer)) {
foreach ($this->normalisedLayers as $layerName => $layerPaths) {
foreach ($layerPaths as $layerPath) {
if (str_starts_with($normalised, $layerPath)) {
$matched[] = $layerName;
break;
}
Expand Down
Loading