Bump PHPStan to 2.1.38 (#7879)

TomasVotruba · web-flow · commit 4997962de1f5 · 2026-02-03T23:37:44.000+01:00
* bump PHPStan to 2.1.38

* bump process to 7.4
diff --git a/build/target-repository/composer.json b/build/target-repository/composer.json
@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "phpstan/phpstan": "^2.1.37"
+        "phpstan/phpstan": "^2.1.38"
     },
     "autoload": {
         "files": [
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "nikic/php-parser": "^5.7",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.3",
-        "phpstan/phpstan": "^2.1.37",
+        "phpstan/phpstan": "^2.1.38",
         "react/event-loop": "^1.6",
         "react/promise": "^3.3",
         "react/socket": "^1.17",
@@ -36,7 +36,7 @@
         "symfony/console": "^6.4.24",
         "symfony/filesystem": "^7.0",
         "symfony/finder": "^6.4",
-        "symfony/process": "^6.4|7.0.*",
+        "symfony/process": "^6.4|^7.4",
         "symplify/easy-parallel": "^11.2.2",
         "symplify/rule-doc-generator-contracts": "^11.2",
         "webmozart/assert": "^2.1"
diff --git a/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php b/rules-tests/TypeDeclaration/Rector/FunctionLike/AddClosureParamTypeForArrayMapRector/config/configured_rule.php
@@ -6,9 +6,6 @@
 use Rector\TypeDeclaration\Rector\FunctionLike\AddClosureParamTypeForArrayMapRector;
 use Rector\ValueObject\PhpVersionFeature;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig
-        ->rules([AddClosureParamTypeForArrayMapRector::class]);
-
-    $rectorConfig->phpVersion(PhpVersionFeature::UNION_TYPES);
-};
+return RectorConfig::configure()
+    ->withRules([AddClosureParamTypeForArrayMapRector::class])
+    ->withPhpVersion(PhpVersionFeature::UNION_TYPES);
diff --git a/rules/Carbon/NodeFactory/CarbonCallFactory.php b/rules/Carbon/NodeFactory/CarbonCallFactory.php
@@ -37,8 +37,8 @@ public function createFromDateTimeString(
             $methodCall = $this->createModifyMethodCall(
                 $carbonCall,
                 new Int_((int) $match['count']),
-                $match['unit'],
-                $match['operator']
+                (string) $match['unit'],
+                (string) $match['operator']
             );
             if ($methodCall instanceof MethodCall) {
                 $carbonCall = $methodCall;
diff --git a/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php b/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php
@@ -170,7 +170,7 @@ private function resolveNewVariableName(string $typeShortName): string
             lcfirst($typeShortName),
             self::STARTS_WITH_ABBREVIATION_REGEX,
             static function (array $matches): string {
-                $output = isset($matches[1]) ? strtolower((string) $matches[1]) : '';
+                $output = isset($matches[1]) ? strtolower($matches[1]) : '';
                 $output .= $matches[2] ?? '';
 
                 return $output . ($matches[3] ?? '');
diff --git a/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php b/rules/Naming/ExpectedNameResolver/InflectorSingularResolver.php
@@ -93,7 +93,7 @@ private function singularizeCamelParts(string $currentName): string
             if (in_array($camelCase[self::CAMELCASE], ['is', 'has', 'cms', 'this'], true)) {
                 $value = $camelCase[self::CAMELCASE];
             } else {
-                $value = $this->inflector->singularize($camelCase[self::CAMELCASE]);
+                $value = $this->inflector->singularize((string) $camelCase[self::CAMELCASE]);
             }
 
             $resolvedName .= $value;
diff --git a/rules/Naming/RectorNamingInflector.php b/rules/Naming/RectorNamingInflector.php
@@ -26,7 +26,7 @@ public function singularize(string $name): string
             return $this->inflector->singularize($name);
         }
 
-        $singularized = $this->inflector->singularize($matches['prefix']);
+        $singularized = $this->inflector->singularize((string) $matches['prefix']);
         $uninflectable = $matches['suffix'];
 
         return $singularized . $uninflectable;
diff --git a/rules/Php55/RegexMatcher.php b/rules/Php55/RegexMatcher.php
@@ -96,7 +96,7 @@ private function matchConcat(Concat $concat): ?Concat
             return null;
         }
 
-        if (! \str_contains((string) $matches['modifiers'], 'e')) {
+        if (! \str_contains($matches['modifiers'], 'e')) {
             return null;
         }
 
diff --git a/scripts/check-before-after-same-fixtures.php b/scripts/check-before-after-same-fixtures.php
@@ -59,7 +59,7 @@ private function hasFileSameBeforeAndAfterPart(SplFileInfo $fixtureFile): bool
             return false;
         }
 
-        return trim((string) $parts[0]) === trim((string) $parts[1]);
+        return trim($parts[0]) === trim($parts[1]);
     }
 }
 
