Add phpstan support

123inkt · Jun 19, 2024 · d10c9e5 · d10c9e5
1 parent 4bbe15c
commit d10c9e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/PHPStan/ArraysReturnExtension.php b/src/PHPStan/ArraysReturnExtension.php
@@ -4,7 +4,6 @@
 namespace DR\Utils\PHPStan;
 
 use DR\Utils\Arrays;
-use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
@@ -38,7 +37,6 @@ public function isStaticMethodSupported(MethodReflection $methodReflection): boo
      */
     public function getTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): Type
     {
-        /** @var Array_ $disallowedTypes */
         [$items, $disallowedTypes] = $methodCall->getArgs();
 
         /** @var ArrayType $arrayType */

diff --git a/src/PHPStan/AssertTypeExtension.php b/src/PHPStan/AssertTypeExtension.php
@@ -5,7 +5,6 @@
 
 use DR\Utils\Assert;
 use PhpParser\Node\Arg;
-use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\PhpDoc\TypeStringResolver;
@@ -38,9 +37,7 @@ public function isStaticMethodSupported(MethodReflection $methodReflection): boo
      */
     public function getTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): Type
     {
-        /** @var Array_ $allowedTypes */
         [$item, $allowedTypes] = $methodCall->getArgs();
-
         $types = $this->getTypesForArg($item, $scope);
 
         // convert the disallowed types as string to phpstan types

diff --git a/src/PHPStan/TypeUtil.php b/src/PHPStan/TypeUtil.php
@@ -4,6 +4,7 @@
 
 namespace DR\Utils\PHPStan;
 
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Name;
@@ -14,21 +15,26 @@
 class TypeUtil
 {
     /**
+     * @param Arg $arg arg of type Array
+     *
      * @return Type[]
      */
-    public static function getTypesFromStringArray(TypeStringResolver $typeStringResolver, Array_ $typesAsString): array
+    public static function getTypesFromStringArray(TypeStringResolver $typeStringResolver, Arg $arg): array
     {
-        $disallowedStanTypes = [];
-        foreach ($typesAsString->items as $item) {
+        $argValue = $arg->value;
+        assert($argValue instanceof Array_);
+
+        $types = [];
+        foreach ($argValue->items as $item) {
             if ($item?->value instanceof String_) {
                 // type definition is string, convert to type object
-                $disallowedStanTypes[] = $typeStringResolver->resolve($item->value->value);
+                $types[] = $typeStringResolver->resolve($item->value->value);
             } elseif ($item?->value instanceof ClassConstFetch && $item->value->class instanceof Name) {
                 // type definition is class-string, convert to type object
-                $disallowedStanTypes[] = $typeStringResolver->resolve($item->value->class->toString());
+                $types[] = $typeStringResolver->resolve($item->value->class->toString());
             }
         }
 
-        return $disallowedStanTypes;
+        return $types;
     }
 }