Upgrade to phpstan 2.0

composer.json

@@ -15,6 +15,7 @@
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.7",
+        "phpstan/phpstan-deprecation-rules": "^1.2",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "^10.2",
         "symplify/easy-coding-standard": "^12.1"

phpstan.neon

@@ -2,6 +2,8 @@ includes:
 	- extension.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
+	- phar://phpstan.phar/conf/bleedingEdge.neon
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 
 parameters:
     ignoreErrors:

src/Reflection/ApplicationPropertiesClassReflectionExtension.php

@@ -21,7 +21,7 @@ final class ApplicationPropertiesClassReflectionExtension implements PropertiesC
     public function __construct(
         private readonly AnnotationsPropertiesClassReflectionExtension $annotationsProperties,
         private readonly ReflectionProvider $reflectionProvider,
-        private readonly ServiceMap $serviceMap
+        private readonly ServiceMap $serviceMap,
     ) {}
 
     public function hasProperty(ClassReflection $classReflection, string $propertyName): bool

src/Type/ActiveQueryDynamicMethodReturnTypeExtension.php

@@ -38,10 +38,11 @@
      */
     public function isMethodSupported(MethodReflection $methodReflection): bool
     {
-        if (
-            ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())
-                ->getReturnType() instanceof ThisType
-        ) {
+        /** @phpstan-ignore staticMethod.deprecated */
+        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())
+            ->getReturnType();
+
+        if ($returnType instanceof ThisType) {
             return true;
         }
 
@@ -54,7 +55,7 @@
     public function getTypeFromMethodCall(
         MethodReflection $methodReflection,
         MethodCall $methodCall,
-        Scope $scope
+        Scope $scope,
     ): Type {
         $calledOnType = $scope->getType($methodCall->var);
         if (!$calledOnType instanceof ActiveQueryObjectType) {
@@ -63,7 +64,7 @@
                     'Unexpected type %s during method call %s at line %d',
                     get_class($calledOnType),
                     $methodReflection->getName(),
-                    $methodCall->getLine()
+                    $methodCall->getLine(),
                 ),
             );
         }
@@ -72,13 +73,13 @@
         if ($methodName === 'asArray') {
             $argType = isset($methodCall->args[0]) && $methodCall->args[0] instanceof Arg
                 ? $scope->getType($methodCall->args[0]->value) : new ConstantBooleanType(true);
-            if (!$argType instanceof ConstantBooleanType) {
+            if ($argType->isBoolean()->no()) {
                 throw new ShouldNotHappenException(
                     sprintf('Invalid argument provided to asArray method at line %d', $methodCall->getLine()),
                 );
             }
 
             return new ActiveQueryObjectType($calledOnType->getModelClass(), $argType->getValue());
         }
 
         if (!in_array($methodName, ['one', 'all'], true)) {
@@ -90,15 +91,15 @@
                 new NullType(),
                 $calledOnType->isAsArray()
                     ? new ArrayType(new StringType(), new MixedType())
-                    : new ActiveRecordObjectType($calledOnType->getModelClass())
+                    : new ActiveRecordObjectType($calledOnType->getModelClass()),
             );
         }
 
         return new ArrayType(
             new IntegerType(),
             $calledOnType->isAsArray()
                 ? new ArrayType(new StringType(), new MixedType())
-                : new ActiveRecordObjectType($calledOnType->getModelClass())
+                : new ActiveRecordObjectType($calledOnType->getModelClass()),
         );
     }
 }

src/Type/ActiveRecordDynamicMethodReturnTypeExtension.php

@@ -9,7 +9,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\ShouldNotHappenException;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
 use yii\db\ActiveRecord;
@@ -35,7 +34,7 @@
     public function getTypeFromMethodCall(
         MethodReflection $methodReflection,
         MethodCall $methodCall,
-        Scope $scope
+        Scope $scope,
     ): Type {
         $arg = $methodCall->args[0];
 
@@ -45,22 +44,22 @@
                     'Unexpected arg %s during method call %s at line %d',
                     get_class($arg),
                     $methodReflection->getName(),
-                    $methodCall->getLine()
+                    $methodCall->getLine(),
                 ),
             );
         }
 
         $argType = $scope->getType($arg->value);
-        if (!$argType instanceof ConstantStringType) {
+        if (count($argType->getConstantStrings()) === 0) {
             throw new ShouldNotHappenException(
                 sprintf(
                     'Invalid argument provided to method %s' . PHP_EOL .
                     'Hint: You should use ::class instead of ::className()',
-                    $methodReflection->getName()
-                )
+                    $methodReflection->getName(),
+                ),
             );
         }
 
         return new ActiveQueryObjectType($argType->getValue(), false);
     }
 }

