Bump Symplify and PHPStan rules version (#2218)

Co-authored-by: GitHub Action <action@github.com>
rectorphp · May 3, 2022 · 0052951 · 0052951
1 parent c4e1ee2
commit 0052951
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/composer.json b/composer.json
@@ -69,7 +69,7 @@
         "phpstan/phpstan-strict-rules": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "rector/phpstan-rules": "^0.4.24",
+        "rector/phpstan-rules": "^0.5.0",
         "spatie/enum": "^3.13",
         "symplify/coding-standard": "^10.2",
         "symplify/easy-ci": "^10.2",

diff --git a/config/phpstan/static-reflection.neon b/config/phpstan/static-reflection.neon
@@ -4,8 +4,8 @@ parameters:
         disableRuntimeReflectionProvider: false
 
 conditionalTags:
-	PhpParser\NodeVisitor\NodeConnectingVisitor:
-		phpstan.parser.richParserNodeVisitor: true
+    PhpParser\NodeVisitor\NodeConnectingVisitor:
+        phpstan.parser.richParserNodeVisitor: true
 
 services:
     - Rector\NodeTypeResolver\Reflection\BetterReflection\RectorBetterReflectionSourceLocatorFactory

diff --git a/rules/CodeQuality/Rector/FuncCall/SetTypeToCastRector.php b/rules/CodeQuality/Rector/FuncCall/SetTypeToCastRector.php
@@ -105,7 +105,7 @@ public function refactor(Node $node): ?Node
         /** @var Arg $secondArg */
         $secondArg = $node->args[1];
         $typeNode = $this->valueResolver->getValue($secondArg->value);
-        if ($typeNode === null) {
+        if (! is_string($typeNode)) {
             return null;
         }
 

diff --git a/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php b/rules/CodingStyle/Rector/Catch_/CatchExceptionNameMatchingTypeRector.php
@@ -114,7 +114,7 @@ public function refactor(Node $node): ?Node
             function (array $matches): string {
                 $output = '';
 
-                $output .= isset($matches[1]) ? strtolower($matches[1]) : '';
+                $output .= isset($matches[1]) ? strtolower((string) $matches[1]) : '';
                 $output .= $matches[2] ?? '';
 
                 return $output . ($matches[3] ?? '');

diff --git a/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php b/rules/Php81/Rector/FuncCall/NullToStrictStringFuncCallArgRector.php
@@ -40,20 +40,20 @@ final class NullToStrictStringFuncCallArgRector extends AbstractRector implement
      * @var array<string, string[]>
      */
     private const ARG_POSITION_NAME_NULL_TO_STRICT_STRING = [
-      'preg_split' => ['subject'], 
-      'preg_match' => ['subject'], 
-      'preg_match_all' => ['subject'], 
-      'explode' => ['string'], 
-      'strlen' => ['string'], 
-      'str_contains' => ['haystack', 'needle'], 
-      'strtotime' => ['datetime'], 
-      'str_replace' => ['subject'], 
-      'substr' => ['string'], 
-      'str_starts_with' => ['haystack', 'needle'], 
-      'strtoupper' => ['string'], 
-      'strtolower' => ['string'], 
-      'strpos' => ['haystack', 'needle'], 
-      'stripos' => ['haystack', 'needle'],
+        'preg_split' => ['subject'],
+        'preg_match' => ['subject'],
+        'preg_match_all' => ['subject'],
+        'explode' => ['string'],
+        'strlen' => ['string'],
+        'str_contains' => ['haystack', 'needle'],
+        'strtotime' => ['datetime'],
+        'str_replace' => ['subject'],
+        'substr' => ['string'],
+        'str_starts_with' => ['haystack', 'needle'],
+        'strtoupper' => ['string'],
+        'strtolower' => ['string'],
+        'strpos' => ['haystack', 'needle'],
+        'stripos' => ['haystack', 'needle'],
     ];
 
     public function __construct(

diff --git a/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php b/rules/Privatization/NodeFactory/ClassConstantFetchValueFactory.php
@@ -32,8 +32,8 @@ public function create(Expr $expr, string $classWithConstants, bool $caseInsensi
         $constantNamesToValues = $this->classConstantsResolver->getClassConstantNamesToValues($classWithConstants);
         foreach ($constantNamesToValues as $constantName => $constantValue) {
             if ($caseInsensitive) {
-                $constantValue = strtolower($constantValue);
-                $value = strtolower($value);
+                $constantValue = strtolower((string) $constantValue);
+                $value = strtolower((string) $value);
             }
 
             if ($constantValue !== $value) {

diff --git a/src/Util/StaticRectorStrings.php b/src/Util/StaticRectorStrings.php
@@ -26,7 +26,9 @@ public static function camelCaseToUnderscore(string $input): string
         $matches = Strings::matchAll($input, self::CAMEL_CASE_SPLIT_REGEX);
         $parts = [];
         foreach ($matches as $match) {
-            $parts[] = $match[0] === strtoupper($match[0]) ? strtolower($match[0]) : lcfirst($match[0]);
+            $matchedPart = (string) $match[0];
+
+            $parts[] = $matchedPart === strtoupper($matchedPart) ? strtolower($matchedPart) : lcfirst($matchedPart);
         }
 
         return implode('_', $parts);