Take advantage of gatherAssertTypesFromDirectory in NodeScopeResolverTest

Author: ondrejmirtes

Makefile

@@ -20,6 +20,7 @@ tests-golden-reflection:
 lint:
 	php vendor/bin/parallel-lint --colors \
 		--exclude tests/PHPStan/Analyser/data \
+		--exclude tests/PHPStan/Analyser/nsrt \
 		--exclude tests/PHPStan/Rules/Methods/data \
 		--exclude tests/PHPStan/Rules/Functions/data \
 		--exclude tests/PHPStan/Rules/Names/data \

build/downgrade.php

@@ -10,6 +10,7 @@
 		'tests/*/data/*',
 		'tests/*/Fixture/*',
 		'tests/PHPStan/Analyser/traits/*',
+		'tests/PHPStan/Analyser/nsrt/*',
 		'tests/PHPStan/Generics/functions.php',
 		'tests/e2e/resultCache_1.php',
 		'tests/e2e/resultCache_2.php',

build/phpstan.neon

@@ -26,6 +26,7 @@ parameters:
 		- ../src/Reflection/SignatureMap/functionMetadata.php
 		- ../tests/*/data/*
 		- ../tests/tmp/*
+		- ../tests/PHPStan/Analyser/nsrt/*
 		- ../tests/PHPStan/Analyser/traits/*
 		- ../tests/notAutoloaded/*
 		- ../tests/PHPStan/Generics/functions.php

phpcs.xml

@@ -205,6 +205,7 @@
 		</properties>
 	</rule>
 	<exclude-pattern>tests/*/data</exclude-pattern>
+	<exclude-pattern>tests/PHPStan/Analyser/nsrt</exclude-pattern>
 	<exclude-pattern>tests/*/Fixture</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_1.php</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_2.php</exclude-pattern>

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -263,7 +263,7 @@ public function testBug3686(): void
 
 	public function testBug3379(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-3379.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-3379.php');
 		$this->assertCount(1, $errors);
 		$this->assertSame('Constant SOME_UNKNOWN_CONST not found.', $errors[0]->getMessage());
 	}
@@ -442,7 +442,7 @@ public function testBug5231Two(): void
 
 	public function testBug5529(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-5529.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-5529.php');
 		$this->assertNoErrors($errors);
 	}
 
@@ -715,7 +715,7 @@ public function testBug6192(): void
 
 	public function testBug7068(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7068.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-7068.php');
 		$this->assertNoErrors($errors);
 	}
 
@@ -725,7 +725,7 @@ public function testDiscussion6993(): void
 			$this->markTestSkipped('Test requires PHP 8.0.');
 		}
 
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-6993.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-6993.php');
 		$this->assertCount(1, $errors);
 		$this->assertSame('Parameter #1 $specificable of method Bug6993\AndSpecificationValidator<Bug6993\TestSpecification,Bug6993\Foo>::isSatisfiedBy() expects Bug6993\Foo, Bug6993\Bar given.', $errors[0]->getMessage());
 	}
@@ -742,7 +742,7 @@ public function testBug7078(): void
 			$this->markTestSkipped('Test requires PHP 8.0.');
 		}
 
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7078.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-7078.php');
 		$this->assertNoErrors($errors);
 	}
 
@@ -758,7 +758,7 @@ public function testBug7116(): void
 
 	public function testBug3853(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-3853.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-3853.php');
 		$this->assertNoErrors($errors);
 	}
 
@@ -827,7 +827,7 @@ public function testBug7094(): void
 
 	public function testOffsetAccess(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/offset-access.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/offset-access.php');
 		$this->assertCount(1, $errors);
 		$this->assertSame('PHPDoc tag @return contains unresolvable type.', $errors[0]->getMessage());
 		$this->assertSame(42, $errors[0]->getLine());
@@ -865,7 +865,7 @@ public function testBug7381(): void
 
 	public function testBug7153(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/bug-7153.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/bug-7153.php');
 		$this->assertNoErrors($errors);
 	}
 
@@ -1063,7 +1063,7 @@ public function testBug8376(): void
 
 	public function testAssertDocblock(): void
 	{
-		$errors = $this->runAnalyse(__DIR__ . '/data/assert-docblock.php');
+		$errors = $this->runAnalyse(__DIR__ . '/nsrt/assert-docblock.php');
 		$this->assertCount(4, $errors);
 		$this->assertSame('Call to method AssertDocblock\A::testInt() with string will always evaluate to false.', $errors[0]->getMessage());
 		$this->assertSame(218, $errors[0]->getLine());