diff --git a/src/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php b/src/BetterPhpDocParser/PhpDocParser/BetterPhpDocParser.php
@@ -133,7 +133,7 @@ public function parseTagValue(TokenIterator $tokenIterator, string $tag): PhpDoc
             $phpDocTagValueNode->value = Strings::replace(
                 $phpDocTagValueNode->value,
                 self::MULTI_NEW_LINES_REGEX,
-                static fn (array $match) => $match['new_line']
+                static fn (array $match): string => (string) $match['new_line']
             );
         }
 
diff --git a/src/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php b/src/BetterPhpDocParser/Printer/PhpDocInfoPrinter.php
@@ -181,7 +181,7 @@ private function printPhpDocNode(PhpDocNode $phpDocNode): string
         return Strings::replace(
             $output,
             self::NEW_LINE_WITH_SPACE_REGEX,
-            static fn (array $match) => $match['new_line']
+            static fn (array $match): string => (string) $match['new_line']
         );
     }
 
diff --git a/src/FileSystem/FilePathHelper.php b/src/FileSystem/FilePathHelper.php
@@ -62,6 +62,7 @@ public function normalizePathAndSchema(string $originalPath): string
         $pathRoot = str_starts_with($path, '/') ? $directorySeparator : '';
         $pathParts = explode('/', trim($path, '/'));
 
+        /** @var string $scheme */
         $normalizedPathParts = $this->normalizePathParts($pathParts, $scheme);
 
         $pathStart = ($scheme !== self::SCHEME_UNDEFINED ? $scheme . '://' : '');
diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -509,9 +509,11 @@ private function processAssign(Assign|AssignOp|AssignRef $assign, MutatingScope
     private function processArray(List_|Array_ $array, MutatingScope $mutatingScope): void
     {
         foreach ($array->items as $arrayItem) {
-            if ($arrayItem instanceof ArrayItem) {
-                $this->processArrayItem($arrayItem, $mutatingScope);
+            if (! $arrayItem instanceof ArrayItem) {
+                continue;
             }
+
+            $this->processArrayItem($arrayItem, $mutatingScope);
         }
     }
 
diff --git a/src/PhpParser/Parser/InlineCodeParser.php b/src/PhpParser/Parser/InlineCodeParser.php
@@ -159,7 +159,7 @@ private function resolveConcatValue(Concat $concat): string
         return Strings::replace(
             $string,
             self::VARIABLE_IN_SINGLE_QUOTED_REGEX,
-            static fn (array $match) => $match['variable']
+            static fn (array $match): string => (string) $match['variable']
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private function singularizeCamelParts(string $currentName): string`
`93`	`93`	`if (in_array($camelCase[self::CAMELCASE], ['is', 'has', 'cms', 'this'], true)) {`
`94`	`94`	`$value = $camelCase[self::CAMELCASE];`
`95`	`95`	`} else {`
`96`		`- $value = $this->inflector->singularize($camelCase[self::CAMELCASE]);`
	`96`	`+ $value = $this->inflector->singularize((string) $camelCase[self::CAMELCASE]);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`$resolvedName .= $value;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function singularize(string $name): string`
`26`	`26`	`return $this->inflector->singularize($name);`
`27`	`27`	`}`
`28`	`28`
`29`		`- $singularized = $this->inflector->singularize($matches['prefix']);`
	`29`	`+ $singularized = $this->inflector->singularize((string) $matches['prefix']);`
`30`	`30`	`$uninflectable = $matches['suffix'];`
`31`	`31`
`32`	`32`	`return $singularized . $uninflectable;`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ private function matchConcat(Concat $concat): ?Concat`
`96`	`96`	`return null;`
`97`	`97`	`}`
`98`	`98`
`99`		`- if (! \str_contains((string) $matches['modifiers'], 'e')) {`
	`99`	`+ if (! \str_contains($matches['modifiers'], 'e')) {`
`100`	`100`	`return null;`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ private function hasFileSameBeforeAndAfterPart(SplFileInfo $fixtureFile): bool`
`59`	`59`	`return false;`
`60`	`60`	`}`
`61`	`61`
`62`		`- return trim((string) $parts[0]) === trim((string) $parts[1]);`
	`62`	`+ return trim($parts[0]) === trim($parts[1]);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function parseTagValue(TokenIterator $tokenIterator, string $tag): PhpDoc`
`133`	`133`	`$phpDocTagValueNode->value = Strings::replace(`
`134`	`134`	`$phpDocTagValueNode->value,`
`135`	`135`	`self::MULTI_NEW_LINES_REGEX,`
`136`		`- static fn (array $match) => $match['new_line']`
	`136`	`+ static fn (array $match): string => (string) $match['new_line']`
`137`	`137`	`);`
`138`	`138`	`}`
`139`	`139`