TemplateType - fix description for subtracted mixed bound

phpstan · Mar 5, 2022 · 6525d68 · 6525d68
1 parent 7d4fa3d
commit 6525d68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Type/Generic/TemplateTypeTrait.php b/src/Type/Generic/TemplateTypeTrait.php
@@ -48,7 +48,8 @@ public function getBound(): Type
 	public function describe(VerbosityLevel $level): string
 	{
 		$basicDescription = function () use ($level): string {
-			if ($this->bound instanceof MixedType) { // @phpstan-ignore-line
+			// @phpstan-ignore-next-line
+			if ($this->bound instanceof MixedType && $this->bound->getSubtractedType() === null && !$this->bound instanceof TemplateMixedType) {
 				$boundDescription = '';
 			} else { // @phpstan-ignore-line
 				$boundDescription = sprintf(' of %s', $this->bound->describe($level));

diff --git a/tests/PHPStan/Rules/Methods/data/bug-6635.php b/tests/PHPStan/Rules/Methods/data/bug-6635.php
@@ -23,10 +23,10 @@ protected function sayHelloBug(mixed $block): mixed {
 			assertType('Bug6635\A&T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
 			echo 1;
 		} else {
-			assertType('T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+			assertType('T of mixed~Bug6635\A (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
 		}
 
-		assertType('(Bug6635\A&T (method Bug6635\HelloWorld::sayHelloBug(), argument))|T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+		assertType('(Bug6635\A&T (method Bug6635\HelloWorld::sayHelloBug(), argument))|T of mixed~Bug6635\A (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
 
 		return $block;
 	}