Fix substracted union type describe

mvorisek · web-flow · commit 18c75a293ed8 · 2024-09-22T11:26:05.000+02:00
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -447,15 +447,19 @@ public function describe(VerbosityLevel $level): string
 			function () use ($level): string {
 				$description = 'mixed';
 				if ($this->subtractedType !== null) {
-					$description .= sprintf('~%s', $this->subtractedType->describe($level));
+					$description .= $this->subtractedType instanceof UnionType
+						? sprintf('~(%s)', $this->subtractedType->describe($level))
+						: sprintf('~%s', $this->subtractedType->describe($level));
 				}
 
 				return $description;
 			},
 			function () use ($level): string {
 				$description = 'mixed';
 				if ($this->subtractedType !== null) {
-					$description .= sprintf('~%s', $this->subtractedType->describe($level));
+					$description .= $this->subtractedType instanceof UnionType
+						? sprintf('~(%s)', $this->subtractedType->describe($level))
+						: sprintf('~%s', $this->subtractedType->describe($level));
 				}
 
 				if ($this->isExplicitMixed) {
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -487,7 +487,9 @@ public function describe(VerbosityLevel $level): string
 		$preciseWithSubtracted = function () use ($level): string {
 			$description = $this->className;
 			if ($this->subtractedType !== null) {
-				$description .= sprintf('~%s', $this->subtractedType->describe($level));
+				$description .= $this->subtractedType instanceof UnionType
+					? sprintf('~(%s)', $this->subtractedType->describe($level))
+					: sprintf('~%s', $this->subtractedType->describe($level));
 			}
 
 			return $description;
@@ -538,7 +540,9 @@ private function describeCache(): string
 		}
 
 		if ($this->subtractedType !== null) {
-			$description .= sprintf('~%s', $this->subtractedType->describe(VerbosityLevel::cache()));
+			$description .= $this->subtractedType instanceof UnionType
+				? sprintf('~(%s)', $this->subtractedType->describe(VerbosityLevel::cache()))
+				: sprintf('~%s', $this->subtractedType->describe(VerbosityLevel::cache()));
 		}
 
 		$reflection = $this->classReflection;
diff --git a/src/Type/ObjectWithoutClassType.php b/src/Type/ObjectWithoutClassType.php
@@ -132,7 +132,9 @@ public function describe(VerbosityLevel $level): string
 			function () use ($level): string {
 				$description = 'object';
 				if ($this->subtractedType !== null) {
-					$description .= sprintf('~%s', $this->subtractedType->describe($level));
+					$description .= $this->subtractedType instanceof UnionType
+						? sprintf('~(%s)', $this->subtractedType->describe($level))
+						: sprintf('~%s', $this->subtractedType->describe($level));
 				}
 
 				return $description;
diff --git a/tests/PHPStan/Analyser/TypeSpecifierTest.php b/tests/PHPStan/Analyser/TypeSpecifierTest.php
@@ -44,7 +44,7 @@ class TypeSpecifierTest extends PHPStanTestCase
 {
 
 	private const FALSEY_TYPE_DESCRIPTION = '0|0.0|\'\'|\'0\'|array{}|false|null';
-	private const TRUTHY_TYPE_DESCRIPTION = 'mixed~' . self::FALSEY_TYPE_DESCRIPTION;
+	private const TRUTHY_TYPE_DESCRIPTION = 'mixed~(' . self::FALSEY_TYPE_DESCRIPTION . ')';
 	private const SURE_NOT_FALSEY = '~' . self::FALSEY_TYPE_DESCRIPTION;
 	private const SURE_NOT_TRUTHY = '~' . self::TRUTHY_TYPE_DESCRIPTION;
 
@@ -819,10 +819,10 @@ public function dataCondition(): iterable
 					new LNumber(3),
 				),
 				[
-					'$n' => 'mixed~int<3, max>|true',
+					'$n' => 'mixed~(int<3, max>|true)',
 				],
 				[
-					'$n' => 'mixed~0.0|int<min, 2>|false|null',
+					'$n' => 'mixed~(0.0|int<min, 2>|false|null)',
 				],
 			],
 			[
@@ -831,10 +831,10 @@ public function dataCondition(): iterable
 					new LNumber(PHP_INT_MIN),
 				),
 				[
-					'$n' => 'mixed~int<' . PHP_INT_MIN . ', max>|true',
+					'$n' => 'mixed~(int<' . PHP_INT_MIN . ', max>|true)',
 				],
 				[
-					'$n' => 'mixed~0.0|false|null',
+					'$n' => 'mixed~(0.0|false|null)',
 				],
 			],
 			[
@@ -843,7 +843,7 @@ public function dataCondition(): iterable
 					new LNumber(PHP_INT_MAX),
 				),
 				[
-					'$n' => 'mixed~0.0|bool|int<min, ' . PHP_INT_MAX . '>|null',
+					'$n' => 'mixed~(0.0|bool|int<min, ' . PHP_INT_MAX . '>|null)',
 				],
 				[
 					'$n' => 'mixed',
@@ -858,7 +858,7 @@ public function dataCondition(): iterable
 					'$n' => 'mixed~int<' . (PHP_INT_MIN + 1) . ', max>',
 				],
 				[
-					'$n' => 'mixed~0.0|bool|int<min, ' . PHP_INT_MIN . '>|null',
+					'$n' => 'mixed~(0.0|bool|int<min, ' . PHP_INT_MIN . '>|null)',
 				],
 			],
 			[
@@ -867,10 +867,10 @@ public function dataCondition(): iterable
 					new LNumber(PHP_INT_MAX),
 				),
 				[
-					'$n' => 'mixed~0.0|int<min, ' . (PHP_INT_MAX - 1) . '>|false|null',
+					'$n' => 'mixed~(0.0|int<min, ' . (PHP_INT_MAX - 1) . '>|false|null)',
 				],
 				[
-					'$n' => 'mixed~int<' . PHP_INT_MAX . ', max>|true',
+					'$n' => 'mixed~(int<' . PHP_INT_MAX . ', max>|true)',
 				],
 			],
 			[
@@ -885,10 +885,10 @@ public function dataCondition(): iterable
 					),
 				),
 				[
-					'$n' => 'mixed~0.0|int<min, 2>|int<6, max>|false|null',
+					'$n' => 'mixed~(0.0|int<min, 2>|int<6, max>|false|null)',
 				],
 				[
-					'$n' => 'mixed~int<3, 5>|true',
+					'$n' => 'mixed~(int<3, 5>|true)',
 				],
 			],
 			[
@@ -1250,7 +1250,7 @@ public function dataCondition(): iterable
 				),
 				[
 					'$foo' => 'non-empty-array',
-					'count($foo)' => 'mixed~0.0|int<min, 1>|false|null',
+					'count($foo)' => 'mixed~(0.0|int<min, 1>|false|null)',
 				],
 				[],
 			],
