Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-06-25 03:11:20 +02:00
Code Issues Packages Projects Releases Activity

Optimize preflight Monolog checks by skipping vendor directories

Browse Source
This commit is contained in:
Andy Miller
2025-11-20 11:12:03 +00:00
parent b0301beee3
commit 2c2b2fc2e4
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
system/src/Grav/Common/Upgrade/SafeUpgradeService.php
View File

@@ -18,6 +18,7 @@ use Grav\Common\Yaml;
use InvalidArgumentException;
use RuntimeException;
use Throwable;
use RecursiveCallbackFilterIterator;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use FilesystemIterator;
@@ -787,16 +788,24 @@ class SafeUpgradeService
continue;
}
$iterator = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS)
);
$directory = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS);
$filter = new RecursiveCallbackFilterIterator($directory, static function ($current, $key, $iterator) {
// Skip hidden files/dirs (starting with .)
if ($current->getFilename()[0] === '.') {
return false;
}
if ($iterator->hasChildren()) {
// Exclude vendor and node_modules directories
return !in_array($current->getFilename(), ['vendor', 'node_modules'], true);
}
// Only include PHP files
return $current->getExtension() === 'php';
});
$iterator = new RecursiveIteratorIterator($filter);
foreach ($iterator as $file) {
/** @var \SplFileInfo $file */
if (!$file->isFile() || strtolower($file->getExtension()) !== 'php') {
continue;
}
$contents = @file_get_contents($file->getPathname());
if ($contents === false) {
continue;

22
system/src/Grav/Installer/Install.php
View File

@@ -1159,15 +1159,23 @@ ERR;
continue;
}
$iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS)
);
$directory = new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS);
$filter = new \RecursiveCallbackFilterIterator($directory, static function ($current, $key, $iterator) {
// Skip hidden files/dirs (starting with .)
if ($current->getFilename()[0] === '.') {
return false;
}
if ($iterator->hasChildren()) {
// Exclude vendor and node_modules directories
return !in_array($current->getFilename(), ['vendor', 'node_modules'], true);
}
// Only include PHP files
return $current->getExtension() === 'php';
});
$iterator = new \RecursiveIteratorIterator($filter);
foreach ($iterator as $file) {
if (!$file->isFile() || strtolower($file->getExtension()) !== 'php') {
continue;
}
$contents = @file_get_contents($file->getPathname());
if ($contents === false) {
continue;