de-duplicate tests. fix assertions

phpstan · Jan 10, 2023 · 762837f · 762837f
1 parent 7d55548
commit 762837f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/tests/PHPStan/Analyser/data/bug-3019.php b/tests/PHPStan/Analyser/data/bug-3019.php
@@ -8,8 +8,13 @@ trait FooTrait
 {
 	public function doFoo(): void
 	{
-		assertType('string', __CLASS__);
-		assertType('string', __NAMESPACE__);
+		assertType('class-string&literal-string', __CLASS__);
+		assertType('literal-string', __NAMESPACE__);
+	}
+
+	public function doFooBaz(): void
+	{
+		$key = __CLASS__ === 'Bug3019\Foo' ? 'display' : 'layout';
 	}
 }
 

diff --git a/tests/PHPStan/Rules/Comparison/UnreachableTernaryElseBranchRuleTest.php b/tests/PHPStan/Rules/Comparison/UnreachableTernaryElseBranchRuleTest.php
@@ -94,7 +94,7 @@ public function testReportPhpDoc(): void
 	public function testBug3019(): void
 	{
 		$this->treatPhpDocTypesAsCertain = true;
-		$this->analyse([__DIR__ . '/data/bug-3019.php'], []);
+		$this->analyse([__DIR__ . '/../../Analyser/data/bug-3019.php'], []);
 	}
 
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-3019.php b/tests/PHPStan/Rules/Comparison/data/bug-3019.php