diff --git a/tests/PHPStan/Analyser/nsrt/assert-empty.php b/tests/PHPStan/Analyser/nsrt/assert-empty.php
@@ -25,5 +25,5 @@ function ($var) {
 
 function ($var) {
 	assertNotEmpty($var);
-	assertType("mixed~0|0.0|''|'0'|array{}|false|null", $var);
+	assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $var);
 };
diff --git a/tests/PHPStan/Analyser/nsrt/bug-10189.php b/tests/PHPStan/Analyser/nsrt/bug-10189.php
@@ -20,7 +20,7 @@ function file_managed_file_save_upload(): array {
 	}
 	assertType('non-empty-array|Bug10189\SomeInterface', $files);
 	$files = array_filter($files);
-	assertType("array<mixed~0|0.0|''|'0'|array{}|false|null>", $files);
+	assertType("array<mixed~(0|0.0|''|'0'|array{}|false|null)>", $files);
 
 	return empty($files) ? [] : [1,2];
 }
diff --git a/tests/PHPStan/Analyser/nsrt/bug-3991.php b/tests/PHPStan/Analyser/nsrt/bug-3991.php
@@ -26,7 +26,7 @@ public static function email($config = null)
 			assertType('array{}|null', $config);
 			$config = new \stdClass();
 		} elseif (! (is_array($config) || $config instanceof \stdClass)) {
-			assertNativeType('mixed~0|0.0|\'\'|\'0\'|array{}|stdClass|false|null', $config);
+			assertNativeType('mixed~(0|0.0|\'\'|\'0\'|array{}|stdClass|false|null)', $config);
 			assertType('*NEVER*', $config);
 		}
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-3993.php b/tests/PHPStan/Analyser/nsrt/bug-3993.php
@@ -13,7 +13,7 @@ public function doFoo($arguments)
 			return;
 		}
 
