UnionType - do not put parentheses around IntersectionType if parts of it are hidden

ondrejmirtes · ondrejmirtes · commit fd458855744f · 2020-08-25T17:02:21.000+02:00
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -133,8 +133,15 @@ public function describe(VerbosityLevel $level): string
 		$joinTypes = static function (array $types) use ($level): string {
 			$typeNames = [];
 			foreach ($types as $type) {
-				if ($type instanceof IntersectionType || $type instanceof ClosureType || $type instanceof CallableType) {
+				if ($type instanceof ClosureType || $type instanceof CallableType) {
 					$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);
 				}
diff --git a/tests/PHPStan/Type/UnionTypeTest.php b/tests/PHPStan/Type/UnionTypeTest.php
@@ -5,6 +5,7 @@
 use PHPStan\Reflection\Native\NativeParameterReflection;
 use PHPStan\Reflection\PassedByReference;
 use PHPStan\TrinaryLogic;
+use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantFloatType;
@@ -576,6 +577,17 @@ public function dataDescribe(): array
 				'array()|array(\'foooo\' => \'barrr\')',
 				'array<string, string>',
 			],
+			[
+				TypeCombinator::union(
+					new IntegerType(),
+					new IntersectionType([
+						new StringType(),
+						new AccessoryNumericStringType(),
+					]),
+				),
+				'int|(string&numeric)',
+				'int|string',
+			],
 		];
 	}
 
