More unification

ondrejmirtes · ondrejmirtes · commit 46e3ecd3a053 · 2021-02-22T10:38:45.000+01:00
diff --git a/src/Type/Generic/TemplateObjectWithoutClassType.php b/src/Type/Generic/TemplateObjectWithoutClassType.php
@@ -155,8 +155,12 @@ public function isSubTypeOf(Type $type): TrinaryLogic
 			return TrinaryLogic::createYes();
 		}
 
-		return $type->getBound()->isSuperTypeOf($this->getBound())
-			->and(TrinaryLogic::createMaybe());
+		if ($type->getBound()->isSuperTypeOf($this->getBound())->no() &&
+			$this->getBound()->isSuperTypeOf($type->getBound())->no()) {
+			return TrinaryLogic::createNo();
+		}
+
+		return TrinaryLogic::createMaybe();
 	}
 
 	public function inferTemplateTypes(Type $receivedType): TemplateTypeMap

Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,12 @@ public function isSubTypeOf(Type $type): TrinaryLogic`
`155`	`155`	`return TrinaryLogic::createYes();`
`156`	`156`	`}`
`157`	`157`
`158`		`- return $type->getBound()->isSuperTypeOf($this->getBound())`
`159`		`- ->and(TrinaryLogic::createMaybe());`
	`158`	`+ if ($type->getBound()->isSuperTypeOf($this->getBound())->no() &&`
	`159`	`+ $this->getBound()->isSuperTypeOf($type->getBound())->no()) {`
	`160`	`+ return TrinaryLogic::createNo();`
	`161`	`+ }`
	`162`	`+`
	`163`	`+ return TrinaryLogic::createMaybe();`
`160`	`164`	`}`
`161`	`165`
`162`	`166`	`public function inferTemplateTypes(Type $receivedType): TemplateTypeMap`