-		assertType('mixed~array{}|null', $arguments);
+		assertType('mixed~(array{}|null)', $arguments);
 
 		array_shift($arguments);
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-4117.php b/tests/PHPStan/Analyser/nsrt/bug-4117.php
@@ -32,7 +32,7 @@ public function broken(int $key)
 		$item = $this->items[$key] ?? null;
 		assertType('T of mixed~null (class Bug4117Types\GenericList, argument)|null', $item);
 		if ($item) {
-			assertType("T of mixed~0|0.0|''|'0'|array{}|false|null (class Bug4117Types\GenericList, argument)", $item);
+			assertType("T of mixed~(0|0.0|''|'0'|array{}|false|null) (class Bug4117Types\GenericList, argument)", $item);
 		} else {
 			assertType("(array{}&T of mixed~null (class Bug4117Types\GenericList, argument))|(0.0&T of mixed~null (class Bug4117Types\GenericList, argument))|(0&T of mixed~null (class Bug4117Types\GenericList, argument))|(''&T of mixed~null (class Bug4117Types\GenericList, argument))|('0'&T of mixed~null (class Bug4117Types\GenericList, argument))|(T of mixed~null (class Bug4117Types\GenericList, argument)&false)|null", $item);
 		}
diff --git a/tests/PHPStan/Analyser/nsrt/bug-7176.php b/tests/PHPStan/Analyser/nsrt/bug-7176.php
@@ -25,7 +25,7 @@ function test(Suit $x): string {
 		assertType('Bug7176Types\Suit::Spades', $x);
 		return 'DOES NOT WORK';
 	}
