Bump to PHPStan ^2.1.33, add back ArrayMapArgVisitor

build/target-repository/composer.json

@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "phpstan/phpstan": "^2.1.32"
+        "phpstan/phpstan": "^2.1.33"
     },
     "autoload": {
         "files": [

composer.json

@@ -23,7 +23,7 @@
         "nikic/php-parser": "^5.6.2",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3",
-        "phpstan/phpstan": "^2.1.32",
+        "phpstan/phpstan": "^2.1.33",
         "react/event-loop": "^1.6",
         "react/promise": "^3.3",
         "react/socket": "^1.17",

rules-tests/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector/Fixture/skip_array_of_strings_on_array_map.php.inc

@@ -0,0 +1,19 @@
+<?php
+
+namespace Rector\Tests\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector\Fixture;
+
+final class SkipArrayOfStringsOnArrayMap
+{
+    public function foo(string $name)
+    {
+        $parts = explode('_', $name);
+        return implode(
+            '',
+            array_map(
+                fn ($part): string =>
+                strtolower($part),
+                $parts
+            )
+        );
+    }
+}

rules-tests/TypeDeclaration/Rector/ArrowFunction/AddArrowFunctionReturnTypeRector/Fixture/return_by_array_shape_type.php.inc

@@ -0,0 +1,33 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector\Fixture;
+
+class ReturnByArrayShapeType
+{
+    /**
+     * @param array<int, array{bar: int}> $values
+     */
+    private function foo(array $values): void
+    {
+        $bars = array_map(fn($value) => $value['bar'], $values);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector\Fixture;
+
+class ReturnByArrayShapeType
+{
+    /**
+     * @param array<int, array{bar: int}> $values
+     */
+    private function foo(array $values): void
+    {
+        $bars = array_map(fn($value): int => $value['bar'], $values);
+    }
+}
+
+?>

rules/CodingStyle/Rector/Enum_/EnumCaseToPascalCaseRector.php

@@ -208,9 +208,9 @@ private function convertToPascalCase(string $name): string
                 fn ($part): string =>
                 // If part is all uppercase, convert to ucfirst(strtolower())
                 // If part is already mixed or PascalCase, keep as is except ucfirst
-                ctype_upper((string) $part)
-                    ? ucfirst(strtolower((string) $part))
-                    : ucfirst((string) $part),
+                ctype_upper($part)
+                    ? ucfirst(strtolower($part))
+                    : ucfirst($part),
                 $parts
             )
         );

rules/TypeDeclaration/Rector/FuncCall/AddArrowFunctionParamArrayWhereDimFetchRector.php

@@ -12,7 +12,6 @@
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
-use PhpParser\Node\Scalar\String_;
 use PHPStan\Type\ArrayType;
 use Rector\PhpParser\Node\BetterNodeFinder;
 use Rector\Rector\AbstractRector;
@@ -149,8 +148,7 @@ private function resolveDimFetchVariableNames(Closure|ArrowFunction $closureExpr
             if ($arrayDimFetch->var instanceof Variable) {
                 $type = $this->nodeTypeResolver->getNativeType($arrayDimFetch->var);
 
-                // skip string values
-                if (! $arrayDimFetch->dim instanceof String_ && ($type->isString()->yes() || $type->isString()->maybe())) {
+                if ($type->isString()->yes()) {
                     continue;
                 }
 

src/DependencyInjection/PHPStan/PHPStanContainerMemento.php

@@ -7,6 +7,7 @@
 use PHPStan\DependencyInjection\MemoizingContainer;
 use PHPStan\DependencyInjection\Nette\NetteContainer;
 use PHPStan\Parser\AnonymousClassVisitor;
+use PHPStan\Parser\ArrayMapArgVisitor;
 use PHPStan\Parser\RichParser;
 use PHPStan\Parser\VariadicFunctionsVisitor;
 use PHPStan\Parser\VariadicMethodsVisitor;
@@ -42,6 +43,7 @@ public static function removeRichVisitors(RichParser $richParser): void
             $container->findServiceNamesByType(AnonymousClassVisitor::class)[0] => true,
             $container->findServiceNamesByType(VariadicFunctionsVisitor::class)[0] => true,
             $container->findServiceNamesByType(VariadicMethodsVisitor::class)[0] => true,
+            $container->findServiceNamesByType(ArrayMapArgVisitor::class)[0] => true,
         ];
 
         $tags[RichParser::VISITOR_SERVICE_TAG] = $nodeVisitorsToKeep;