Fix inferring template types on arrays

Closes phpstan/phpstan#4209
phpstan · Feb 19, 2021 · 19e3cde · 19e3cde
1 parent 6d228a5
commit 19e3cde
Show file tree

Hide file tree

Showing 7 changed files with 156 additions and 14 deletions.
diff --git a/src/Dependency/NodeDependencies.php b/src/Dependency/NodeDependencies.php
@@ -7,7 +7,7 @@
 use PHPStan\Reflection\ReflectionWithFilename;
 
 /**
- * @implements \IteratorAggregate<int, ReflectionWithFilename>
+ * @implements \IteratorAggregate<int|string, ReflectionWithFilename>
  */
 class NodeDependencies implements IteratorAggregate
 {

diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -340,13 +340,9 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			return $typeMap;
 		}
 
-		if (
-			$receivedType instanceof ArrayType
-			&& !$this->getKeyType()->isSuperTypeOf($receivedType->getKeyType())->no()
-			&& !$this->getItemType()->isSuperTypeOf($receivedType->getItemType())->no()
-		) {
-			$keyTypeMap = $this->getKeyType()->inferTemplateTypes($receivedType->getKeyType());
-			$itemTypeMap = $this->getItemType()->inferTemplateTypes($receivedType->getItemType());
+		if ($receivedType->isArray()->yes()) {
+			$keyTypeMap = $this->getIterableKeyType()->inferTemplateTypes($receivedType->getIterableKeyType());
+			$itemTypeMap = $this->getIterableValueType()->inferTemplateTypes($receivedType->getIterableValueType());
 
 			return $keyTypeMap->union($itemTypeMap);
 		}

diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -753,22 +753,21 @@ public function inferTemplateTypes(Type $receivedType): TemplateTypeMap
 			return $receivedType->inferTemplateTypesOn($this);
 		}
 
-		if ($receivedType instanceof self && !$this->isSuperTypeOf($receivedType)->no()) {
+		if ($receivedType instanceof self) {
 			$typeMap = TemplateTypeMap::createEmpty();
 			foreach ($this->keyTypes as $i => $keyType) {
 				$valueType = $this->valueTypes[$i];
+				if ($receivedType->hasOffsetValueType($keyType)->no()) {
+					continue;
+				}
 				$receivedValueType = $receivedType->getOffsetValueType($keyType);
 				$typeMap = $typeMap->union($valueType->inferTemplateTypes($receivedValueType));
 			}
 
 			return $typeMap;
 		}
 
-		if ($receivedType instanceof ArrayType) {
-			return parent::inferTemplateTypes($receivedType);
-		}
-
-		return TemplateTypeMap::createEmpty();
+		return parent::inferTemplateTypes($receivedType);
 	}
 
 	public function getReferencedTemplateTypes(TemplateTypeVariance $positionVariance): array

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10842,6 +10842,16 @@ public function dataBug4557(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4557.php');
 	}
 
+	public function dataBug4209(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4209.php');
+	}
+
+	public function dataBug4209Two(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4209-2.php');
+	}
+
 	/**
 	 * @param string $file
 	 * @return array<string, mixed[]>
@@ -11072,6 +11082,8 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBug2927
 	 * @dataProvider dataBug4558
 	 * @dataProvider dataBug4557
+	 * @dataProvider dataBug4209
+	 * @dataProvider dataBug4209Two
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args

diff --git a/tests/PHPStan/Analyser/data/bug-4209-2.php b/tests/PHPStan/Analyser/data/bug-4209-2.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Bug4209Two;
+
+use function PHPStan\Analyser\assertType;
+
+class Customer
+{
+	public function getName(): string { return 'customer'; }
+}
+
+/**
+ * @template T
+ */
+interface Link {
+	/**
+	 * @return T
+	 */
+	public function getItem();
+}
+
+/**
+ * @implements Link<Customer>
+ */
+class CustomerLink implements Link
+{
+	/**
+	 * @var Customer
+	 */
+	public $item;
+
+	/**
+	 * @param Customer $item
+	 */
+	public function __construct($item) {
+		$this->item = $item;
+	}
+
+	/**
+	 * @return Customer
+	 */
+	public function getItem()
+	{
+		return $this->item;
+	}
+}
+
+/**
+ * @return CustomerLink[]
+ */
+function get_links(): array {
+	return [new CustomerLink(new Customer())];
+}
+
+/**
+ * @template T
+ * @param Link<T>[] $links
+ * @return T
+ */
+function process_customers(array $links) {
+	// no-op
+}
+
+class Runner {
+	public function run(): void
+	{
+		assertType('Bug4209Two\Customer', process_customers(get_links()));
+	}
+}
diff --git a/tests/PHPStan/Analyser/data/bug-4209.php b/tests/PHPStan/Analyser/data/bug-4209.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Bug4209;
+
+use function PHPStan\Analyser\assertType;
+
+/**
+ * @template T
+ */
+class Link {
+	/**
+	 * @var T
+	 */
+	public $item;
+
+	/**
+	 * @param T $item
+	 */
+	public function __construct($item) {
+		$this->item = $item;
+	}
+}
+
+class Customer
+{
+	public function getName(): string { return 'customer'; }
+}
+
+/**
+ * @return Link<Customer>[]
+ */
+function get_links(): array {
+	return [new Link(new Customer())];
+}
+
+/**
+ * @template T
+ * @param Link<T>[] $links
+ * @return T
+ */
+function process_customers(array $links) {
+	// no-op
+}
+
+class Runner {
+	public function run(): void
+	{
+		assertType('Bug4209\Customer', process_customers(get_links()));
+	}
+}
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1826,4 +1826,20 @@ public function testBug4557(): void
 		$this->analyse([__DIR__ . '/../../Analyser/data/bug-4557.php'], []);
 	}
 
+	public function testBug4209(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-4209.php'], []);
+	}
+
+	public function testBug4209Two(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-4209-2.php'], []);
+	}
+
 }