Unified Type::equals()

ondrejmirtes · ondrejmirtes · commit 5593300ee6c0 · 2020-05-06T13:04:29.000+02:00
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -102,6 +102,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 	public function equals(Type $type): bool
 	{
 		return $type instanceof self
+			&& !$type instanceof ConstantArrayType
 			&& $this->getItemType()->equals($type->getItemType())
 			&& $this->keyType->equals($type->keyType);
 	}
diff --git a/src/Type/Generic/GenericObjectType.php b/src/Type/Generic/GenericObjectType.php
@@ -49,6 +49,30 @@ public function describe(VerbosityLevel $level): string
 		);
 	}
 
+	public function equals(Type $type): bool
+	{
+		if (!$type instanceof self) {
+			return false;
+		}
+
+		if (!parent::equals($type)) {
+			return false;
+		}
+
+		if (count($this->types) !== count($type->types)) {
+			return false;
+		}
+
+		foreach ($this->types as $i => $genericType) {
+			$otherGenericType = $type->types[$i];
+			if (!$genericType->equals($otherGenericType)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * @return string[]
 	 */
diff --git a/src/Type/Generic/TemplateMixedType.php b/src/Type/Generic/TemplateMixedType.php
@@ -75,7 +75,8 @@ public function equals(Type $type): bool
 	{
 		return $type instanceof self
 			&& $type->scope->equals($this->scope)
-			&& $type->name === $this->name;
+			&& $type->name === $this->name
+			&& parent::equals($type);
 	}
 
 	public function getBound(): Type
diff --git a/src/Type/Generic/TemplateObjectWithoutClassType.php b/src/Type/Generic/TemplateObjectWithoutClassType.php
@@ -149,7 +149,8 @@ public function equals(Type $type): bool
 	{
 		return $type instanceof self
 			&& $type->scope->equals($this->scope)
-			&& $type->name === $this->name;
+			&& $type->name === $this->name
+			&& parent::equals($type);
 	}
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLogic
diff --git a/src/Type/JustNullableTypeTrait.php b/src/Type/JustNullableTypeTrait.php
@@ -43,7 +43,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 
 	public function equals(Type $type): bool
 	{
-		return $type instanceof self;
+		return get_class($type) === self::class;
 	}
 
 	public function traverse(callable $cb): Type

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic`
`102`	`102`	`public function equals(Type $type): bool`
`103`	`103`	`{`
`104`	`104`	`return $type instanceof self`
	`105`	`+ && !$type instanceof ConstantArrayType`
`105`	`106`	`&& $this->getItemType()->equals($type->getItemType())`
`106`	`107`	`&& $this->keyType->equals($type->keyType);`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ public function equals(Type $type): bool`
`75`	`75`	`{`
`76`	`76`	`return $type instanceof self`
`77`	`77`	`&& $type->scope->equals($this->scope)`
`78`		`- && $type->name === $this->name;`
	`78`	`+ && $type->name === $this->name`
	`79`	`+ && parent::equals($type);`
`79`	`80`	`}`
`80`	`81`
`81`	`82`	`public function getBound(): Type`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ public function equals(Type $type): bool`
`149`	`149`	`{`
`150`	`150`	`return $type instanceof self`
`151`	`151`	`&& $type->scope->equals($this->scope)`
`152`		`- && $type->name === $this->name;`
	`152`	`+ && $type->name === $this->name`
	`153`	`+ && parent::equals($type);`
`153`	`154`	`}`
`154`	`155`
`155`	`156`	`public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLogic`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function isSuperTypeOf(Type $type): TrinaryLogic`
`43`	`43`
`44`	`44`	`public function equals(Type $type): bool`
`45`	`45`	`{`
`46`		`- return $type instanceof self;`
	`46`	`+ return get_class($type) === self::class;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public function traverse(callable $cb): Type`