Merge pull request #8927 from jack-worman/Trailing_commas

Trailing commas
vimeo · Dec 18, 2022 · 156c108 · 156c108
2 parents 7afeee5 + 1c19260
commit 156c108
Show file tree

Hide file tree

Showing 460 changed files with 8,480 additions and 8,454 deletions.
diff --git a/bin/generate_testsuites.php b/bin/generate_testsuites.php
@@ -17,12 +17,12 @@
         new RecursiveIteratorIterator(
             new RecursiveDirectoryIterator(
                 'tests',
-                FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS
+                FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS,
             ),
-            RecursiveIteratorIterator::LEAVES_ONLY
+            RecursiveIteratorIterator::LEAVES_ONLY,
         ),
-        '/.*Test.php$/'
-    )
+        '/.*Test.php$/',
+    ),
 );
 
 mt_srand(4); // chosen by fair dice roll.
@@ -31,7 +31,7 @@
 
 $order = array_map(
     fn(): int => mt_rand(),
-    $files
+    $files,
 );
 array_multisort($order, $files);
 

diff --git a/bin/max_used_shortcode.php b/bin/max_used_shortcode.php
@@ -13,7 +13,7 @@ function ($issue_type): int {
         /** @var int */
         return $issue_class::SHORTCODE;
     },
-    $issue_types
+    $issue_types,
 );
 
 echo 'Max used shortcode: ' . max($shortcodes) . PHP_EOL;
diff --git a/bin/update-property-map.php b/bin/update-property-map.php
@@ -25,7 +25,7 @@
 $lexer = new PhpParser\Lexer\Emulative();
 $parser = (new PhpParser\ParserFactory)->create(
     PhpParser\ParserFactory::PREFER_PHP7,
-    $lexer
+    $lexer,
 );
 $traverser = new PhpParser\NodeTraverser();
 $traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
@@ -48,7 +48,7 @@ function extractClassesFromStatements(array $statements): array
 $stubbedClasses = [];
 foreach (new RecursiveDirectoryIterator(
     __DIR__ . '/../stubs',
-    FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS
+    FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS,
 ) as $file) {
     if (is_dir($file)) {
         continue;
@@ -72,11 +72,11 @@ function extractClassesFromStatements(array $statements): array
     new RecursiveIteratorIterator(
         new RecursiveDirectoryIterator(
             $docDir,
-            FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS
+            FilesystemIterator::CURRENT_AS_PATHNAME|FilesystemIterator::SKIP_DOTS,
         ),
-        RecursiveIteratorIterator::LEAVES_ONLY
+        RecursiveIteratorIterator::LEAVES_ONLY,
     ),
-    '/.*.xml$/'
+    '/.*.xml$/',
 );
 
 $classes = require_once dirname(__DIR__) . '/dictionaries/ManualPropertyMap.php';
@@ -100,7 +100,7 @@ function extractClassesFromStatements(array $statements): array
             $file,
             get_class($exception),
             $exception->getMessage(),
-            implode("\n", array_map(fn(LibXMLError $error): string => $error->message, libxml_get_errors()))
+            implode("\n", array_map(fn(LibXMLError $error): string => $error->message, libxml_get_errors())),
         );
         libxml_clear_errors();
         continue;
@@ -186,5 +186,5 @@ function serializeArray(array $array, string $prefix): string
 
 return $serialized;
 
-EOF
+EOF,
 );
diff --git a/examples/TemplateChecker.php b/examples/TemplateChecker.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Examples\Template;
 
 use InvalidArgumentException;
@@ -13,14 +14,21 @@
 use Psalm\Internal\Analyzer\ClassLikeNameOptions;
 use Psalm\Internal\Analyzer\MethodAnalyzer;
 use Psalm\Internal\Analyzer\StatementsAnalyzer;
+use Psalm\Internal\MethodIdentifier;
 use Psalm\Internal\Provider\NodeDataProvider;
 use Psalm\Node\Stmt\VirtualClass;
 use Psalm\Node\Stmt\VirtualClassMethod;
 use Psalm\Storage\MethodStorage;
 use Psalm\Type;
 use Psalm\Type\Atomic\TNamedObject;
 use Psalm\Type\Union;
