TypeCombinator - fix segfault

phpstan · Oct 4, 2021 · ac5fe1b · ac5fe1b
1 parent ac6a102
commit ac5fe1b
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Generic;
 
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\CompoundType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -123,7 +122,7 @@ public function accepts(Type $type, bool $strictTypes): TrinaryLogic
 
 	public function isSuperTypeOf(Type $type): TrinaryLogic
 	{
-		if ($type instanceof CompoundType) {
+		if ($type instanceof self) {
 			return $type->isSubTypeOf($this);
 		}
 

diff --git a/tests/PHPStan/Analyser/data/instanceof.php b/tests/PHPStan/Analyser/data/instanceof.php
@@ -133,23 +133,23 @@ public function testExprInstanceof($subject, string $classString, $union, $inter
 			assertType('bool', $subject instanceof $objectT);
 		} else {
 			assertType('mixed~ObjectT of InstanceOfNamespace\BarInterface (method InstanceOfNamespace\Foo::testExprInstanceof(), argument)', $subject);
-			assertType('false', $subject instanceof $objectT);
+			assertType('bool', $subject instanceof $objectT); // can be false
 		}
 
 		if ($subject instanceof $objectTString) {
 			assertType('ObjectT of InstanceOfNamespace\BarInterface (method InstanceOfNamespace\Foo::testExprInstanceof(), argument)', $subject);
 			assertType('bool', $subject instanceof $objectTString);
 		} else {
 			assertType('mixed~ObjectT of InstanceOfNamespace\BarInterface (method InstanceOfNamespace\Foo::testExprInstanceof(), argument)', $subject);
-			assertType('false', $subject instanceof $objectTString);
+			assertType('bool', $subject instanceof $objectTString); // can be false
 		}
 
 		if ($subject instanceof $mixedTString) {
 			assertType('MixedT (method InstanceOfNamespace\Foo::testExprInstanceof(), argument)&object', $subject);
 			assertType('bool', $subject instanceof $mixedTString);
 		} else {
 			assertType('mixed~MixedT (method InstanceOfNamespace\Foo::testExprInstanceof(), argument)', $subject);
-			assertType('false', $subject instanceof $mixedTString);
+			assertType('bool', $subject instanceof $mixedTString); // can be false
 		}
 
 		if ($subject instanceof $string) {

diff --git a/tests/PHPStan/Rules/Methods/data/returnTypes.php b/tests/PHPStan/Rules/Methods/data/returnTypes.php
@@ -1184,7 +1184,7 @@ public function doBar(\DateTimeInterface $date): \DateTimeImmutable
 }
 
 /**
- * @template CollectionKey
+ * @template CollectionKey of array-key
  * @template CollectionValue
  * @implements \Iterator<CollectionKey, CollectionValue>
  */

diff --git a/tests/PHPStan/Type/TypeCombinatorTest.php b/tests/PHPStan/Type/TypeCombinatorTest.php
@@ -1822,6 +1822,39 @@ public function dataUnion(): array
 				UnionType::class,
 				'(T of bool|float|int|string (function doFoo(), parameter))|null',
 			],
+			[
+				[
+					new UnionType([
+						new IntersectionType([new ArrayType(new MixedType(), new MixedType())]),
+						IntegerRangeType::fromInterval(null, -1),
+						IntegerRangeType::fromInterval(1, null),
+					]),
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithClass('Foo'),
+						'TCode',
+						new UnionType([new ArrayType(new IntegerType(), new IntegerType()), new IntegerType()]),
+						TemplateTypeVariance::createInvariant()
+					),
+				],
+				UnionType::class,
+				'array|int<min, -1>|int<1, max>|(TCode of array<int, int>|int (class Foo, parameter))',
+			],
+			[
+				[
+					new UnionType([
+						new IntersectionType([new ArrayType(new MixedType(), new MixedType())]),
+						new CallableType(),
+					]),
+					TemplateTypeFactory::create(
+						TemplateTypeScope::createWithClass('Foo'),
+						'TCode',
+						new UnionType([new ArrayType(new IntegerType(), new IntegerType()), new IntegerType()]),
+						TemplateTypeVariance::createInvariant()
+					),
+				],
+				UnionType::class,
+				'array|(callable(): mixed)|(TCode of array<int, int>|int (class Foo, parameter))',
+			],
 		];
 	}