Fixed mixed type not considered nullable

phpstan · Jan 3, 2022 · c0aad86 · c0aad86
1 parent 3d2e1db
commit c0aad86
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 4 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -587,6 +587,10 @@ public function dataFileAsserts(): iterable
 			yield from $this->gatherAssertTypes(__DIR__ . '/data/enums-import-alias.php');
 		}
 
+		if (PHP_VERSION_ID >= 80000) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6293.php');
+		}
+
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/classPhpDocs-phpstanPropertyPrefix.php');
 	}
 

diff --git a/tests/PHPStan/Analyser/data/bug-6293.php b/tests/PHPStan/Analyser/data/bug-6293.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug6239;
+
+use function PHPStan\Testing\assertNativeType;
+use function PHPStan\Testing\assertType;
+
+class UnionWithNullFails
+{
+	/**
+	 * @param int|null|bool $value
+	 */
+	public function withPhpDoc(mixed $value): void
+	{
+		assertType('bool|int|null', $value);
+		assertNativeType('mixed', $value);
+	}
+
+	public function doFoo(): void
+	{
+		$this->withPhpDoc(null);
+	}
+}
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -2273,4 +2273,12 @@ public function testEnums(): void
 		]);
 	}
 
+	public function testBug6239(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-6293.php'], []);
+	}
+
 }