Regression test

Closes phpstan/phpstan#6635
phpstan · Mar 5, 2022 · 7d4fa3d · 7d4fa3d
1 parent c05ba98
commit 7d4fa3d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 0 deletions.
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -771,6 +771,9 @@ public function dataFileAsserts(): iterable
 		if (PHP_VERSION_ID >= 70400) {
 			yield from $this->gatherAssertTypes(__DIR__ . '/data/nullable-closure-parameter.php');
 		}
+		if (PHP_VERSION_ID >= 80000) {
+			yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/Methods/data/bug-6635.php');
+		}
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6584.php');
 	}
 

diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -683,4 +683,24 @@ public function testBug6353(): void
 		$this->analyse([__DIR__ . '/data/bug-6353.php'], []);
 	}
 
+	public function testBug6635Level9(): void
+	{
+		if (PHP_VERSION_ID < 80000 && !self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-6635.php'], []);
+	}
+
+	public function testBug6635Level8(): void
+	{
+		if (PHP_VERSION_ID < 80000 && !self::$useStaticReflectionProvider) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->checkExplicitMixed = false;
+		$this->analyse([__DIR__ . '/data/bug-6635.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-6635.php b/tests/PHPStan/Rules/Methods/data/bug-6635.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Bug6635;
+
+use function PHPStan\Testing\assertType;
+
+interface A {
+	public function getValue(): int;
+}
+
+class HelloWorld
+{
+	/**
+	 * @template T
+	 *
+	 * @param T $block
+	 *
+	 * @return T
+	 */
+	protected function sayHelloBug(mixed $block): mixed {
+		assertType('T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+		if ($block instanceof A) {
+			assertType('Bug6635\A&T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+			echo 1;
+		} else {
+			assertType('T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+		}
+
+		assertType('(Bug6635\A&T (method Bug6635\HelloWorld::sayHelloBug(), argument))|T (method Bug6635\HelloWorld::sayHelloBug(), argument)', $block);
+
+		return $block;
+	}
+}