Fixed iterable<T> vs. empty constant array

ondrejmirtes · ondrejmirtes · commit 3b64b125eeff · 2020-03-17T15:07:05.000+01:00
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -57,6 +57,11 @@ public function __construct(array $keyTypes, array $valueTypes, int $nextAutoInd
 		$this->nextAutoIndex = $nextAutoIndex;
 	}
 
+	public function isEmpty(): bool
+	{
+		return count($this->keyTypes) === 0;
+	}
+
 	public function getNextAutoIndex(): int
 	{
 		return $this->nextAutoIndex;
diff --git a/src/Type/IterableType.php b/src/Type/IterableType.php
@@ -3,6 +3,7 @@
 namespace PHPStan\Type;
 
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeMap;
@@ -53,6 +54,9 @@ public function getReferencedClasses(): array
 
 	public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 	{
+		if ($type instanceof ConstantArrayType && $type->isEmpty()) {
+			return TrinaryLogic::createYes();
+		}
 		if ($type->isIterable()->yes()) {
 			return $this->getIterableValueType()->accepts($type->getIterableValueType(), $strictTypes)
 				->and($this->getIterableKeyType()->accepts($type->getIterableKeyType(), $strictTypes));
@@ -118,6 +122,10 @@ public function isSubTypeOf(Type $otherType): TrinaryLogic
 			$limit = TrinaryLogic::createMaybe();
 		}
 
+		if ($otherType instanceof ConstantArrayType && $otherType->isEmpty()) {
+			return TrinaryLogic::createMaybe();
+		}
+
 		return $limit->and(
 			$otherType->isIterable(),
 			$otherType->getIterableValueType()->isSuperTypeOf($this->itemType),
diff --git a/tests/PHPStan/Rules/Methods/data/returnTypes.php b/tests/PHPStan/Rules/Methods/data/returnTypes.php
@@ -1212,3 +1212,17 @@ public function key()
 	}
 
 }
+
+class Bug3072
+{
+
+	/**
+	 * @template T
+	 * @return iterable<T>
+	 */
+	public function getIterable(): iterable
+	{
+		return [];
+	}
+
+}
diff --git a/tests/PHPStan/Type/Constant/ConstantArrayTypeTest.php b/tests/PHPStan/Type/Constant/ConstantArrayTypeTest.php
@@ -182,6 +182,12 @@ public function dataIsSuperTypeOf(): iterable
 			new ArrayType(new MixedType(), new MixedType()),
 			TrinaryLogic::createMaybe(),
 		];
+
+		yield [
+			new ConstantArrayType([], []),
+			new IterableType(new MixedType(false), new MixedType(true)),
+			TrinaryLogic::createMaybe(),
+		];
 	}
 
 	/**
diff --git a/tests/PHPStan/Type/IterableTypeTest.php b/tests/PHPStan/Type/IterableTypeTest.php
@@ -6,6 +6,7 @@
 use PHPStan\Type\Accessory\HasMethodType;
 use PHPStan\Type\Accessory\HasPropertyType;
 use PHPStan\Type\Constant\ConstantArrayType;
+use PHPStan\Type\Generic\TemplateMixedType;
 use PHPStan\Type\Generic\TemplateTypeFactory;
 use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\Generic\TemplateTypeVariance;
@@ -46,6 +47,11 @@ public function dataIsSuperTypeOf(): array
 				new ObjectType('Iterator'),
 				TrinaryLogic::createMaybe(),
 			],
+			[
+				new IterableType(new MixedType(false), new MixedType(true)),
+				new ConstantArrayType([], []),
+				TrinaryLogic::createYes(),
+			],
 		];
 	}
 
@@ -299,4 +305,49 @@ public function testDescribe(Type $type, string $expect): void
 		$this->assertSame($expect, $result);
 	}
 
+	public function dataAccepts(): array
+	{
+		/** @var TemplateMixedType $t */
+		$t = TemplateTypeFactory::create(
+			TemplateTypeScope::createWithFunction('foo'),
+			'T',
+			null,
+			TemplateTypeVariance::createInvariant()
+		);
+		return [
+			[
+				new IterableType(
+					new MixedType(),
+					$t,
+				),
+				new ConstantArrayType([], []),
+				TrinaryLogic::createYes(),
+			],
+			[
+				new IterableType(
+					new MixedType(),
+					$t->toArgument()
+				),
+				new ConstantArrayType([], []),
+				TrinaryLogic::createYes(),
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataAccepts
+	 * @param IterableType $iterableType
+	 * @param Type $otherType
+	 * @param TrinaryLogic $expectedResult
+	 */
+	public function testAccepts(IterableType $iterableType, Type $otherType, TrinaryLogic $expectedResult): void
+	{
+		$actualResult = $iterableType->accepts($otherType, true);
+		$this->assertSame(
+			$expectedResult->describe(),
+			$actualResult->describe(),
+			sprintf('%s -> accepts(%s)', $iterableType->describe(VerbosityLevel::precise()), $otherType->describe(VerbosityLevel::precise()))
+		);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public function __construct(array $keyTypes, array $valueTypes, int $nextAutoInd`
`57`	`57`	`$this->nextAutoIndex = $nextAutoIndex;`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ public function isEmpty(): bool`
	`61`	`+ {`
	`62`	`+ return count($this->keyTypes) === 0;`
	`63`	`+ }`
	`64`	`+`
`60`	`65`	`public function getNextAutoIndex(): int`
`61`	`66`	`{`
`62`	`67`	`return $this->nextAutoIndex;`