danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Use $directory_filter with FileProvider::getFilesInDir() to skip ignored directories

Browse Source
This commit is contained in:
Tomasz Mlynski 2021-12-14 18:25:09 +01:00
parent d00c733c1f
commit 4034959c1b
No known key found for this signature in database
GPG Key ID: 665B4A17698A1954
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Psalm/Internal/Analyzer/ProjectAnalyzer.php
View File

@ -308,7 +308,11 @@ class ProjectAnalyzer
$file_extensions = $this->config->getFileExtensions();
foreach ($this->config->getProjectDirectories() as $dir_name) {
$file_paths = $this->file_provider->getFilesInDir($dir_name, $file_extensions);
$file_paths = $this->file_provider->getFilesInDir(
$dir_name,
$file_extensions,
[$this->config, 'isInProjectDirs']
);
foreach ($file_paths as $file_path) {
if ($this->config->isInProjectDirs($file_path)) {
@ -318,7 +322,11 @@ class ProjectAnalyzer
}
foreach ($this->config->getExtraDirectories() as $dir_name) {
$file_paths = $this->file_provider->getFilesInDir($dir_name, $file_extensions);
$file_paths = $this->file_provider->getFilesInDir(
$dir_name,
$file_extensions,
[$this->config, 'isInExtraDirs']
);
foreach ($file_paths as $file_path) {
if ($this->config->isInExtraDirs($file_path)) {
@ -1048,8 +1056,13 @@ class ProjectAnalyzer
private function checkDirWithConfig(string $dir_name, Config $config, bool $allow_non_project_files = false): void
{
$file_extensions = $config->getFileExtensions();
$directory_filter = $allow_non_project_files ? null : [$this->config, 'isInProjectDirs'];
$file_paths = $this->file_provider->getFilesInDir($dir_name, $file_extensions);
$file_paths = $this->file_provider->getFilesInDir(
$dir_name,
$file_extensions,
$directory_filter
);
$files_to_scan = [];