Fix

phpstan · Sep 22, 2021 · 7a2a437 · 7a2a437
1 parent 764ad61
commit 7a2a437
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -411,10 +411,11 @@ public function testBug4715(): void
 	public function testBug4734(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-4734.php');
-		$this->assertCount(2, $errors);
+		$this->assertCount(3, $errors);
 
-		$this->assertSame('Access to an undefined static property static(Bug4734\Foo)::$httpMethodParameterOverride3.', $errors[0]->getMessage());
-		$this->assertSame('Access to an undefined property Bug4734\Foo::$httpMethodParameterOverride4.', $errors[1]->getMessage());
+		$this->assertSame('Unsafe access to private property Bug4734\Foo::$httpMethodParameterOverride through static::.', $errors[0]->getMessage());
+		$this->assertSame('Access to an undefined static property static(Bug4734\Foo)::$httpMethodParameterOverride3.', $errors[1]->getMessage());
+		$this->assertSame('Access to an undefined property Bug4734\Foo::$httpMethodParameterOverride4.', $errors[2]->getMessage());
 	}
 
 	public function testBug5231(): void

diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1996,14 +1996,6 @@ public function testGenericReturnTypeResolvedToNever(): void
 		]);
 	}
 
-	public function testDoNotReportGenericReturnTypeResolvedToNever(): void
-	{
-		$this->checkThisOnly = false;
-		$this->checkNullables = true;
-		$this->checkUnionTypes = true;
-		$this->analyse([__DIR__ . '/data/generic-return-type-never.php'], []);
-	}
-
 	public function testUnableToResolveCallbackParameterType(): void
 	{
 		$this->checkThisOnly = false;