Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[perf] Improve performance on files finder #99

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 4 commits into from
May 27, 2026
Merged

[perf] Improve performance on files finder #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ca1430
Clean up isFile() check on php files finder
samsonasik May 27, 2026
3aa6cae
reduce loop iterator multiple times
samsonasik May 27, 2026
0c7e4e1
make consistent to use getPathname()
samsonasik May 27, 2026
a6a16f1
cs fix
samsonasik May 27, 2026
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
16 changes: 5 additions & 11 deletions src/Analyser/Analyser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,26 +611,20 @@ private function phpFiles(string $path, array $skipPaths): array
new RecursiveCallbackFilterIterator(
new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS),
function (SplFileInfo $file) use ($skipPaths): bool {
if (! $file->isDir() && $file->getExtension() !== 'php') {
$isRealDirectory = $file->isDir() && ! $file->isLink();
if (! $isRealDirectory && $file->getExtension() !== 'php') {
return false;
}

return ! $this->isSkipped($file->getPathname(), $skipPaths);
}
)
),
RecursiveIteratorIterator::LEAVES_ONLY
);

/** @var SplFileInfo $file */
foreach ($iterator as $file) {
if (! $file->isFile()) {
continue;
}

$realPath = $file->getRealPath();

if ($realPath !== false) {
$files[] = $realPath;
}
$files[] = $file->getPathname();
}

return $files;
Expand Down
34 changes: 20 additions & 14 deletions src/Rule/Rules/File/PhpFileFinder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@

namespace Boundwize\StructArmed\Rule\Rules\File;

use AppendIterator;
use Boundwize\StructArmed\Composer\Psr4PathResolver;
use FilesystemIterator;
use RecursiveCallbackFilterIterator;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use SplFileInfo;

use function array_unique;
use function array_values;
use function fnmatch;
use function is_dir;
use function ltrim;
Expand Down Expand Up @@ -38,41 +41,44 @@ public function __construct(
*/
public function files(string $basePath, array $skipPaths = []): array
{
$files = [];
$normalisedBase = $this->normalisePath($basePath, true);
$skipMatchers = $this->compileSkipMatchers($normalisedBase, $skipPaths);
$append = new AppendIterator();

foreach ($this->sourcePaths ?? $this->psr4PathResolver->paths($basePath) as $sourcePath) {
$sourcePaths = array_unique($this->sourcePaths ?? $this->psr4PathResolver->paths($basePath));
foreach ($sourcePaths as $sourcePath) {
$fullPath = rtrim($basePath, '/') . '/' . ltrim($sourcePath, '/');

if (! is_dir($fullPath)) {
continue;
}

$iterator = new RecursiveIteratorIterator(
$append->append(new RecursiveIteratorIterator(
new RecursiveCallbackFilterIterator(
new RecursiveDirectoryIterator($fullPath, FilesystemIterator::SKIP_DOTS),
function (SplFileInfo $file) use ($normalisedBase, $skipMatchers): bool {
if (! $file->isDir() && $file->getExtension() !== 'php') {
$isRealDirectory = $file->isDir() && ! $file->isLink();
if (! $isRealDirectory && $file->getExtension() !== 'php') {
return false;
}

return ! $this->isSkipped($file->getPathname(), $normalisedBase, $skipMatchers);
}
)
);
),
RecursiveIteratorIterator::LEAVES_ONLY
));
}

/** @var SplFileInfo $file */
foreach ($iterator as $file) {
if (! $file->isFile()) {
continue;
}
$files = [];

$files[] = $file->getPathname();
}
/** @var SplFileInfo $file */
foreach ($append as $file) {
$files[] = $file->getPathname();
}

return $files;
// ensure nothing duplicated once more
// avoid inner directory provided by multiple source paths
return array_values(array_unique($files));
}

/**
Expand Down
Loading