Avoid calling describe on ConstantArrayTypes

phpstan · Apr 3, 2022 · 2c9273e · 2c9273e
1 parent 6b6f310
commit 2c9273e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -3088,7 +3088,7 @@ protected function getTypeFromArrayDimFetch(
 			throw new ShouldNotHappenException();
 		}
 
-		if ((new ObjectType(ArrayAccess::class))->isSuperTypeOf($offsetAccessibleType)->yes()) {
+		if (!$offsetAccessibleType->isArray()->yes() && (new ObjectType(ArrayAccess::class))->isSuperTypeOf($offsetAccessibleType)->yes()) {
 			return $this->getType(
 				new MethodCall(
 					$arrayDimFetch->var,

diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -3306,7 +3306,7 @@ private function processAssignVar(
 				$valueToWrite = $offsetValueType->setOffsetValueType($offsetType, $valueToWrite, $i === 0);
 			}
 
-			if (!(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {
+			if ($varType->isArray()->yes() || !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->yes()) {
 				if ($var instanceof Variable && is_string($var->name)) {
 					$scope = $scope->assignVariable($var->name, $valueToWrite);
 				} else {
@@ -3334,7 +3334,7 @@ private function processAssignVar(
 				}
 			}
 
-			if (!(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
+			if (!$varType->isArray()->yes() && !(new ObjectType(ArrayAccess::class))->isSuperTypeOf($varType)->no()) {
 				$throwPoints = array_merge($throwPoints, $this->processExprNode(
 					new MethodCall($var, 'offsetSet'),
 					$scope,