-use Psalm\Internal\MethodIdentifier;
+
+use function explode;
+use function preg_match;
+use function preg_replace;
+use function str_replace;
+use function strtolower;
+use function trim;
 
 class TemplateAnalyzer extends Psalm\Internal\Analyzer\FileAnalyzer
 {
@@ -92,7 +100,7 @@ private function checkMethod(MethodIdentifier $method_id, PhpParser\Node $stmt,
             null,
             null,
             [],
-            new ClassLikeNameOptions(true)
+            new ClassLikeNameOptions(true),
         ) === false
         ) {
             return false;
@@ -109,7 +117,7 @@ private function checkMethod(MethodIdentifier $method_id, PhpParser\Node $stmt,
             new MethodIdentifier($method_id->fq_class_name, '__construct'),
             $this_context,
             $this->getRootFilePath(),
-            $this->getRootFileName()
+            $this->getRootFileName(),
         );
 
         $this_context->vars_in_scope['$this'] = new Union([new TNamedObject($class_storage->name)]);
@@ -119,7 +127,7 @@ private function checkMethod(MethodIdentifier $method_id, PhpParser\Node $stmt,
             $method_id,
             $this_context,
             $this->getRootFilePath(),
-            $this->getRootFileName()
+            $this->getRootFileName(),
         );
 
         $view_context = new Context();
@@ -139,7 +147,6 @@ private function checkMethod(MethodIdentifier $method_id, PhpParser\Node $stmt,
 
     /**
      * @param  array<PhpParser\Node\Stmt> $stmts
-     *
      */
     protected function checkWithViewClass(Context $context, array $stmts): void
     {
@@ -169,7 +176,7 @@ protected function checkWithViewClass(Context $context, array $stmts): void
 
         $statements_source = new StatementsAnalyzer(
             $view_method_analyzer,
-            new NodeDataProvider()
+            new NodeDataProvider(),
         );
 
         $statements_source->analyze($pseudo_method_stmts, $context);

diff --git a/examples/TemplateScanner.php b/examples/TemplateScanner.php
@@ -1,32 +1,33 @@
 <?php
+
 namespace Psalm\Examples\Template;
 
 use InvalidArgumentException;
 use PhpParser;
 use Psalm;
-use Psalm\Checker\CommentChecker;
 use Psalm\Codebase;
 use Psalm\DocComment;
 use Psalm\Progress\Progress;
 use Psalm\Storage\FileStorage;
 
+use function explode;
+use function preg_match;
+use function trim;
+
 class TemplateScanner extends Psalm\Internal\Scanner\FileScanner
 {
     const VIEW_CLASS = 'Your\\View\\Class';
 
-    /**
-     * @param bool $storage_from_cache
-     */
     public function scan(
         Codebase $codebase,
         FileStorage $file_storage,
-        $storage_from_cache = false,
+        bool $storage_from_cache = false,
         ?Progress $progress = null
     ): void {
         $stmts = $codebase->statements_provider->getStatementsForFile(
             $file_storage->file_path,
             7_04_00,
-            $progress
+            $progress,
         );
 
         if ($stmts === []) {
@@ -53,7 +54,7 @@ public function scan(
 
                 $codebase->scanner->queueClassLikeForScanning(
                     $fq_class_name,
-                    true
+                    true,
                 );
             }
         }

diff --git a/examples/plugins/ClassUnqualifier.php b/examples/plugins/ClassUnqualifier.php
@@ -1,14 +1,16 @@
 <?php
+
 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 array_map;
+use function implode;
 use function strpos;
 use function strtolower;
-use function implode;
-use function array_map;
 
 class ClassUnqualifier implements AfterClassLikeExistenceCheckInterface
 {
@@ -43,8 +45,8 @@ public static function afterClassLikeExistenceCheck(
                 '',
                 array_map(
                     fn($f) => $f[0],
-                    $type_tokens
-                )
+                    $type_tokens,
+                ),
             );
 
             if ($new_candidate_type !== $candidate_type) {

diff --git a/examples/plugins/FunctionCasingChecker.php b/examples/plugins/FunctionCasingChecker.php
@@ -5,18 +5,18 @@
 use Exception;
 use PhpParser;
 use Psalm\CodeLocation;
+use Psalm\Internal\Analyzer\StatementsAnalyzer;
+use Psalm\Internal\MethodIdentifier;
 use Psalm\Issue\PluginIssue;
 use Psalm\IssueBuffer;
 use Psalm\Plugin\EventHandler\AfterFunctionCallAnalysisInterface;
 use Psalm\Plugin\EventHandler\AfterMethodCallAnalysisInterface;
 use Psalm\Plugin\EventHandler\Event\AfterFunctionCallAnalysisEvent;
 use Psalm\Plugin\EventHandler\Event\AfterMethodCallAnalysisEvent;
-use Psalm\Internal\Analyzer\StatementsAnalyzer;
-use Psalm\Internal\MethodIdentifier;
 
+use function end;
 use function explode;
 use function strtolower;
-use function end;
 
 /**
  * Checks that functions and methods are correctly-cased
@@ -50,9 +50,9 @@ public static function afterMethodCallAnalysis(AfterMethodCallAnalysisEvent $eve
                 IssueBuffer::maybeAdd(
                     new IncorrectFunctionCasing(
                         'Function is incorrectly cased, expecting ' . $function_storage->cased_name,
-                        new CodeLocation($statements_source, $expr->name)
+                        new CodeLocation($statements_source, $expr->name),
                     ),
-                    $statements_source->getSuppressedIssues()
+                    $statements_source->getSuppressedIssues(),
                 );
             }
         } catch (Exception $e) {
@@ -75,7 +75,7 @@ public static function afterFunctionCallAnalysis(AfterFunctionCallAnalysisEvent
                 $statements_source instanceof StatementsAnalyzer
                     ? $statements_source
                     : null,
-                strtolower($function_id)
+                strtolower($function_id),
             );
 
             if (!$function_storage->cased_name) {
@@ -88,9 +88,9 @@ public static function afterFunctionCallAnalysis(AfterFunctionCallAnalysisEvent
                 IssueBuffer::maybeAdd(
                     new IncorrectFunctionCasing(
                         'Function is incorrectly cased, expecting ' . $function_storage->cased_name,
-                        new CodeLocation($statements_source, $expr->name)
+                        new CodeLocation($statements_source, $expr->name),
                     ),
-                    $statements_source->getSuppressedIssues()
+                    $statements_source->getSuppressedIssues(),
                 );
             }
         } catch (Exception $e) {

diff --git a/examples/plugins/InternalChecker.php b/examples/plugins/InternalChecker.php
@@ -15,7 +15,7 @@
 class InternalChecker implements AfterClassLikeAnalysisInterface
 {
     /** @return null|false */
-    public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event)
+    public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event): ?bool
     {
         $storage = $event->getClasslikeStorage();
         if (!$storage->internal
@@ -26,10 +26,10 @@ public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event
                 new InternalClass(
                     "Class $storage->name must be marked @internal",
                     $storage->location,
-                    $storage->name
+                    $storage->name,
                 ),
                 $event->getStatementsSource()->getSuppressedIssues(),
-                true
+                true,
             );
 
             if (!$event->getCodebase()->alter_code) {
@@ -50,7 +50,7 @@ public static function afterStatementAnalysis(AfterClassLikeAnalysisEvent $event
             $parsed_docblock->tags['internal'] = [''];
             $new_docblock_content = $parsed_docblock->render('');
             $event->setFileReplacements([
-                new FileManipulation($docblock_start, $docblock_end, $new_docblock_content)
+                new FileManipulation($docblock_start, $docblock_end, $new_docblock_content),
             ]);
         }
         return null;

diff --git a/examples/plugins/PreventFloatAssignmentChecker.php b/examples/plugins/PreventFloatAssignmentChecker.php
@@ -19,7 +19,8 @@ class PreventFloatAssignmentChecker implements AfterExpressionAnalysisInterface
      *
      * @return null
      */
-    public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $event): ?bool {
+    public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $event): ?bool
+    {
         $expr = $event->getExpr();
         $statements_source = $event->getStatementsSource();
         if ($expr instanceof PhpParser\Node\Expr\Assign
@@ -29,15 +30,16 @@ public static function afterExpressionAnalysis(AfterExpressionAnalysisEvent $eve
             IssueBuffer::maybeAdd(
                 new NoFloatAssignment(
                     'Don’t assign to floats',
-                    new CodeLocation($statements_source, $expr)
+                    new CodeLocation($statements_source, $expr),
                 ),
-                $statements_source->getSuppressedIssues()
+                $statements_source->getSuppressedIssues(),
             );
         }
 
         return null;
     }
 }
 
-class NoFloatAssignment extends PluginIssue {
+class NoFloatAssignment extends PluginIssue
+{
 }
diff --git a/examples/plugins/SafeArrayKeyChecker.php b/examples/plugins/SafeArrayKeyChecker.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psalm\Example\Plugin;
 
 use PhpParser\Node\Expr\ArrayItem;
@@ -13,7 +14,8 @@ class SafeArrayKeyChecker implements RemoveTaintsInterface
      *
      * @return list<string>
      */
-    public static function removeTaints(AddRemoveTaintsEvent $event): array {
+    public static function removeTaints(AddRemoveTaintsEvent $event): array
+    {
         $item = $event->getExpr();
         $statements_analyzer = $event->getStatementsSource();
         if (!($item instanceof ArrayItem) || !($statements_analyzer instanceof StatementsAnalyzer)) {