Backport rector fixes to 5.x

dictionaries/scripts/update_signaturemap_from_other_tool.php

@@ -30,7 +30,7 @@
     $removed_foreign_functions
 );
 
-uksort($new_local, fn($a, $b) => strtolower($a) <=> strtolower($b));
+uksort($new_local, static fn($a, $b) => strtolower($a) <=> strtolower($b));
 
 foreach ($new_local as $name => $data) {
     if (!is_array($data)) {

examples/plugins/ClassUnqualifier.php

@@ -44,7 +44,7 @@ public static function afterClassLikeExistenceCheck(
             $new_candidate_type = implode(
                 '',
                 array_map(
-                    fn($f) => $f[0],
+                    static fn($f) => $f[0],
                     $type_tokens,
                 ),
             );

src/Psalm/Codebase.php

@@ -69,7 +69,6 @@
 use UnexpectedValueException;
 
 use function array_combine;
-use function array_merge;
 use function array_pop;
 use function array_reverse;
 use function array_values;
@@ -1917,7 +1916,7 @@ public function getCompletionItemsForClassishThing(
                         );
                     }
 
-                    $completion_items = array_merge($completion_items, array_values($pseudo_property_types));
+                    $completion_items = [...$completion_items, ...array_values($pseudo_property_types)];
 
                     foreach ($class_storage->declaring_property_ids as $property_name => $declaring_class) {
                         $property_storage = $this->properties->getStorage(

src/Psalm/Internal/Analyzer/ClassLikeAnalyzer.php

@@ -707,7 +707,7 @@ protected function checkTemplateParams(
                                 && $storage->template_types
                                 && $storage->template_covariants
                                 && ($local_offset
-                                    = array_search($t->param_name, array_keys($storage->template_types)))
+                                    = array_search($t->param_name, array_keys($storage->template_types), true))
                                     !== false
                                 && !empty($storage->template_covariants[$local_offset])
                             ) {

src/Psalm/Internal/Analyzer/CommentAnalyzer.php

@@ -25,7 +25,6 @@
 use Psalm\Type\Union;
 use UnexpectedValueException;
 
-use function array_merge;
 use function count;
 use function is_string;
 use function preg_match;
@@ -400,7 +399,7 @@ public static function splitDocLine(string $return_block): array
                 $remaining = trim(preg_replace('@^[ \t]*\* *@m', ' ', substr($return_block, $i + 1)));
 
                 if ($remaining) {
-                    return array_merge([rtrim($type)], preg_split('/\s+/', $remaining) ?: []);
+                    return [rtrim($type), ...preg_split('/\s+/', $remaining) ?: []];
                 }
 
                 return [$type];

src/Psalm/Internal/Analyzer/Statements/Block/ForeachAnalyzer.php

@@ -1096,7 +1096,7 @@ private static function getExtendedType(
     ): ?Union {
         if ($calling_class === $template_class) {
             if (isset($class_template_types[$template_name]) && $calling_type_params) {
-                $offset = array_search($template_name, array_keys($class_template_types));
+                $offset = array_search($template_name, array_keys($class_template_types), true);
 
                 if ($offset !== false && isset($calling_type_params[$offset])) {
                     return $calling_type_params[$offset];

src/Psalm/Internal/Analyzer/Statements/Expression/Call/Method/AtomicMethodCallAnalyzer.php

@@ -751,6 +751,7 @@ private static function handleTemplatedMixins(
                 $param_position = array_search(
                     $mixin->param_name,
                     $template_type_keys,
+                    true,
                 );
 
                 if ($param_position !== false

src/Psalm/Internal/Analyzer/Statements/Expression/CastAnalyzer.php

@@ -476,7 +476,7 @@ public static function castIntAttempt(
             // todo: emit error here
         }
 
-        $valid_types = array_merge($valid_ints, $castable_types);
+        $valid_types = [...$valid_ints, ...$castable_types];
 
         if (!$valid_types) {
             $int_type = Type::getInt();
@@ -661,7 +661,7 @@ public static function castFloatAttempt(
             // todo: emit error here
         }
 
-        $valid_types = array_merge($valid_floats, $castable_types);
+        $valid_types = [...$valid_floats, ...$castable_types];
 
         if (!$valid_types) {
             $float_type = Type::getFloat();
@@ -804,10 +804,7 @@ public static function castStringAttempt(
                                 $parent_nodes = array_merge($return_type->parent_nodes, $parent_nodes);
                             }
 
-                            $castable_types = array_merge(
-                                $castable_types,
-                                array_values($return_type->getAtomicTypes()),
-                            );
+                            $castable_types = [...$castable_types, ...array_values($return_type->getAtomicTypes())];
 
                             continue 2;
                         }

src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/AtomicPropertyFetchAnalyzer.php

@@ -788,6 +788,7 @@ public static function localizePropertyType(
                             $position = array_search(
                                 $param_name,
                                 array_keys($property_class_storage->template_types),
+                                true,
                             );
                         }
 
@@ -1000,7 +1001,7 @@ private static function handleEnumName(
             empty($relevant_enum_case_names)
                 ? Type::getNonEmptyString()
                 : new Union(array_map(
-                    fn(string $name): TString => Type::getAtomicStringFromLiteral($name),
+                    static fn(string $name): TString => Type::getAtomicStringFromLiteral($name),
                     $relevant_enum_case_names,
                 )),
         );

src/Psalm/Internal/Analyzer/StatementsAnalyzer.php

@@ -869,7 +869,7 @@ public function checkUnreferencedVars(array $stmts, Context $context): void
             }
 
             if ($function_storage) {
-                $param_index = array_search(substr($var_id, 1), array_keys($function_storage->param_lookup));
+                $param_index = array_search(substr($var_id, 1), array_keys($function_storage->param_lookup), true);
                 if ($param_index !== false) {
                     $param = $function_storage->params[$param_index];
 

src/Psalm/Internal/Codebase/Populator.php

@@ -931,10 +931,10 @@ protected function inheritMethodsFromParent(
             if ($parent_storage->is_trait
                 && $storage->trait_alias_map
             ) {
-                $aliased_method_names = array_merge(
-                    $aliased_method_names,
-                    array_keys($storage->trait_alias_map, $method_name_lc, true),
-                );
+                $aliased_method_names = [
+                    ...$aliased_method_names,
+                    ...array_keys($storage->trait_alias_map, $method_name_lc, true),
+                ];
             }
 
             foreach ($aliased_method_names as $aliased_method_name) {
@@ -1001,10 +1001,10 @@ protected function inheritMethodsFromParent(
             if ($parent_storage->is_trait
                 && $storage->trait_alias_map
             ) {
-                $aliased_method_names = array_merge(
-                    $aliased_method_names,
-                    array_keys($storage->trait_alias_map, $method_name_lc, true),
-                );
+                $aliased_method_names = [
+                    ...$aliased_method_names,
+                    ...array_keys($storage->trait_alias_map, $method_name_lc, true),
+                ];
             }
 
             foreach ($aliased_method_names as $aliased_method_name) {

src/Psalm/Internal/FileManipulation/FunctionDocblockManipulator.php

@@ -44,7 +44,7 @@ class FunctionDocblockManipulator
     private static array $manipulators = [];
 
     /** @var Closure|Function_|ClassMethod|ArrowFunction */
-    private $stmt;
+    private FunctionLike $stmt;
 
     private int $docblock_start;
 
@@ -415,7 +415,7 @@ private function getDocblock(): string
             $modified_docblock = true;
             $inferredThrowsClause = array_reduce(
                 $this->throwsExceptions,
-                fn(string $throwsClause, string $exception) => $throwsClause === ''
+                static fn(string $throwsClause, string $exception) => $throwsClause === ''
                     ? $exception
                     : $throwsClause.'|'.$exception,
                 '',

src/Psalm/Internal/LanguageServer/LanguageServer.php

@@ -237,7 +237,7 @@ function (Message $msg): Generator {
 
         $this->protocolReader->on(
             'readMessageGroup',
-            function (): void {
+            static function (): void {
                 //$this->verboseLog('Received message group');
                 //$this->doAnalysis();
             },
@@ -765,7 +765,7 @@ function (IssueData $issue_data): Diagnostic {
                     return $diagnostic;
                 },
                 array_filter(
-                    array_map(function (IssueData $issue_data) use (&$issue_baseline) {
+                    array_map(static function (IssueData $issue_data) use (&$issue_baseline) {
                         if (empty($issue_baseline)) {
                             return $issue_data;
                         }

src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayMapReturnTypeProvider.php

@@ -113,9 +113,9 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
             $array_arg_types = array_map(null, ...$array_arg_types);
             $array_arg_types = array_map(
                 /** @param non-empty-array<?Union> $sub */
-                function (array $sub) use ($null) {
+                static function (array $sub) use ($null) {
                     $sub = array_map(
-                        fn(?Union $t) => $t ?? $null,
+                        static fn(?Union $t) => $t ?? $null,
                         $sub,
                     );
                     return new Union([new TKeyedArray($sub, null, null, true)]);

src/Psalm/Internal/Type/SimpleAssertionReconciler.php

@@ -686,7 +686,7 @@ private static function reconcileNonEmptyCountable(
                         $existing_var_type->removeType('array');
                         $existing_var_type->addType($array_atomic_type->setProperties(
                             array_map(
-                                fn(Union $union) => $union->setPossiblyUndefined(false),
+                                static fn(Union $union) => $union->setPossiblyUndefined(false),
                                 $array_atomic_type->properties,
                             ),
                         ));
@@ -806,7 +806,7 @@ private static function reconcileExactlyCountable(
                         $existing_var_type->removeType('array');
                         $existing_var_type->addType($array_atomic_type->setProperties(
                             array_map(
-                                fn(Union $union) => $union->setPossiblyUndefined(false),
+                                static fn(Union $union) => $union->setPossiblyUndefined(false),
                                 $array_atomic_type->properties,
                             ),
                         ));

src/Psalm/Internal/Type/TemplateInferredTypeReplacer.php

@@ -226,7 +226,7 @@ public static function replace(
             )->freeze();
         }
 
-        $atomic_types = array_merge($types, $new_types);
+        $atomic_types = [...$types, ...$new_types];
         if (!$atomic_types) {
             throw new UnexpectedValueException('This array should be full');
         }

src/Psalm/Internal/Type/TemplateStandinTypeReplacer.php

@@ -1343,6 +1343,7 @@ public static function getMappedGenericTypeParams(
                                 $old_params_offset = (int) array_search(
                                     $template->param_name,
                                     array_keys($input_class_storage->template_types),
+                                    true,
                                 );
 
                                 $candidate_param_types[] = ($input_type_params[$old_params_offset] ?? Type::getMixed())

src/Psalm/Internal/Type/TypeParser.php

@@ -958,7 +958,11 @@ private static function getTypeFromGenericTree(
             }
             assert(count($parse_tree->children) === 2);
 
-            $get_int_range_bound = function (ParseTree $parse_tree, Union $generic_param, string $bound_name): ?int {
+            $get_int_range_bound = static function (
+                ParseTree $parse_tree,
+                Union $generic_param,
+                string $bound_name
+            ): ?int {
                 if (!$parse_tree instanceof Value
                     || count($generic_param->getAtomicTypes()) > 1
                     || (!$generic_param->getSingleAtomic() instanceof TLiteralInt
@@ -970,7 +974,6 @@ private static function getTypeFromGenericTree(
                         "Invalid type \"{$generic_param->getId()}\" as int $bound_name boundary",
                     );
                 }
-
                 $generic_param_atomic = $generic_param->getSingleAtomic();
                 return $generic_param_atomic instanceof TLiteralInt ? $generic_param_atomic->value : null;
             };

src/Psalm/IssueBuffer.php

@@ -190,7 +190,7 @@ public static function isSuppressed(CodeIssue $e, array $suppressed_issues = [])
             return true;
         }
 
-        $suppressed_issue_position = array_search($issue_type, $suppressed_issues);
+        $suppressed_issue_position = array_search($issue_type, $suppressed_issues, true);
 
         if ($suppressed_issue_position !== false) {
             if (is_int($suppressed_issue_position)) {
@@ -203,7 +203,7 @@ public static function isSuppressed(CodeIssue $e, array $suppressed_issues = [])
         $parent_issue_type = Config::getParentIssueType($issue_type);
 
         if ($parent_issue_type) {
-            $suppressed_issue_position = array_search($parent_issue_type, $suppressed_issues);
+            $suppressed_issue_position = array_search($parent_issue_type, $suppressed_issues, true);
 
             if ($suppressed_issue_position !== false) {
                 if (is_int($suppressed_issue_position)) {
@@ -216,7 +216,7 @@ public static function isSuppressed(CodeIssue $e, array $suppressed_issues = [])
 
         $suppress_all_position = $config->disable_suppress_all
             ? false
-            : array_search('all', $suppressed_issues);
+            : array_search('all', $suppressed_issues, true);
 
         if ($suppress_all_position !== false) {
             if (is_int($suppress_all_position)) {

src/Psalm/Plugin/EventHandler/Event/AfterMethodCallAnalysisEvent.php

@@ -16,7 +16,7 @@ final class AfterMethodCallAnalysisEvent
     /**
      * @var MethodCall|StaticCall
      */
-    private $expr;
+    private Expr $expr;
     private string $method_id;
     private string $appearing_method_id;
     private string $declaring_method_id;

src/Psalm/Report/ByIssueLevelAndTypeReport.php

@@ -181,7 +181,7 @@ private function sortIssuesByLevelAndType(): void
     {
         usort(
             $this->issues_data,
-            fn(IssueData $left, IssueData $right): int => [$left->error_level > 0, -$left->error_level,
+            static fn(IssueData $left, IssueData $right): int => [$left->error_level > 0, -$left->error_level,
                     $left->type, $left->file_path, $left->file_name, $left->line_from]
                 <=> [$right->error_level > 0, -$right->error_level, $right->type, $right->file_path, $right->file_name,
                     $right->line_from],

src/Psalm/Report/CountReport.php

@@ -21,7 +21,7 @@ public function create(): string
                 $issue_type_counts[$issue_data->type] = 1;
             }
         }
-        uksort($issue_type_counts, function (string $a, string $b) use ($issue_type_counts): int {
+        uksort($issue_type_counts, static function (string $a, string $b) use ($issue_type_counts): int {
             $cmp_result = $issue_type_counts[$a] <=> $issue_type_counts[$b];
             if ($cmp_result === 0) {
                 return $a <=> $b;

src/Psalm/Storage/FunctionLikeStorage.php

@@ -254,7 +254,7 @@ public function getHoverMarkdown(): string
         $params = count($this->params) > 0 ? "\n" . implode(
             ",\n",
             array_map(
-                function (FunctionLikeParameter $param): string {
+                static function (FunctionLikeParameter $param): string {
                     $realType = $param->type ?: 'mixed';
                     return "    {$realType} \${$param->name}";
                 },
@@ -289,7 +289,7 @@ public function getCompletionSignature(): string
         $symbol_text = 'function ' . $this->cased_name . '('   . implode(
             ',',
             array_map(
-                fn(FunctionLikeParameter $param): string => ($param->type ?: 'mixed') . ' $' . $param->name,
+                static fn(FunctionLikeParameter $param): string => ($param->type ?: 'mixed') . ' $' . $param->name,
                 $this->params,
             ),
         ) .  ') : ' . ($this->return_type ?: 'mixed');

src/Psalm/Type/Atomic/TClosure.php

@@ -9,8 +9,6 @@
 use Psalm\Type\Atomic;
 use Psalm\Type\Union;
 
-use function array_merge;
-
 /**
  * Represents a closure where we know the return type and params
  *
@@ -131,6 +129,6 @@ public function replaceTemplateTypesWithStandins(
 
     protected function getChildNodeKeys(): array
     {
-        return array_merge(parent::getChildNodeKeys(), $this->getCallableChildNodeKeys());
+        return [...parent::getChildNodeKeys(), ...$this->getCallableChildNodeKeys()];
     }
 }

src/Psalm/Type/Atomic/TGenericObject.php

@@ -8,7 +8,6 @@
 use Psalm\Type\Atomic;
 use Psalm\Type\Union;
 
-use function array_merge;
 use function count;
 use function implode;
 use function strrpos;
@@ -127,7 +126,7 @@ public function getAssertionString(): string
 
     protected function getChildNodeKeys(): array
     {
-        return array_merge(parent::getChildNodeKeys(), ['type_params']);
+        return [...parent::getChildNodeKeys(), 'type_params'];
     }
 
     /**

src/Psalm/Type/Atomic/TValueOf.php

@@ -42,8 +42,9 @@ private static function getValueTypeForNamedObject(array $cases, TNamedObject $a
         }
 
         return new Union(array_map(
-            function (EnumCaseStorage $case): Atomic {
-                assert($case->value !== null); // Backed enum must have a value
+            static function (EnumCaseStorage $case): Atomic {
+                assert($case->value !== null);
+                // Backed enum must have a value
                 return ConstantTypeResolver::getLiteralTypeFromScalarValue($case->value);
             },
             array_values($cases),