Check generic type of ArrayAccess in hasOffsetValueType

Author: nishimura

src/Type/ObjectType.php

@@ -596,8 +596,16 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 			return TrinaryLogic::createNo();
 		}
 
+		if ($this->isInstanceOf(\ArrayAccess::class)->yes()) {
+			$tKey = GenericTypeVariableResolver::getType($this, \ArrayAccess::class, 'TKey');
+			if ($tKey !== null && $tKey->isSuperTypeOf($offsetType)->no()) {
+				return TrinaryLogic::createNo();
+			}
+
+			return TrinaryLogic::createMaybe();
+		}
+
 		return $this->isExtraOffsetAccessibleClass()
-			->or($this->isInstanceOf(\ArrayAccess::class))
 			->and(TrinaryLogic::createMaybe());
 	}
 

tests/PHPStan/Type/ObjectTypeTest.php

@@ -431,4 +431,69 @@ public function testGetClassReflectionOfGenericClass(): void
 		$this->assertSame('Traversable<mixed,mixed>', $classReflection->getDisplayName());
 	}
 
+	public function dataHasOffsetValueType(): array
+	{
+		return [
+			[
+				new ObjectType(\stdClass::class),
+				new IntegerType(),
+				TrinaryLogic::createNo(),
+			],
+			[
+				new ObjectType(\ArrayAccess::class),
+				new IntegerType(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new IntegerType(), new MixedType()]),
+				new IntegerType(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new IntegerType(), new MixedType()]),
+				new MixedType(),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new IntegerType(), new MixedType()]),
+				new StringType(),
+				TrinaryLogic::createNo(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new ObjectType(\DateTimeInterface::class), new MixedType()]),
+				new ObjectType(\DateTime::class),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new ObjectType(\DateTime::class), new MixedType()]),
+				new ObjectType(\DateTimeInterface::class),
+				TrinaryLogic::createMaybe(),
+			],
+			[
+				new GenericObjectType(\ArrayAccess::class, [new ObjectType(\DateTime::class), new MixedType()]),
+				new ObjectType(\stdClass::class),
+				TrinaryLogic::createNo(),
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataHasOffsetValueType
+	 * @param \PHPStan\Type\ObjectType $type
+	 * @param Type $offsetType
+	 * @param TrinaryLogic $expectedResult
+	 */
+	public function testHasOffsetValueType(
+		ObjectType $type,
+		Type $offsetType,
+		TrinaryLogic $expectedResult
+	): void
+	{
+		$this->assertSame(
+			$expectedResult->describe(),
+			$type->hasOffsetValueType($offsetType)->describe(),
+			sprintf('%s -> accepts(%s)', $type->describe(VerbosityLevel::precise()), $offsetType->describe(VerbosityLevel::precise()))
+		);
+	}
+
 }