Fix UnionType description

phpstan · Jan 12, 2022 · d05a86b · d05a86b
1 parent e491256
commit d05a86b
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 14 deletions.
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -22,9 +22,11 @@
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\Generic\TemplateUnionType;
+use function array_key_exists;
 use function array_map;
 use function count;
 use function implode;
+use function md5;
 use function sprintf;
 use function strpos;
 
@@ -159,24 +161,49 @@ public function equals(Type $type): bool
 
 	public function describe(VerbosityLevel $level): string
 	{
-		$joinTypes = static function (array $types) use ($level): string {
+		$getTypeName = static function (Type $type, VerbosityLevel $level): string {
+			if ($type instanceof ClosureType || $type instanceof CallableType || $type instanceof TemplateUnionType) {
+				return sprintf('(%s)', $type->describe($level));
+			} elseif ($type instanceof IntersectionType) {
+				$intersectionDescription = $type->describe($level);
+				if (strpos($intersectionDescription, '&') !== false) {
+					return sprintf('(%s)', $type->describe($level));
+				}
+
+				return $intersectionDescription;
+			}
+
+			return $type->describe($level);
+		};
+		$joinTypes = static function (array $types) use ($getTypeName, $level): string {
 			$typeNames = [];
 			foreach ($types as $type) {
-				if ($type instanceof ClosureType || $type instanceof CallableType || $type instanceof TemplateUnionType) {
-					$typeNames[] = sprintf('(%s)', $type->describe($level));
-				} elseif ($type instanceof IntersectionType) {
-					$intersectionDescription = $type->describe($level);
-					if (strpos($intersectionDescription, '&') !== false) {
-						$typeNames[] = sprintf('(%s)', $type->describe($level));
-					} else {
-						$typeNames[] = $intersectionDescription;
-					}
-				} else {
-					$typeNames[] = $type->describe($level);
+				$typeName = $getTypeName($type, $level);
+				$typeNameHash = md5($typeName);
+				if (!$level->isTypeOnly()) {
+					$typeNames[$typeNameHash] = [$type, $typeName];
+					continue;
 				}
+
+				if (!array_key_exists($typeNameHash, $typeNames)) {
+					$typeNames[$typeNameHash] = [$type, $typeName];
+					continue;
+				}
+
+				[$otherType] = $typeNames[$typeNameHash];
+				unset($typeNames[$typeNameHash]);
+
+				$newOtherTypeName = $getTypeName($otherType, VerbosityLevel::value());
+				$newOtherTypeNameHash = md5($newOtherTypeName);
+
+				$typeNames[$newOtherTypeNameHash] = [$otherType, $newOtherTypeName];
+
+				$typeName = $getTypeName($type, VerbosityLevel::value());
+				$typeNameHash = md5($typeName);
+				$typeNames[$typeNameHash] = [$type, $typeName];
 			}
 
-			return implode('|', $typeNames);
+			return implode('|', array_map(static fn (array $types): string => $types[1], $typeNames));
 		};
 
 		return $level->handle(

diff --git a/src/Type/VerbosityLevel.php b/src/Type/VerbosityLevel.php
@@ -55,6 +55,11 @@ public static function cache(): self
 		return self::create(self::CACHE);
 	}
 
+	public function isTypeOnly(): bool
+	{
+		return $this->value === self::TYPE_ONLY;
+	}
+
 	/** @api */
 	public static function getRecommendedLevelByType(Type $acceptingType, ?Type $acceptedType = null): self
 	{

diff --git a/tests/PHPStan/Type/UnionTypeTest.php b/tests/PHPStan/Type/UnionTypeTest.php
@@ -680,6 +680,14 @@ public function dataDescribe(): array
 				'int|numeric-string',
 				'int|string',
 			],
+			[
+				TypeCombinator::union(
+					IntegerRangeType::fromInterval(0, 4),
+					IntegerRangeType::fromInterval(6, 10),
+				),
+				'int<0, 4>|int<6, 10>',
+				'int<0, 4>|int<6, 10>',
+			],
 		];
 	}
 
@@ -692,7 +700,7 @@ public function testDescribe(
 		string $expectedTypeOnlyDescription,
 	): void
 	{
-		$this->assertSame($expectedValueDescription, $type->describe(VerbosityLevel::precise()));
+		$this->assertSame($expectedValueDescription, $type->describe(VerbosityLevel::value()));
 		$this->assertSame($expectedTypeOnlyDescription, $type->describe(VerbosityLevel::typeOnly()));
 	}