Fix hasOffsetValueType for arrays

Author: VincentLanglet

src/Type/ArrayType.php

@@ -8,6 +8,7 @@
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\Reflection\ClassMemberAccessAnswerer;
 use PHPStan\Reflection\TrivialParametersAcceptor;
+use PHPStan\Rules\Arrays\AllowedArrayKeysTypes;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryArrayListType;
@@ -267,10 +268,8 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		$offsetType = $offsetType->toArrayKey();
-		if ($offsetType instanceof ErrorType) {
-			return TrinaryLogic::createNo();
-		}
+		$allowedArrayKeys = AllowedArrayKeysTypes::getType();
+		$offsetType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
 
 		if ($this->getKeyType()->isSuperTypeOf($offsetType)->no()
 			&& ($offsetType->isString()->no() || !$offsetType->isConstantScalarValue()->no())

src/Type/Constant/ConstantArrayType.php

@@ -19,6 +19,7 @@
 use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\PhpVersionStaticAccessor;
 use PHPStan\Reflection\TrivialParametersAcceptor;
+use PHPStan\Rules\Arrays\AllowedArrayKeysTypes;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\AcceptsResult;
@@ -581,17 +582,14 @@ public function findTypeAndMethodNames(): array
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		$offsetArrayKeyType = $offsetType->toArrayKey();
+		$allowedArrayKeys = AllowedArrayKeysTypes::getType();
+		$offsetArrayKeyType = TypeCombinator::intersect($allowedArrayKeys, $offsetType)->toArrayKey();
 
 		return $this->recursiveHasOffsetValueType($offsetArrayKeyType);
 	}
 
 	private function recursiveHasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		if ($offsetType instanceof ErrorType) {
-			return TrinaryLogic::createNo();
-		}
-
 		if ($offsetType instanceof UnionType) {
 			$results = [];
 			foreach ($offsetType->getTypes() as $innerType) {

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -1801,7 +1801,7 @@ public static function dataProperties(): array
 				'$this->resource',
 			],
 			[
-				'*ERROR*',
+				'mixed',
 				'$this->yetAnotherAnotherMixedParameter',
 			],
 			[

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -193,10 +193,6 @@ public function testStrings(): void
 				'Offset 12.34 might not exist on array|string.',
 				28,
 			],
-			[
-				'Offset int|object might not exist on array|string.',
-				32,
-			],
 		]);
 	}
 
@@ -932,10 +928,6 @@ public function testBugObject(): void
 				'Offset int|object does not exist on array{baz: 21}|array{foo: 17, bar: 19}.',
 				12,
 			],
-			[
-				'Offset object does not exist on array<string, int>.',
-				21,
-			],
 		]);
 	}
 

tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php

@@ -326,6 +326,11 @@ public function testBug10610(): void
 		$this->analyse([__DIR__ . '/data/bug-10610.php'], []);
 	}
 
+	public function testBugDoctrine(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-doctrine.php'], []);
+	}
+
 	#[RequiresPhp('>= 8.4')]
 	public function testBug12553(): void
 	{

tests/PHPStan/Rules/Variables/data/bug-doctrine.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace BugDoctrine;
+
+class HelloWorld
+{
+	public function sayHello(string|array $a, array $b): void
+	{
+			$b[$a] ?? 2;
+	}
+}