-	assertType('Bug7176Types\Suit~Bug7176Types\Suit::Clubs|Bug7176Types\Suit::Spades', $x);
+	assertType('Bug7176Types\Suit~(Bug7176Types\Suit::Clubs|Bug7176Types\Suit::Spades)', $x);
 
 	return match ($x) {
 		Suit::Hearts => 'a',
diff --git a/tests/PHPStan/Analyser/nsrt/bug-pr-339.php b/tests/PHPStan/Analyser/nsrt/bug-pr-339.php
@@ -17,14 +17,14 @@
 	assertType('mixed', $a);
 	assertType('mixed', $c);
 	if ($a) {
-		assertType("mixed~0|0.0|''|'0'|array{}|false|null", $a);
+		assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $a);
 		assertType('mixed', $c);
 		assertVariableCertainty(TrinaryLogic::createYes(), $a);
 	}
 
 	if ($c) {
 		assertType('mixed', $a);
-		assertType("mixed~0|0.0|''|'0'|array{}|false|null", $c);
+		assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $c);
 		assertVariableCertainty(TrinaryLogic::createYes(), $c);
 	}
 } else {
diff --git a/tests/PHPStan/Analyser/nsrt/callsite-cast-narrowing.php b/tests/PHPStan/Analyser/nsrt/callsite-cast-narrowing.php
@@ -15,7 +15,7 @@ public function sayHello($mixed, int $int, string $string, $numericString, $nonE
 		if (ctype_digit((string) $mixed)) {
 			assertType('int<0, max>|numeric-string|true', $mixed);
 		} else {
-			assertType('mixed~int<0, max>|numeric-string|true', $mixed);
+			assertType('mixed~(int<0, max>|numeric-string|true)', $mixed);
 		}
 		assertType('mixed', $mixed);
 
diff --git a/tests/PHPStan/Analyser/nsrt/composer-array-bug.php b/tests/PHPStan/Analyser/nsrt/composer-array-bug.php
@@ -51,7 +51,7 @@ public function doFoo(): void
 				unset($this->config['authors']);
 				assertType("array<mixed~'authors', mixed>", $this->config);
 			} else {
-				assertType("array&hasOffsetValue('authors', mixed~0|0.0|''|'0'|array{}|false|null)", $this->config);
+				assertType("array&hasOffsetValue('authors', mixed~(0|0.0|''|'0'|array{}|false|null))", $this->config);
 			}
 
 			assertType('array', $this->config);
diff --git a/tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php b/tests/PHPStan/Analyser/nsrt/composer-non-empty-array-after-unset.php
@@ -13,7 +13,7 @@ class Foo
 	public function doFoo()
 	{
 		if (!empty($this->config['authors'])) {
-			assertType("mixed~0|0.0|''|'0'|array{}|false|null", $this->config['authors']);
+			assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $this->config['authors']);
 			foreach ($this->config['authors'] as $key => $author) {
 				assertType("mixed", $this->config['authors']);
 				if (!is_array($author)) {
diff --git a/tests/PHPStan/Analyser/nsrt/ctype-digit.php b/tests/PHPStan/Analyser/nsrt/ctype-digit.php
@@ -20,14 +20,14 @@ public function foo(mixed $foo): void
 		if (is_int($foo) && ctype_digit($foo)) {
 			assertType('int<48, 57>|int<256, max>', $foo);
 		} else {
-			assertType('mixed~int<48, 57>|int<256, max>', $foo);
+			assertType('mixed~(int<48, 57>|int<256, max>)', $foo);
 		}
 
 		if (ctype_digit($foo)) {
 			assertType('int<48, 57>|int<256, max>|numeric-string', $foo);
 			return;
 		}
 
-		assertType('mixed~int<48, 57>|int<256, max>', $foo); // not all numeric strings are covered by ctype_digit
+		assertType('mixed~(int<48, 57>|int<256, max>)', $foo); // not all numeric strings are covered by ctype_digit
 	}
 }
diff --git a/tests/PHPStan/Analyser/nsrt/more-types.php b/tests/PHPStan/Analyser/nsrt/more-types.php
@@ -38,7 +38,7 @@ public function doFoo(
 		assertType('literal-string&non-empty-string', $nonEmptyLiteralString);
 		assertType('float|int<min, -1>|int<1, max>|non-falsy-string|true', $nonEmptyScalar);
 		assertType("0|0.0|''|'0'|false", $emptyScalar);
-		assertType("mixed~0|0.0|''|'0'|array{}|false|null", $nonEmptyMixed);
+		assertType("mixed~(0|0.0|''|'0'|array{}|false|null)", $nonEmptyMixed);
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/nsrt/this-subtractable.php b/tests/PHPStan/Analyser/nsrt/this-subtractable.php
@@ -12,7 +12,7 @@ public function doFoo()
 		assertType('$this(ThisSubtractable\Foo)', $this);
 
 		if (!$this instanceof Bar && !$this instanceof Baz) {
-			assertType('$this(ThisSubtractable\Foo~ThisSubtractable\Bar|ThisSubtractable\Baz)', $this);
+			assertType('$this(ThisSubtractable\Foo~(ThisSubtractable\Bar|ThisSubtractable\Baz))', $this);
 		} else {
 			assertType('($this(ThisSubtractable\Foo)&ThisSubtractable\Bar)|($this(ThisSubtractable\Foo)&ThisSubtractable\Baz)', $this);
 		}
@@ -26,7 +26,7 @@ public function doBar()
 		assertType('static(ThisSubtractable\Foo)', $s);
 
 		if (!$s instanceof Bar && !$s instanceof Baz) {
-			assertType('static(ThisSubtractable\Foo~ThisSubtractable\Bar|ThisSubtractable\Baz)', $s);
+			assertType('static(ThisSubtractable\Foo~(ThisSubtractable\Bar|ThisSubtractable\Baz))', $s);
 		} else {
 			assertType('(static(ThisSubtractable\Foo)&ThisSubtractable\Bar)|(static(ThisSubtractable\Foo)&ThisSubtractable\Baz)', $s);
 		}
@@ -52,7 +52,7 @@ public function doBazz(self $s)
 		assertType('ThisSubtractable\Foo', $s);
 
 		if (!$s instanceof Bar && !$s instanceof Baz) {
-			assertType('ThisSubtractable\Foo~ThisSubtractable\Bar|ThisSubtractable\Baz', $s);
+			assertType('ThisSubtractable\Foo~(ThisSubtractable\Bar|ThisSubtractable\Baz)', $s);
 		} else {
 			assertType('ThisSubtractable\Bar|ThisSubtractable\Baz', $s);
 		}
@@ -70,12 +70,12 @@ public function doBazzz(self $s)
 		assertType('ThisSubtractable\Foo&hasMethod(test123)', $s);
 
 		if (!$s instanceof Bar && !$s instanceof Baz) {
-			assertType('ThisSubtractable\Foo~ThisSubtractable\Bar|ThisSubtractable\Baz&hasMethod(test123)', $s);
+			assertType('ThisSubtractable\Foo~(ThisSubtractable\Bar|ThisSubtractable\Baz)&hasMethod(test123)', $s);
 		} else {
 			assertType('(ThisSubtractable\Bar&hasMethod(test123))|(ThisSubtractable\Baz&hasMethod(test123))', $s);
 		}
 
-		assertType('(ThisSubtractable\Bar&hasMethod(test123))|(ThisSubtractable\Baz&hasMethod(test123))|(ThisSubtractable\Foo~ThisSubtractable\Bar|ThisSubtractable\Baz&hasMethod(test123))', $s);
+		assertType('(ThisSubtractable\Bar&hasMethod(test123))|(ThisSubtractable\Baz&hasMethod(test123))|(ThisSubtractable\Foo~(ThisSubtractable\Bar|ThisSubtractable\Baz)&hasMethod(test123))', $s);
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/nsrt/throw-points/try-catch.php b/tests/PHPStan/Analyser/nsrt/throw-points/try-catch.php
@@ -76,7 +76,7 @@ function (): void {
 		assertVariableCertainty(TrinaryLogic::createMaybe(), $baz);
 		assertType('1|2', $baz);
 	} catch (\Throwable $e) {
-		assertType('Throwable~InvalidArgumentException|RuntimeException', $e);
+		assertType('Throwable~(InvalidArgumentException|RuntimeException)', $e);
 		assertVariableCertainty(TrinaryLogic::createNo(), $foo);
 		assertVariableCertainty(TrinaryLogic::createYes(), $bar);
 		assertVariableCertainty(TrinaryLogic::createNo(), $baz);
diff --git a/tests/PHPStan/Type/TypeCombinatorTest.php b/tests/PHPStan/Type/TypeCombinatorTest.php
@@ -1886,7 +1886,7 @@ public function dataUnion(): iterable
 					StaticTypeFactory::truthy(),
 				],
 				MixedType::class,
-				'mixed~0|0.0|\'\'|\'0\'|array{}|false|null=implicit',
+				'mixed~(0|0.0|\'\'|\'0\'|array{}|false|null)=implicit',
 			],
 			[
 				[
@@ -3325,7 +3325,7 @@ public function dataIntersect(): iterable
 					new MixedType(false, new IntegerType()),
 				],
 				MixedType::class,
-				'mixed~int|string=implicit',
+				'mixed~(int|string)=implicit',
 			],
 			[
 				[
@@ -4494,7 +4494,7 @@ public function dataRemove(): array
 				StaticTypeFactory::truthy(),
 				StaticTypeFactory::falsey(),
 				MixedType::class,
-				'mixed~0|0.0|\'\'|\'0\'|array{}|false|null',
+				'mixed~(0|0.0|\'\'|\'0\'|array{}|false|null)',
 			],
 			[
 				StaticTypeFactory::falsey(),
@@ -4670,7 +4670,7 @@ public function dataRemove(): array
 				new MixedType(false, new IntegerType()),
 				new StringType(),
 				MixedType::class,
-				'mixed~int|string',
+				'mixed~(int|string)',
 			],
 			[
 				new MixedType(false),
@@ -4706,7 +4706,7 @@ public function dataRemove(): array
 				new ObjectType('Exception', new ObjectType('InvalidArgumentException')),
 				new ObjectType('LengthException'),
 				ObjectType::class,
-				'Exception~InvalidArgumentException|LengthException',
+				'Exception~(InvalidArgumentException|LengthException)',
 			],
 			[
 				new ObjectType('Exception'),

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,9 @@ public function describe(VerbosityLevel $level): string`
`487`	`487`	`$preciseWithSubtracted = function () use ($level): string {`
`488`	`488`	`$description = $this->className;`
`489`	`489`	`if ($this->subtractedType !== null) {`
`490`		`- $description .= sprintf('~%s', $this->subtractedType->describe($level));`
	`490`	`+ $description .= $this->subtractedType instanceof UnionType`
	`491`	`+ ? sprintf('~(%s)', $this->subtractedType->describe($level))`
	`492`	`+ : sprintf('~%s', $this->subtractedType->describe($level));`
`491`	`493`	`}`
`492`	`494`
`493`	`495`	`return $description;`
`@@ -538,7 +540,9 @@ private function describeCache(): string`
`538`	`540`	`}`
`539`	`541`
`540`	`542`	`if ($this->subtractedType !== null) {`
`541`		`- $description .= sprintf('~%s', $this->subtractedType->describe(VerbosityLevel::cache()));`
	`543`	`+ $description .= $this->subtractedType instanceof UnionType`
	`544`	`+ ? sprintf('~(%s)', $this->subtractedType->describe(VerbosityLevel::cache()))`
	`545`	`+ : sprintf('~%s', $this->subtractedType->describe(VerbosityLevel::cache()));`
`542`	`546`	`}`
`543`	`547`
`544`	`548`	`$reflection = $this->classReflection;`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class TypeSpecifierTest extends PHPStanTestCase`
`44`	`44`	`{`
`45`	`45`
`46`	`46`	`private const FALSEY_TYPE_DESCRIPTION = '0\|0.0\|\'\'\|\'0\'\|array{}\|false\|null';`
`47`		`- private const TRUTHY_TYPE_DESCRIPTION = 'mixed~' . self::FALSEY_TYPE_DESCRIPTION;`
	`47`	`+ private const TRUTHY_TYPE_DESCRIPTION = 'mixed~(' . self::FALSEY_TYPE_DESCRIPTION . ')';`
`48`	`48`	`private const SURE_NOT_FALSEY = '~' . self::FALSEY_TYPE_DESCRIPTION;`
`49`	`49`	`private const SURE_NOT_TRUTHY = '~' . self::TRUTHY_TYPE_DESCRIPTION;`
`50`	`50`
`@@ -819,10 +819,10 @@ public function dataCondition(): iterable`
`819`	`819`	`new LNumber(3),`
`820`	`820`	`),`
`821`	`821`	`[`
`822`		`- '$n' => 'mixed~int<3, max>\|true',`
	`822`	`+ '$n' => 'mixed~(int<3, max>\|true)',`
`823`	`823`	`],`
`824`	`824`	`[`
`825`		`- '$n' => 'mixed~0.0\|int<min, 2>\|false\|null',`
	`825`	`+ '$n' => 'mixed~(0.0\|int<min, 2>\|false\|null)',`
`826`	`826`	`],`
`827`	`827`	`],`
`828`	`828`	`[`
`@@ -831,10 +831,10 @@ public function dataCondition(): iterable`
`831`	`831`	`new LNumber(PHP_INT_MIN),`
`832`	`832`	`),`
`833`	`833`	`[`
`834`		`- '$n' => 'mixed~int<' . PHP_INT_MIN . ', max>\|true',`
	`834`	`+ '$n' => 'mixed~(int<' . PHP_INT_MIN . ', max>\|true)',`
`835`	`835`	`],`
`836`	`836`	`[`
`837`		`- '$n' => 'mixed~0.0\|false\|null',`
	`837`	`+ '$n' => 'mixed~(0.0\|false\|null)',`
`838`	`838`	`],`
`839`	`839`	`],`
`840`	`840`	`[`
`@@ -843,7 +843,7 @@ public function dataCondition(): iterable`
`843`	`843`	`new LNumber(PHP_INT_MAX),`
`844`	`844`	`),`
`845`	`845`	`[`
`846`		`- '$n' => 'mixed~0.0\|bool\|int<min, ' . PHP_INT_MAX . '>\|null',`
	`846`	`+ '$n' => 'mixed~(0.0\|bool\|int<min, ' . PHP_INT_MAX . '>\|null)',`
`847`	`847`	`],`
`848`	`848`	`[`
`849`	`849`	`'$n' => 'mixed',`
`@@ -858,7 +858,7 @@ public function dataCondition(): iterable`
`858`	`858`	`'$n' => 'mixed~int<' . (PHP_INT_MIN + 1) . ', max>',`
`859`	`859`	`],`
`860`	`860`	`[`
`861`		`- '$n' => 'mixed~0.0\|bool\|int<min, ' . PHP_INT_MIN . '>\|null',`
	`861`	`+ '$n' => 'mixed~(0.0\|bool\|int<min, ' . PHP_INT_MIN . '>\|null)',`
`862`	`862`	`],`
`863`	`863`	`],`
`864`	`864`	`[`
`@@ -867,10 +867,10 @@ public function dataCondition(): iterable`
`867`	`867`	`new LNumber(PHP_INT_MAX),`
`868`	`868`	`),`
`869`	`869`	`[`
`870`		`- '$n' => 'mixed~0.0\|int<min, ' . (PHP_INT_MAX - 1) . '>\|false\|null',`
	`870`	`+ '$n' => 'mixed~(0.0\|int<min, ' . (PHP_INT_MAX - 1) . '>\|false\|null)',`
`871`	`871`	`],`
`872`	`872`	`[`
`873`		`- '$n' => 'mixed~int<' . PHP_INT_MAX . ', max>\|true',`
	`873`	`+ '$n' => 'mixed~(int<' . PHP_INT_MAX . ', max>\|true)',`
`874`	`874`	`],`
`875`	`875`	`],`
`876`	`876`	`[`
`@@ -885,10 +885,10 @@ public function dataCondition(): iterable`
`885`	`885`	`),`
`886`	`886`	`),`
`887`	`887`	`[`
`888`		`- '$n' => 'mixed~0.0\|int<min, 2>\|int<6, max>\|false\|null',`
	`888`	`+ '$n' => 'mixed~(0.0\|int<min, 2>\|int<6, max>\|false\|null)',`
`889`	`889`	`],`
`890`	`890`	`[`
`891`		`- '$n' => 'mixed~int<3, 5>\|true',`
	`891`	`+ '$n' => 'mixed~(int<3, 5>\|true)',`
`892`	`892`	`],`
`893`	`893`	`],`
`894`	`894`	`[`
`@@ -1250,7 +1250,7 @@ public function dataCondition(): iterable`
`1250`	`1250`	`),`
`1251`	`1251`	`[`
`1252`	`1252`	`'$foo' => 'non-empty-array',`
`1253`		`- 'count($foo)' => 'mixed~0.0\|int<min, 1>\|false\|null',`
	`1253`	`+ 'count($foo)' => 'mixed~(0.0\|int<min, 1>\|false\|null)',`
`1254`	`1254`	`],`
`1255`	`1255`	`[],`
`1256`	`1256`	`],`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function file_managed_file_save_upload(): array {`
`20`	`20`	`}`
`21`	`21`	`assertType('non-empty-array\|Bug10189\SomeInterface', $files);`
`22`	`22`	`$files = array_filter($files);`
`23`		`- assertType("array<mixed~0\|0.0\|''\|'0'\|array{}\|false\|null>", $files);`
	`23`	`+ assertType("array<mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null)>", $files);`
`24`	`24`
`25`	`25`	`return empty($files) ? [] : [1,2];`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static function email($config = null)`
`26`	`26`	`assertType('array{}\|null', $config);`
`27`	`27`	`$config = new \stdClass();`
`28`	`28`	`} elseif (! (is_array($config) \|\| $config instanceof \stdClass)) {`
`29`		`- assertNativeType('mixed~0\|0.0\|\'\'\|\'0\'\|array{}\|stdClass\|false\|null', $config);`
	`29`	`+ assertNativeType('mixed~(0\|0.0\|\'\'\|\'0\'\|array{}\|stdClass\|false\|null)', $config);`
`30`	`30`	`assertType('NEVER', $config);`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public function doFoo($arguments)`
`13`	`13`	`return;`
`14`	`14`	`}`
`15`	`15`
`16`		`- assertType('mixed~array{}\|null', $arguments);`
	`16`	`+ assertType('mixed~(array{}\|null)', $arguments);`
`17`	`17`
`18`	`18`	`array_shift($arguments);`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function broken(int $key)`
`32`	`32`	`$item = $this->items[$key] ?? null;`
`33`	`33`	`assertType('T of mixed~null (class Bug4117Types\GenericList, argument)\|null', $item);`
`34`	`34`	`if ($item) {`
`35`		`- assertType("T of mixed~0\|0.0\|''\|'0'\|array{}\|false\|null (class Bug4117Types\GenericList, argument)", $item);`
	`35`	`+ assertType("T of mixed~(0\|0.0\|''\|'0'\|array{}\|false\|null) (class Bug4117Types\GenericList, argument)", $item);`
`36`	`36`	`} else {`
`37`	`37`	`assertType("(array{}&T of mixed~null (class Bug4117Types\GenericList, argument))\|(0.0&T of mixed~null (class Bug4117Types\GenericList, argument))\|(0&T of mixed~null (class Bug4117Types\GenericList, argument))\|(''&T of mixed~null (class Bug4117Types\GenericList, argument))\|('0'&T of mixed~null (class Bug4117Types\GenericList, argument))\|(T of mixed~null (class Bug4117Types\GenericList, argument)&false)\|null", $item);`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function test(Suit $x): string {`
`25`	`25`	`assertType('Bug7176Types\Suit::Spades', $x);`
`26`	`26`	`return 'DOES NOT WORK';`
`27`	`27`	`}`
`28`		`- assertType('Bug7176Types\Suit~Bug7176Types\Suit::Clubs\|Bug7176Types\Suit::Spades', $x);`
	`28`	`+ assertType('Bug7176Types\Suit~(Bug7176Types\Suit::Clubs\|Bug7176Types\Suit::Spades)', $x);`
`29`	`29`
`30`	`30`	`return match ($x) {`
`31`	`31`	`Suit::Hearts => 'a',`