PHPStan 2.0 support

composer.json

@@ -17,7 +17,8 @@
         "symplify/phpstan-extensions": "^11.4",
         "symplify/phpstan-rules": "^12.4",
         "symplify/rule-doc-generator": "^12.1",
-        "tightenco/duster": "^2.7"
+        "tightenco/duster": "^2.7",
+        "phpstan/phpstan-deprecation-rules": "^1.2"
     },
     "autoload": {
         "psr-4": {

phpstan.neon

@@ -1,5 +1,6 @@
 includes:
     - vendor/symplify/phpstan-rules/config/rector-rules.neon
+    - phar://phpstan.phar/conf/bleedingEdge.neon
 parameters:
     level: max
 
@@ -32,3 +33,6 @@ parameters:
 
         # Laravel Container not being recognized properly in some of the tests
         - '#Call to method needs\(\) on an unknown class Illuminate\\Contracts\\Container\\ContextualBindingBuilder#'
+
+        # No easy replacement for this check, it's also ignored in core Rector
+        - '#Doing instanceof PHPStan\\Type\\Generic\\GenericObjectType is error\-prone and deprecated#'

src/Rector/Assign/CallOnAppArrayAccessToStandaloneAssignRector.php

@@ -53,8 +53,9 @@ public function getNodeTypes(): array
 
     /**
      * @param  Expression  $node
+     * @return array<int, Node>|null
      */
-    public function refactor(Node $node): Node|array|int|null
+    public function refactor(Node $node): ?array
     {
         if (! $node->expr instanceof Assign) {
             return null;

src/Rector/ClassMethod/AddGenericReturnTypeToRelationsRector.php

@@ -14,8 +14,6 @@
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Type\Constant\ConstantStringType;
-use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
@@ -239,21 +237,17 @@ private function getRelatedModelClassFromMethodCall(MethodCall $methodCall): ?st
     {
         $argType = $this->getType($methodCall->getArgs()[0]->value);
 
-        if ($argType instanceof ConstantStringType && $argType->isClassStringType()->yes()) {
-            return $argType->getValue();
-        }
-
-        if (! $argType instanceof GenericClassStringType) {
+        if (! $argType->isClassStringType()->yes()) {
             return null;
         }
 
-        $modelType = $argType->getGenericType();
+        $objectClassNames = $argType->getClassStringObjectType()->getObjectClassNames();
 
-        if (! $modelType instanceof ObjectType) {
+        if ($objectClassNames === []) {
             return null;
         }
 
-        return $modelType->getClassName();
+        return $objectClassNames[0];
     }
 
     private function getRelationMethodCall(ClassMethod $classMethod): ?MethodCall
@@ -326,21 +320,17 @@ private function getClassForIntermediateGeneric(MethodCall $methodCall): ?string
 
         $argType = $this->getType($args[1]->value);
 
-        if ($argType instanceof ConstantStringType && $argType->isClassStringType()->yes()) {
-            return $argType->getValue();
-        }
-
-        if (! $argType instanceof GenericClassStringType) {
+        if (! $argType->isClassStringType()->yes()) {
             return null;
         }
 
-        $modelType = $argType->getGenericType();
+        $objectClassNames = $argType->getClassStringObjectType()->getObjectClassNames();
 
-        if (! $modelType instanceof ObjectType) {
+        if ($objectClassNames === []) {
             return null;
         }
 
-        return $modelType->getClassName();
+        return $objectClassNames[0];
     }
 
     private function areNativeTypeAndPhpDocReturnTypeEqual(

src/Rector/ClassMethod/MigrateToSimplifiedAttributeRector.php

@@ -47,7 +47,7 @@ public function getNodeTypes(): array
     /**
      * @param  Class_  $node
      */
-    public function refactor(Node $node): Node|array|int|null
+    public function refactor(Node $node): ?Node
     {
         if (! $this->isObjectType($node, new ObjectType('Illuminate\Database\Eloquent\Model'))) {
             return null;

src/Rector/Coalesce/ApplyDefaultInsteadOfNullCoalesceRector.php

@@ -90,13 +90,19 @@ public function refactor(Node $node): MethodCall|StaticCall|FuncCall|null
 
         $call = $node->left;
 
+        if ($call instanceof MethodCall) {
+            $objectType = $call->var;
+        } elseif ($call instanceof StaticCall) {
+            $objectType = $call->class;
+        } else {
+            $objectType = null;
+        }
+
         foreach ($this->applyDefaultWith as $applyDefaultWith) {
             $valid = false;
 
-            $objectType = $call->var ?? $call->class ?? null;
-
             if (
-                $applyDefaultWith->getObjectType() instanceof ObjectType &&
+                $applyDefaultWith->getObjectType() !== null &&
                 $objectType !== null &&
                 $this->isObjectType(
                     $objectType,

src/Rector/FuncCall/DispatchNonShouldQueueToDispatchSyncRector.php

@@ -136,15 +136,20 @@ private function processCall(FuncCall|MethodCall|StaticCall $call): FuncCall|Met
     private function isDispatchablesCall(MethodCall $methodCall): bool
     {
         $type = $this->getType($methodCall->var);
-        if (! $type instanceof ObjectType) {
+
+        if (! $type->isObject()->yes()) {
+            return false;
+        }
+
+        $objectClassNames = $type->getObjectClassNames();
+
+        if (count($objectClassNames) !== 1) {
             return false;
         }
 
         try {
             // Will trigger ClassNotFoundException if the class definition is not found
-            $reflection = $this->reflectionProvider->getClass(
-                $type->getClassName()
-            );
+            $reflection = $this->reflectionProvider->getClass($objectClassNames[0]);
 
             if ($reflection->hasTraitUse(self::DISPATCHABLE_TRAIT)) {
                 return true;

src/Rector/FuncCall/RemoveDumpDataDeadCodeRector.php

@@ -78,8 +78,9 @@ public function getNodeTypes(): array
 
     /**
      * @param  Expression  $node
+     * @return NodeTraverser::REMOVE_NODE|null
      */
-    public function refactor(Node $node): int|Node|array|null
+    public function refactor(Node $node): ?int
     {
         if (! $node->expr instanceof FuncCall) {
             return null;

src/Rector/MethodCall/ChangeQueryWhereDateValueWithCarbonRector.php

@@ -78,8 +78,9 @@ public function getNodeTypes(): array
 
     /**
      * @param  Expression  $node
+     * @return array<int, Expression|Node>|null
      */
-    public function refactor(Node $node): Node|array|int|null
+    public function refactor(Node $node): ?array
     {
         if (! $node->expr instanceof MethodCall) {
             return null;

src/Rector/MethodCall/EloquentOrderByToLatestOrOldestRector.php

@@ -114,7 +114,7 @@ private function isOrderByMethodCall(MethodCall $methodCall): bool
 
     private function isAllowedPattern(MethodCall $methodCall): bool
     {
-        $columnArg = $methodCall->args[0]->value ?? null;
+        $columnArg = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;
 
         // If no patterns are specified, consider all column names as matching
         if ($this->allowedPatterns === []) {
@@ -150,12 +150,17 @@ private function convertOrderByToLatest(MethodCall $methodCall): MethodCall
             return $methodCall;
         }
 
-        $columnVar = $methodCall->args[0]->value ?? null;
+        $columnVar = $methodCall->args[0] instanceof Arg ? $methodCall->args[0]->value : null;
         if ($columnVar === null) {
             return $methodCall;
         }
 
-        $direction = $methodCall->args[1]->value->value ?? 'asc';
+        if (isset($methodCall->args[1]) && $methodCall->args[1] instanceof Arg && $methodCall->args[1]->value instanceof String_) {
+            $direction = $methodCall->args[1]->value->value;
+        } else {
+            $direction = 'asc';
+        }
+
         if ($this->isName($methodCall->name, 'orderByDesc')) {
             $newMethod = 'latest';
         } else {

src/Rector/New_/AddGuardToLoginEventRector.php

@@ -68,8 +68,9 @@ public function getNodeTypes(): array
 
     /**
      * @param  Expression  $node
+     * @return array<int, Expression|Node>|null
      */
-    public function refactor(Node $node): Node|array|int|null
+    public function refactor(Node $node): ?array
     {
         $newNode = $this->getNewNode($node);
 

src/Rector/PropertyFetch/OptionalToNullsafeOperatorRector.php

@@ -132,6 +132,9 @@ public function refactor(Node $node): ?Node
         return new NullsafeMethodCall($firstArg->value, $node->name, $node->args);
     }
 
+    /**
+     * @return PhpVersion::PHP_80
+     */
     public function provideMinPhpVersion(): int
     {
         return PhpVersion::PHP_80;

src/Rector/StaticCall/DispatchToHelperFunctionsRector.php

@@ -12,7 +12,6 @@
 use PHPStan\Broker\ClassNotFoundException;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\Exception\PoorDocumentationException;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -91,14 +90,18 @@ public function refactor(Node $node): ?Node
     private function getClassReflection(StaticCall $staticCall): ?ClassReflection
     {
         $type = $this->getType($staticCall->class);
-        if (! $type instanceof ObjectType) {
+        if (! $type->isObject()->yes()) {
+            return null;
+        }
+
+        $objectClassNames = $type->getObjectClassNames();
+
+        if (count($objectClassNames) !== 1) {
             return null;
         }
 
         try {
-            return $this->reflectionProvider->getClass(
-                $type->getClassName()
-            );
+            return $this->reflectionProvider->getClass($objectClassNames[0]);
         } catch (ClassNotFoundException) {
         }
 

src/Rector/StaticCall/RouteActionCallableRector.php

@@ -14,7 +14,7 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\Php\PhpMethodReflection;
+use PHPStan\Reflection\MethodReflection;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PhpParser\Node\Value\ValueResolver;
@@ -123,7 +123,7 @@ public function refactor(Node $node): ?Node
 
         $phpMethodReflection = $this->reflectionResolver->resolveMethodReflection($segments[0], $segments[1], $scope);
 
-        if (! $phpMethodReflection instanceof PhpMethodReflection) {
+        if (! $phpMethodReflection instanceof MethodReflection) {
             return null;
         }
 
@@ -132,7 +132,7 @@ public function refactor(Node $node): ?Node
             $segments[1],
         ]);
 
-        if (is_array($argValue) && isset($argValue['as'])) {
+        if (is_array($argValue) && isset($argValue['as']) && is_string($argValue['as'])) {
             $node = new MethodCall($node, 'name', [new Arg(new String_($argValue['as']))]);
         }
 
@@ -144,9 +144,17 @@ public function refactor(Node $node): ?Node
             if (is_string($argValue['middleware'])) {
                 $argument = new String_($argValue['middleware']);
             } else {
+                // if any of the elements in the middleware array is not a string, return node as is
+                if (array_filter($argValue['middleware'], static fn ($value) => ! is_string($value)) !== []) {
+                    return $node;
+                }
+
+                /** @var list<string> $middleware */
+                $middleware = $argValue['middleware'];
+
                 $argument = new Array_(array_map(
                     static fn ($value) => new ArrayItem(new String_($value)),
-                    $argValue['middleware']
+                    $middleware
                 ));
             }
             $node = new MethodCall($node, 'middleware', [new Arg($argument)]);
@@ -164,6 +172,7 @@ public function configure(array $configuration): void
         Assert::isArray($routes);
         Assert::allString(array_keys($routes));
         Assert::allString($routes);
+        /** @var array<string, string> $routes */
         $this->routes = $routes;
 
         $namespace = $configuration[self::NAMESPACE] ?? self::DEFAULT_NAMESPACE;

src/Set/LaravelLevelSetList.php

@@ -4,9 +4,7 @@
 
 namespace RectorLaravel\Set;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class LaravelLevelSetList implements SetListInterface
+final class LaravelLevelSetList
 {
     /**
      * @var string

src/Set/LaravelSetList.php

@@ -4,9 +4,7 @@
 
 namespace RectorLaravel\Set;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class LaravelSetList implements SetListInterface
+final class LaravelSetList
 {
     /**
      * @var string

src/Set/Packages/Cashier/CashierLevelSetList.php

@@ -4,9 +4,7 @@
 
 namespace RectorLaravel\Set\Packages\Cashier;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class CashierLevelSetList implements SetListInterface
+final class CashierLevelSetList
 {
     /**
      * @var string

src/Set/Packages/Cashier/CashierSetList.php

@@ -4,9 +4,7 @@
 
 namespace RectorLaravel\Set\Packages\Cashier;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class CashierSetList implements SetListInterface
+final class CashierSetList
 {
     /**
      * @var string

src/Set/Packages/Livewire/LivewireLevelSetList.php

@@ -4,9 +4,7 @@
 
 namespace RectorLaravel\Set\Packages\Livewire;
 
-use Rector\Set\Contract\SetListInterface;
-
-final class LivewireLevelSetList implements SetListInterface
+final class LivewireLevelSetList
 {
     /**
      * @var string