Minor improvements

vimeo · Aug 31, 2023 · 3067615 · 3067615
1 parent de40978
commit 3067615
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/src/Psalm/Config.php b/src/Psalm/Config.php
@@ -2426,9 +2426,7 @@ public function visitComposerAutoloadFiles(ProjectAnalyzer $project_analyzer, ?P
             // as they might be autoloadable once we require the autoloader below
             $codebase->classlikes->forgetMissingClassLikes();
 
-            $this->include_collector->runAndCollect(
-                [$this, 'requireAutoloader'],
-            );
+            $this->include_collector->runAndCollect($this->requireAutoloader(...));
         }
 
         $this->collectPredefinedConstants();

diff --git a/src/Psalm/Internal/Codebase/Scanner.php b/src/Psalm/Internal/Codebase/Scanner.php
@@ -301,7 +301,7 @@ private function scanFilePaths(): bool
     {
         $files_to_scan = array_filter(
             $this->files_to_scan,
-            [$this, 'shouldScan'],
+            $this->shouldScan(...),
         );
 
         $this->files_to_scan = [];
@@ -316,9 +316,6 @@ private function scanFilePaths(): bool
         if ($pool_size > 1) {
             $this->progress->debug('Forking process for scanning' . PHP_EOL);
 
-
-            // Run scanning one file at a time, splitting the set of
-            // files up among a given number of child processes.
             $forked_pool_data = ProjectAnalyzer::getInstance()->pool->run(
                 $files_to_scan,
                 new InitScannerTask(),

diff --git a/src/Psalm/Internal/Codebase/TaintFlowGraph.php b/src/Psalm/Internal/Codebase/TaintFlowGraph.php
@@ -521,12 +521,7 @@ private function getSpecializedSources(DataFlowNode $source): array
 
         return array_filter(
             $generated_sources,
-            [$this, 'doesForwardEdgeExist'],
+            fn ($new_source) => isset($this->forward_edges[$new_source->id])
         );
     }
-
-    private function doesForwardEdgeExist(DataFlowNode $new_source): bool
-    {
-        return isset($this->forward_edges[$new_source->id]);
-    }
 }
diff --git a/src/Psalm/Report/CodeClimateReport.php b/src/Psalm/Report/CodeClimateReport.php
@@ -26,7 +26,7 @@ public function create(): string
         $options = $this->pretty ? Json::PRETTY : Json::DEFAULT;
 
         $issues_data = array_map(
-            [$this, 'mapToNewStructure'],
+            $this->mapToNewStructure(...),
             $this->issues_data,
         );