Bump to phpstan 2.0

Author: paulbalandan

composer.json

@@ -24,7 +24,7 @@
     "require": {
         "php": "^8.1",
         "codeigniter4/framework": "^4.4",
-        "phpstan/phpstan": "^1.10"
+        "phpstan/phpstan": "^2.0"
     },
     "require-dev": {
         "codeigniter/coding-standard": "^1.7",
@@ -33,11 +33,11 @@
         "nexusphp/cs-config": "^3.12",
         "php-parallel-lint/php-parallel-lint": "^1.3",
         "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpstan/phpstan-strict-rules": "^1.5",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
         "phpunit/phpunit": "^10.2 || ^11.4",
-        "rector/rector": "^1.0.0"
+        "rector/rector": "^2.0"
     },
     "conflict": {
         "codeigniter/framework": "*"

src/Type/FactoriesReturnTypeHelper.php

@@ -63,12 +63,12 @@ public function check(Type $type, string $function): Type
                 return $traverse($type);
             }
 
-            if ($type->isClassStringType()->yes()) {
+            if ($type->isClassString()->yes()) {
                 return $type->getClassStringObjectType();
             }
 
             foreach ($type->getConstantStrings() as $constantStringType) {
-                if ($constantStringType->isClassStringType()->yes()) {
+                if ($constantStringType->isClassString()->yes()) {
                     return $constantStringType->getClassStringObjectType();
                 }
 

src/Type/ModelFindReturnTypeExtension.php

@@ -104,11 +104,12 @@ private function getTypeFromFindAll(MethodCall $methodCall, Scope $scope): Type
     {
         $classReflection = $this->getClassReflection($methodCall, $scope);
 
-        return AccessoryArrayListType::intersectWith(
+        return TypeCombinator::intersect(
             new ArrayType(
                 new IntegerType(),
                 $this->modelFetchedReturnTypeHelper->getFetchedReturnType($classReflection, $methodCall, $scope)
-            )
+            ),
+            new AccessoryArrayListType()
         );
     }
 }

tests/Type/data/model-find.php

@@ -35,7 +35,7 @@ function bar(null|int|string $id): void
 {
     $model = model(UserModel::class);
 
-    assertType('list<CodeIgniter\Shield\Entities\User>|CodeIgniter\Shield\Entities\User|null', $model->find($id));
+    assertType('CodeIgniter\Shield\Entities\User|list<CodeIgniter\Shield\Entities\User>|null', $model->find($id));
 }
 
 function foo(): void

tests/extension-test.neon

@@ -1,6 +1,4 @@
 parameters:
-  featureToggles:
-    listType: true
   bootstrapFiles:
     - ../bootstrap.php
   codeigniter: