Merge pull request #7230 from orklah/cleanup6

code grooming
vimeo · Dec 27, 2021 · 926a56a · 926a56a
2 parents 3828db5 + 2bf5a71
commit 926a56a
Show file tree

Hide file tree

Showing 27 changed files with 101 additions and 60 deletions.
diff --git a/dictionaries/scripts/update_signaturemap_from_other_tool.php b/dictionaries/scripts/update_signaturemap_from_other_tool.php
@@ -34,7 +34,7 @@
 
 foreach ($new_local as $name => $data) {
     if (!is_array($data)) {
-        throw new \UnexpectedValueException('bad data for ' . $name);
+        throw new UnexpectedValueException('bad data for ' . $name);
     }
     $return_type = array_shift($data);
     echo '\'' . str_replace("'", "\'", $name) . '\' => [\'' . str_replace("'", "\'", $return_type) . '\'';

diff --git a/examples/TemplateChecker.php b/examples/TemplateChecker.php
@@ -1,6 +1,7 @@
 <?php
 namespace Psalm\Examples\Template;
 
+use InvalidArgumentException;
 use PhpParser;
 use Psalm;
 use Psalm\CodeLocation;
@@ -12,6 +13,7 @@
 use Psalm\Internal\Analyzer\ClassLikeNameOptions;
 use Psalm\Internal\Analyzer\MethodAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
+use Psalm\Internal\Provider\NodeDataProvider;
 use Psalm\Node\Stmt\VirtualClass;
 use Psalm\Node\Stmt\VirtualClassMethod;
 use Psalm\Storage\MethodStorage;
@@ -48,7 +50,7 @@ public function analyze(?Context $file_context = null, ?Context $global_context
                 $matches = [];
 
                 if (!preg_match($first_line_regex, $variables_from, $matches)) {
-                    throw new \InvalidArgumentException('Could not interpret doc comment correctly');
+                    throw new InvalidArgumentException('Could not interpret doc comment correctly');
                 }
 
                 /** @psalm-suppress ArgumentTypeCoercion */
@@ -167,7 +169,7 @@ protected function checkWithViewClass(Context $context, array $stmts): void
 
         $statements_source = new StatementsAnalyzer(
             $view_method_analyzer,
-            new \Psalm\Internal\Provider\NodeDataProvider()
+            new NodeDataProvider()
         );
 
         $statements_source->analyze($pseudo_method_stmts, $context);

diff --git a/examples/TemplateScanner.php b/examples/TemplateScanner.php
@@ -1,6 +1,7 @@
 <?php
 namespace Psalm\Examples\Template;
 
+use InvalidArgumentException;
 use PhpParser;
 use Psalm;
 use Psalm\Checker\CommentChecker;
@@ -45,7 +46,7 @@ public function scan(
                 $matches = [];
 
                 if (!preg_match($first_line_regex, $variables_from, $matches)) {
-                    throw new \InvalidArgumentException('Could not interpret doc comment correctly');
+                    throw new InvalidArgumentException('Could not interpret doc comment correctly');
                 }
 
                 [$fq_class_name] = explode('::', $matches[1]);

diff --git a/examples/plugins/ClassUnqualifier.php b/examples/plugins/ClassUnqualifier.php
@@ -2,8 +2,10 @@
 namespace Psalm\Example\Plugin;
 
 use Psalm\FileManipulation;
+use Psalm\Internal\Type\TypeTokenizer;
 use Psalm\Plugin\EventHandler\AfterClassLikeExistenceCheckInterface;
 use Psalm\Plugin\EventHandler\Event\AfterClassLikeExistenceCheckEvent;
+use function strpos;
 use function strtolower;
 use function implode;
 use function array_map;
@@ -25,8 +27,8 @@ public static function afterClassLikeExistenceCheck(
             return;
         }
 
-        if (\strpos($candidate_type, '\\' . $fq_class_name) !== false) {
-            $type_tokens = \Psalm\Internal\Type\TypeTokenizer::tokenize($candidate_type, false);
+        if (strpos($candidate_type, '\\' . $fq_class_name) !== false) {
+            $type_tokens = TypeTokenizer::tokenize($candidate_type, false);
 
             foreach ($type_tokens as &$type_token) {
                 if ($type_token[0] === ('\\' . $fq_class_name)

diff --git a/examples/plugins/FunctionCasingChecker.php b/examples/plugins/FunctionCasingChecker.php
@@ -1,13 +1,16 @@
 <?php
 namespace Psalm\Example\Plugin;
 
+use Exception;
 use PhpParser;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use Psalm\Checker;
 use Psalm\Checker\StatementsChecker;
 use Psalm\CodeLocation;
 use Psalm\FileManipulation;
+use Psalm\Issue\PluginIssue;
+use Psalm\IssueBuffer;
 use Psalm\Plugin\EventHandler\AfterFunctionCallAnalysisInterface;
 use Psalm\Plugin\EventHandler\AfterMethodCallAnalysisInterface;
 use Psalm\Plugin\EventHandler\Event\AfterFunctionCallAnalysisEvent;
@@ -49,7 +52,7 @@ public static function afterMethodCallAnalysis(AfterMethodCallAnalysisEvent $eve
             }
 
             if ($function_storage->cased_name !== (string)$expr->name) {
-                if (\Psalm\IssueBuffer::accepts(
+                if (IssueBuffer::accepts(
                     new IncorrectFunctionCasing(
                         'Function is incorrectly cased, expecting ' . $function_storage->cased_name,
                         new CodeLocation($statements_source, $expr->name)
@@ -59,15 +62,11 @@ public static function afterMethodCallAnalysis(AfterMethodCallAnalysisEvent $eve
                     // fall through
                 }
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // can throw if storage is missing
         }
     }
 
-    /**
-     * @param non-empty-string $function_id
-     * @param  FileManipulation[] $file_replacements
-     */
     public static function afterFunctionCallAnalysis(AfterFunctionCallAnalysisEvent $event): void
     {
         $expr = $event->getExpr();
@@ -93,7 +92,7 @@ public static function afterFunctionCallAnalysis(AfterFunctionCallAnalysisEvent
             $function_name_parts = explode('\\', $function_storage->cased_name);
 
             if (end($function_name_parts) !== end($expr->name->parts)) {
-                if (\Psalm\IssueBuffer::accepts(
+                if (IssueBuffer::accepts(
                     new IncorrectFunctionCasing(
                         'Function is incorrectly cased, expecting ' . $function_storage->cased_name,
                         new CodeLocation($statements_source, $expr->name)
@@ -103,12 +102,12 @@ public static function afterFunctionCallAnalysis(AfterFunctionCallAnalysisEvent
                     // fall through
                 }
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             // can throw if storage is missing
         }
     }
 }
 
-class IncorrectFunctionCasing extends \Psalm\Issue\PluginIssue
+class IncorrectFunctionCasing extends PluginIssue
 {
 }
diff --git a/examples/plugins/PreventFloatAssignmentChecker.php b/examples/plugins/PreventFloatAssignmentChecker.php
@@ -5,6 +5,8 @@
 use Psalm\Checker;
 use Psalm\CodeLocation;
 use Psalm\FileManipulation;
+use Psalm\Issue\PluginIssue;
+use Psalm\IssueBuffer;
 use Psalm\Plugin\EventHandler\AfterExpressionAnalysisInterface;
 use Psalm\Plugin\EventHandler\Event\AfterExpressionAnalysisEvent;
 
@@ -25,7 +27,7 @@ public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $eve
             && ($expr_type = $statements_source->getNodeTypeProvider()->getType($expr->expr))
             && $expr_type->hasFloat()
         ) {
-            if (\Psalm\IssueBuffer::accepts(
+            if (IssueBuffer::accepts(
                 new NoFloatAssignment(
                     'Don’t assign to floats',
                     new CodeLocation($statements_source, $expr)
@@ -40,5 +42,5 @@ public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $eve
     }
 }
 
-class NoFloatAssignment extends \Psalm\Issue\PluginIssue {
+class NoFloatAssignment extends PluginIssue {
 }
diff --git a/examples/plugins/StringChecker.php b/examples/plugins/StringChecker.php
@@ -6,6 +6,9 @@
 use Psalm\Checker\StatementsChecker;
 use Psalm\CodeLocation;
 use Psalm\FileManipulation;
+use Psalm\Issue\InvalidClass;
+use Psalm\Issue\UndefinedMethod;
+use Psalm\IssueBuffer;
 use Psalm\Plugin\EventHandler\AfterExpressionAnalysisInterface;
 use Psalm\Plugin\EventHandler\Event\AfterExpressionAnalysisEvent;
 
@@ -29,8 +32,8 @@ public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $eve
             ) {
                 $absolute_class = preg_split('/[:]/', $expr->value)[0];
 
-                if (\Psalm\IssueBuffer::accepts(
-                    new \Psalm\Issue\InvalidClass(
+                if (IssueBuffer::accepts(
+                    new InvalidClass(
                         'Use ::class constants when representing class names',
                         new CodeLocation($statements_source, $expr),
                         $absolute_class
@@ -54,8 +57,8 @@ public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $eve
             $appearing_method_id = $codebase->getAppearingMethodId($method_id);
 
             if (!$appearing_method_id) {
-                if (\Psalm\IssueBuffer::accepts(
-                    new \Psalm\Issue\UndefinedMethod(
+                if (IssueBuffer::accepts(
+                    new UndefinedMethod(
                         'Method ' . $method_id . ' does not exist',
                         new CodeLocation($statements_source, $expr),
                         $method_id

diff --git a/examples/plugins/composer-based/echo-checker/EchoChecker.php b/examples/plugins/composer-based/echo-checker/EchoChecker.php
@@ -17,8 +17,6 @@ class EchoChecker implements AfterStatementAnalysisInterface
     /**
      * Called after a statement has been checked
      *
-     * @param  FileManipulation[]   $file_replacements
-     *
      * @return null|false
      */
     public static function afterStatementAnalysis(AfterStatementAnalysisEvent $event): ?bool {

diff --git a/psalm b/psalm
@@ -1,4 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+use Psalm\Internal\Cli\Psalm;
+
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Psalm.php';
-\Psalm\Internal\Cli\Psalm::run($argv);
+Psalm::run($argv);
diff --git a/psalm-language-server b/psalm-language-server
@@ -1,4 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+use Psalm\Internal\Cli\LanguageServer;
+
 require_once __DIR__ . '/src/Psalm/Internal/Cli/LanguageServer.php';
-\Psalm\Internal\Cli\LanguageServer::run($argv);
+LanguageServer::run($argv);
diff --git a/psalm-plugin b/psalm-plugin
@@ -1,4 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+use Psalm\Internal\Cli\Plugin;
+
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Plugin.php';
-\Psalm\Internal\Cli\Plugin::run();
+Plugin::run();
diff --git a/psalm-refactor b/psalm-refactor
@@ -1,4 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+use Psalm\Internal\Cli\Refactor;
+
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Refactor.php';
-\Psalm\Internal\Cli\Refactor::run($argv);
+Refactor::run($argv);
diff --git a/psalter b/psalter
@@ -1,4 +1,7 @@
 #!/usr/bin/env php
 <?php
+
+use Psalm\Internal\Cli\Psalter;
+
 require_once __DIR__ . '/src/Psalm/Internal/Cli/Psalter.php';
-\Psalm\Internal\Cli\Psalter::run($argv);
+Psalter::run($argv);
diff --git a/scoper.inc.php b/scoper.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use Composer\Autoload\ClassLoader;
+
 return [
     'patchers' => [
         function ($filePath, $prefix, $contents) {
@@ -79,7 +81,7 @@ function ($filePath, $prefix, $contents) {
         },
     ],
     'whitelist' => [
-        \Composer\Autoload\ClassLoader::class,
+        ClassLoader::class,
         'Psalm\*',
     ],
     'files-whitelist' => [

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
@@ -658,7 +658,7 @@ private static function checkFunctionLikeTypeMatches(
     }
 
     /**
-     * @param TKeyedArray|TArray|TList|TClassStringMap $unpacked_atomic_array
+     * @param TKeyedArray|TArray|TList|TClassStringMap|null $unpacked_atomic_array
      * @return  null|false
      * @psalm-suppress ComplexMethod
      */

diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php
@@ -60,7 +60,7 @@
 class AtomicMethodCallAnalyzer extends CallAnalyzer
 {
     /**
-     * @param  TNamedObject|TTemplateParam $static_type
+     * @param  TNamedObject|TTemplateParam|null $static_type
      *
      * @psalm-suppress ComplexMethod it's really complex, but unavoidably so
      */

diff --git a/.../Internal/Analyzer/Statements/Expression/Call/Method/ExistingAtomicMethodCallAnalyzer.php b/.../Internal/Analyzer/Statements/Expression/Call/Method/ExistingAtomicMethodCallAnalyzer.php
@@ -48,7 +48,7 @@
 class ExistingAtomicMethodCallAnalyzer extends CallAnalyzer
 {
     /**
-     * @param  TNamedObject|TTemplateParam  $static_type
+     * @param  TNamedObject|TTemplateParam|null  $static_type
      * @param  list<PhpParser\Node\Arg> $args
      */
     public static function analyze(

diff --git a/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php b/...Psalm/Internal/Analyzer/Statements/Expression/Call/Method/MethodCallReturnTypeFetcher.php
@@ -37,7 +37,7 @@
 class MethodCallReturnTypeFetcher
 {
     /**
-     * @param  TNamedObject|TTemplateParam  $static_type
+     * @param  TNamedObject|TTemplateParam|null  $static_type
      * @param list<PhpParser\Node\Arg> $args
      */
     public static function fetch(

diff --git a/src/Psalm/Internal/Cli/LanguageServer.php b/src/Psalm/Internal/Cli/LanguageServer.php
@@ -219,6 +219,7 @@ function (string $arg) use ($valid_long_options): void {
         $include_collector = new IncludeCollector();
 
         $first_autoloader = $include_collector->runAndCollect(
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
             // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
             function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
                 return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);

diff --git a/src/Psalm/Internal/Cli/Psalm.php b/src/Psalm/Internal/Cli/Psalm.php
@@ -211,6 +211,7 @@ public static function run(array $argv): void
 
         $include_collector = new IncludeCollector();
         $first_autoloader = $include_collector->runAndCollect(
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
             // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
             function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
                 return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);

diff --git a/src/Psalm/Internal/Cli/Psalter.php b/src/Psalm/Internal/Cli/Psalter.php
@@ -202,6 +202,7 @@ public static function run(array $argv): void
 
         $include_collector = new IncludeCollector();
         $first_autoloader = $include_collector->runAndCollect(
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
             // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
             function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
                 return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);

diff --git a/src/Psalm/Internal/Cli/Refactor.php b/src/Psalm/Internal/Cli/Refactor.php
@@ -177,6 +177,7 @@ function (string $arg) use ($valid_long_options): void {
 
         $include_collector = new IncludeCollector();
         $first_autoloader = $include_collector->runAndCollect(
+            // we ignore the FQN because of a hack in scoper.inc that needs full path
             // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
             function () use ($current_dir, $options, $vendor_dir): ?\Composer\Autoload\ClassLoader {
                 return CliUtils::requireAutoloaders($current_dir, isset($options['r']), $vendor_dir);