src/Type/ActiveRecordDynamicStaticMethodReturnTypeExtension.php

@@ -9,21 +9,27 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\NullType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 use yii\db\ActiveQuery;
 use yii\db\ActiveRecord;
 
-use function is_a;
-
 final class ActiveRecordDynamicStaticMethodReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension
 {
+    private ReflectionProvider $reflectionProvider;
+
+    public function __construct(
+        ReflectionProvider $reflectionProvider,
+    ) {
+        $this->reflectionProvider = $reflectionProvider;
+    }
+
     public function getClass(): string
     {
         return ActiveRecord::class;
@@ -34,33 +40,35 @@
      */
     public function isStaticMethodSupported(MethodReflection $methodReflection): bool
     {
+        /** @phpstan-ignore staticMethod.deprecated */
         $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
         if ($returnType instanceof ThisType) {
             return true;
         }
 
         if ($returnType instanceof UnionType) {
             foreach ($returnType->getTypes() as $type) {
-                if ($type instanceof ObjectType) {
-                    return is_a($type->getClassName(), $this->getClass(), true);
+                if ($type->isObject()->yes()) {
+                    return $this->reflectionProvider->hasClass($this->getClass()) &&
+                        $type->getClassName() === $this->getClass();
                 }
             }
         }
 
-        return $returnType instanceof ObjectType &&
-            is_a($returnType->getClassName(), ActiveQuery::class, true);
+        return $returnType->isObject()->yes() && $returnType->getClassName() === ActiveQuery::class;
     }
 
-    /**
-     * @throws ShouldNotHappenException
-     */
     public function getTypeFromStaticMethodCall(
         MethodReflection $methodReflection,
         StaticCall $methodCall,
-        Scope $scope
+        Scope $scope,
     ): Type {
         $className = $methodCall->class;
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants(),
+        )->getReturnType();
 
         if (!$className instanceof Name) {
             return $returnType;
@@ -75,7 +83,7 @@
         if ($returnType instanceof UnionType) {
             return TypeCombinator::union(
                 new NullType(),
-                new ActiveRecordObjectType($name)
+                new ActiveRecordObjectType($name),
             );
         }
 

src/Type/ActiveRecordObjectType.php

@@ -7,7 +7,6 @@
 use ArrayAccess;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -19,12 +18,12 @@
      */
     public function hasOffsetValueType(Type $offsetType): TrinaryLogic
     {
-        if (!$offsetType instanceof ConstantStringType) {
+        if (count($offsetType->getConstantStrings()) === 0) {
             return TrinaryLogic::createNo();
         }
 
         if ($this->isInstanceOf(ArrayAccess::class)->yes()) {
             return TrinaryLogic::createFromBoolean($this->hasProperty($offsetType->getValue())->yes());
         }
 
         return parent::hasOffsetValueType($offsetType);
@@ -32,7 +31,7 @@
 
     public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $unionValues = true): Type
     {
-        if ($offsetType instanceof ConstantStringType && $this->hasProperty($offsetType->getValue())->no()) {
+        if (count($offsetType->getConstantStrings()) > 0 && $this->hasProperty($offsetType->getValue())->no()) {
             return new ErrorType();
         }
 

src/Type/ContainerDynamicMethodReturnTypeExtension.php

@@ -42,6 +42,10 @@
             }
         }
 
-        return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        return ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants(),
+        )->getReturnType();
     }
 }

src/Type/HeaderCollectionDynamicMethodReturnTypeExtension.php

@@ -45,7 +45,7 @@
         /** @var Arg $arg */
         $arg = $methodCall->args[2];
         if ($arg->value instanceof ConstFetch) {
-            $value = $arg->value->name->parts[0];
+            $value = $arg->value->name->getParts()[0];
             if ($value === 'true') {
                 // $first === true, therefore string
                 return new StringType();

tests/ServiceMapTest.php

@@ -45,7 +45,7 @@ public function testThrowExceptionWhenServiceHasUnsupportedType(): void
         $this->expectExceptionMessage('Unsupported service definition for unsupported-type');
 
         new ServiceMap(
-            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-type.php'
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-type.php',
         );
     }
 
@@ -58,7 +58,7 @@ public function testThrowExceptionWhenServiceHasUnsupportedArray(): void
         $this->expectExceptionMessage('Cannot guess service definition for unsupported-array');
 
         new ServiceMap(
-            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-array.php'
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-unsupported-array.php',
         );
     }
 
@@ -71,7 +71,7 @@ public function testThrowExceptionWhenComponentHasInvalidValue(): void
         $this->expectExceptionMessage('Invalid value for component with id customComponent. Expected object or array.');
 
         new ServiceMap(
-            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-component.php'
+            __DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'yii-config-invalid-component.php',
         );
     }