[CodeQuality] Handle crash on return array constant on ExplicitReturn…

…NullRector (#6458) * [CodeQuality] Handle crash on return array constant on ExplicitReturnNullRector * fix
rectorphp · Nov 20, 2024 · e16c1d5 · e16c1d5
1 parent 28df807
commit e16c1d5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...ts/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/array_constant.php.inc b/...ts/CodeQuality/Rector/ClassMethod/ExplicitReturnNullRector/Fixture/array_constant.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector\Fixture;
+
+class SkipReturnArrayConstant
+{
+    public static function provideClearSession()
+    {
+        return [
+            ['Default', ['Foo' => ['foo' => 'fooValue']]],
+            [null, []],
+        ];
+    }
+}
diff --git a/rules/TypeDeclaration/TypeNormalizer.php b/rules/TypeDeclaration/TypeNormalizer.php
@@ -84,9 +84,9 @@ public function normalizeArrayTypeAndArrayNever(Type $type): Type
                 assert($traversedType instanceof ConstantArrayType);
 
                 // not sure why, but with direct new node everything gets nulled to MixedType
-                $this->privatesAccessor->setPrivateProperty($traversedType, 'keyType', new MixedType());
+                $this->privatesAccessor->setPrivateProperty($traversedType, 'keyTypes', [new MixedType()]);
 
-                $this->privatesAccessor->setPrivateProperty($traversedType, 'itemType', new MixedType());
+                $this->privatesAccessor->setPrivateProperty($traversedType, 'valueTypes', [new MixedType()]);
 
                 return $traversedType;
             }