danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Split up scanning into specific steps

Browse Source
This commit is contained in:
Brown 2018-10-10 16:59:03 -04:00
parent 870e242ec3
commit 7278feb811
1 changed files with 80 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Psalm/Codebase/Scanner.php
View File

@ -251,14 +251,29 @@ class Scanner
*/
public function scanFiles(ClassLikes $classlikes)
{
$filetype_scanners = $this->config->getFiletypeScanners();
$has_changes = false;
while ($this->files_to_scan || $this->classes_to_scan) {
if ($this->files_to_scan) {
$file_path = array_shift($this->files_to_scan);
if ($this->scanFilePaths()) {
$has_changes = true;
}
} else {
$this->convertClassesToFilePaths($classlikes);
}
}
return $has_changes;
}
private function scanFilePaths() : bool
{
$filetype_scanners = $this->config->getFiletypeScanners();
$files_to_scan = $this->files_to_scan;
$has_changes = false;
$this->files_to_scan = [];
foreach ($files_to_scan as $file_path) {
if (!isset($this->scanned_files[$file_path])
|| (isset($this->files_to_deep_scan[$file_path]) && !$this->scanned_files[$file_path])
) {
@ -269,8 +284,21 @@ class Scanner
);
$has_changes = true;
}
} else {
$fq_classlike_name = array_shift($this->classes_to_scan);
}
return $has_changes;
}
/**
* @return void
*/
private function convertClassesToFilePaths(ClassLikes $classlikes)
{
$classes_to_scan = $this->classes_to_scan;
$this->classes_to_scan = [];
foreach ($classes_to_scan as $fq_classlike_name) {
$fq_classlike_name_lc = strtolower($fq_classlike_name);
if (isset($this->reflected_classlikes_lc[$fq_classlike_name_lc])) {
@ -316,9 +344,6 @@ class Scanner
}
}
return $has_changes;
}
/**
* @param string $file_path
* @param array<string, string> $filetype_scanners