fixes

rectorphp · Oct 7, 2021 · dc53fe1 · dc53fe1
1 parent 10d6fb4
commit dc53fe1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/packages/NodeTypeResolver/NodeTypeResolver.php b/packages/NodeTypeResolver/NodeTypeResolver.php
@@ -20,7 +20,6 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Analyser\Scope;
-use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;

diff --git a/...on/Rector/ClassMethod/AddArrayReturnDocTypeRector/Fixture/class_string_array_item.php.inc b/...on/Rector/ClassMethod/AddArrayReturnDocTypeRector/Fixture/class_string_array_item.php.inc
@@ -42,7 +42,7 @@ class DFactory {}
 class ClassStringArrayItem
 {
     /**
-     * @return array<string, mixed>
+     * @return array<string, mixed[]>
      */
     public function getData()
     {

diff --git a/...n/Rector/ClassMethod/AddArrayReturnDocTypeRector/Fixture/class_string_array_item2.php.inc b/...n/Rector/ClassMethod/AddArrayReturnDocTypeRector/Fixture/class_string_array_item2.php.inc
@@ -40,7 +40,7 @@ class DFactory {}
 class ClassStringArrayItem2
 {
     /**
-     * @return array<int, class-string>
+     * @return class-string[]
      */
     public function getData()
     {

diff --git a/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php b/rules/TypeDeclaration/TypeAnalyzer/GenericClassStringTypeNormalizer.php
@@ -49,8 +49,7 @@ public function normalize(Type $type): ArrayType | UnionType | Type
         });
 
         if ($type instanceof UnionType) {
-            return $type;
-//            Oreturn $this->resolveClassStringInUnionType($type);
+            return $this->resolveClassStringInUnionType($type);
         }
 
         if ($type instanceof ArrayType && $type->getKeyType() instanceof UnionType) {