Fix attribute services tests on PHP < 8.1 and Windows

The fixtures with attributes are not valid PHP 7.4 and a class with new in
attribute arguments cannot be loaded on PHP 8.0, so lint skips the fixtures,
the integration test requires PHP 8.0 and the new fixture lives in its own
directory discovered only on PHP 8.1+. The resolver tests pass PHP 8.0 to the
resolver so that they run everywhere. Expected paths use forward slashes like
the resolver does.

Amp-Thread-ID: https://ampcode.com/threads/T-01a19cd4-be31-75b4-bd15-67786eff5983

Author: ondrejmirtes

Makefile

@@ -40,6 +40,7 @@ lint:
 		--exclude tests/PHPStan/Rules/Operators/data/invalid-assign-var.php \
 		--exclude tests/PHPStan/Rules/Functions/data/arrow-function-nullsafe-by-ref.php \
 		--exclude tests/PHPStan/Levels/data/namedArguments.php \
+		--exclude tests/PHPStan/DependencyInjection/AttributeServices/data \
 		--exclude tests/PHPStan/Reflection/BetterReflection/SourceLocator/data/symbol-finder/class-name-before-global-constant.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/continue-break.php \
 		--exclude tests/PHPStan/Rules/Keywords/data/continue-break-property-hook.php \

build/baseline-pre-8.0.neon

@@ -37,9 +37,16 @@ parameters:
 			path: ../src/DependencyInjection/AttributeServices/AttributeServicesDiscoverer.php
 
 		-
-			message: '#^(Parameter \$attribute of method .+ has invalid type|Call to method \w+\(\) on an unknown class) ReflectionAttribute\.$#'
-			count: 5
-			path: ../src/DependencyInjection/AttributeServices/AttributeServicesDiscoverer.php
+			rawMessage: 'Class AttributeServicesFixtures\DiscoveredConditionalRuleNotMet not found.'
+			identifier: class.notFound
+			count: 3
+			path: ../tests/PHPStan/DependencyInjection/AttributeServices/AttributeServicesIntegrationTest.php
+
+		-
+			rawMessage: 'Class AttributeServicesFixtures\DiscoveredConditionalService not found.'
+			identifier: class.notFound
+			count: 1
+			path: ../tests/PHPStan/DependencyInjection/AttributeServices/AttributeServicesIntegrationTest.php
 
 		-
 			rawMessage: 'Call to an undefined method ReflectionClass::isReadOnly().'

tests/PHPStan/DependencyInjection/AttributeServices/AttributeServicesDirectoriesResolverTest.php

@@ -9,17 +9,23 @@
 use function dirname;
 use function hash_file;
 use function str_starts_with;
-use const PHP_VERSION_ID;
+use function strtr;
 
 class AttributeServicesDirectoriesResolverTest extends TestCase
 {
 
+	/**
+	 * With forward slashes like the paths the resolver returns, also on Windows.
+	 */
 	private static function getRepoRoot(): string
 	{
-		return dirname(__DIR__, 4);
+		return strtr(dirname(__DIR__, 4), '\\', '/');
 	}
 
-	private function createResolver(int $phpVersionId = PHP_VERSION_ID): AttributeServicesDirectoriesResolver
+	/**
+	 * PHP 8.0 by default so that the tests run on every PHP version - resolving needs no runtime attributes.
+	 */
+	private function createResolver(int $phpVersionId = 80000): AttributeServicesDirectoriesResolver
 	{
 		$repoRoot = self::getRepoRoot();
 
@@ -83,7 +89,7 @@ public function testMissingDirectory(): void
 
 	public function testDirectoryOutsideComposerProjects(): void
 	{
-		$resolver = new AttributeServicesDirectoriesResolver(new FileHelper(self::getRepoRoot()), []);
+		$resolver = new AttributeServicesDirectoriesResolver(new FileHelper(self::getRepoRoot()), [], 80000);
 		$this->expectException(InvalidAttributeServicesDirectoriesException::class);
 		$this->expectExceptionMessage('is not inside any project with Composer metadata known to PHPStan');
 		$resolver->resolve([__DIR__]);

tests/PHPStan/DependencyInjection/AttributeServices/AttributeServicesIntegrationTest.php

@@ -20,14 +20,18 @@
 use PHPStan\Rules\LazyRegistry;
 use PHPStan\Rules\Properties\ReadWritePropertiesExtension;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 use function array_filter;
 use function dirname;
 use function md5;
 use function mkdir;
+use function strtr;
 use function sys_get_temp_dir;
 use function uniqid;
+use const PHP_VERSION_ID;
 
+#[RequiresPhp('>= 8.0.0')]
 class AttributeServicesIntegrationTest extends TestCase
 {
 
@@ -44,7 +48,10 @@ private static function createContainer(): Container
 		self::$tmpDir = self::createTmpDir();
 		$containerFactory = new ContainerFactory(__DIR__);
 
-		return self::$container = $containerFactory->create(self::$tmpDir, [__DIR__ . '/attributeServices.neon'], [], [dirname(__DIR__, 4)]);
+		// PHP 8.0 cannot even load a class with `new` in attribute arguments
+		$configFile = PHP_VERSION_ID >= 80100 ? 'attributeServicesNewInInitializers.neon' : 'attributeServices.neon';
+
+		return self::$container = $containerFactory->create(self::$tmpDir, [__DIR__ . '/' . $configFile], [], [dirname(__DIR__, 4)]);
 	}
 
 	private static function createTmpDir(): string
@@ -91,11 +98,18 @@ public function testDiscoveredRulesFollowTheLevel(): void
 		$this->assertCount(0, array_filter($rules, static fn ($rule): bool => $rule instanceof DiscoveredRuleLevelEight));
 	}
 
-	public function testDiscoveredConditional(): void
+	#[RequiresPhp('>= 8.1.0')]
+	public function testDiscoveredConditionalWithNewInAttributeArguments(): void
 	{
 		$container = self::createContainer();
 		$rules = $container->getServicesByTag(LazyRegistry::RULE_TAG);
 		$this->assertCount(1, array_filter($rules, static fn ($rule): bool => $rule instanceof DiscoveredConditionalRule));
+	}
+
+	public function testDiscoveredConditional(): void
+	{
+		$container = self::createContainer();
+		$rules = $container->getServicesByTag(LazyRegistry::RULE_TAG);
 		$this->assertCount(0, array_filter($rules, static fn ($rule): bool => $rule instanceof DiscoveredConditionalRuleNotMet));
 
 		// the services are registered even when the condition is not met, only their tags are skipped
@@ -122,7 +136,11 @@ public function testDiscoveredGeneratedFactory(): void
 	public function testDirectoriesParameterIsAbsolutized(): void
 	{
 		$container = self::createContainer();
-		$this->assertSame([__DIR__ . '/data/services'], $container->getParameter('attributeServicesDirectories'));
+		$expected = [strtr(__DIR__, '\\', '/') . '/data/services'];
+		if (PHP_VERSION_ID >= 80100) {
+			$expected[] = strtr(__DIR__, '\\', '/') . '/data/servicesNewInInitializers';
+		}
+		$this->assertSame($expected, $container->getParameter('attributeServicesDirectories'));
 	}
 
 	public function testRegisteredDiscoveredClassesParameter(): void

tests/PHPStan/DependencyInjection/AttributeServices/attributeServicesNewInInitializers.neon

@@ -0,0 +1,5 @@
+includes:
+	- attributeServices.neon
+
+attributeServicesDirectories:
+	- data/servicesNewInInitializers