Skip polyfills in vendor when on a higher PHP version

Author: ondrejmirtes

build/baseline-pre-8.0.neon

@@ -133,3 +133,21 @@ parameters:
 			message: '#^Parameter \#1 \$array \(non-empty-list<PHPStan\\Type\\Type>\) of array_values is already a list, call has no effect\.$#'
 			count: 1
 			path: ../src/Type/TypeCombinator.php
+
+		-
+			rawMessage: Access to property $id of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 1
+			path: ../src/Parser/RichParser.php
+
+		-
+			rawMessage: Access to property $line of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 4
+			path: ../src/Parser/RichParser.php
+
+		-
+			rawMessage: Access to property $text of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
+			identifier: property.internalClass
+			count: 3
+			path: ../src/Parser/RichParser.php

phpstan-baseline.neon

@@ -264,24 +264,6 @@ parameters:
 			count: 1
 			path: src/Fixable/PhpPrinterIndentationDetectorVisitor.php
 
-		-
-			rawMessage: Access to property $id of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
-			identifier: property.internalClass
-			count: 1
-			path: src/Parser/RichParser.php
-
-		-
-			rawMessage: Access to property $line of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
-			identifier: property.internalClass
-			count: 4
-			path: src/Parser/RichParser.php
-
-		-
-			rawMessage: Access to property $text of internal class Symfony\Polyfill\Php80\PhpToken from outside its root namespace Symfony.
-			identifier: property.internalClass
-			count: 3
-			path: src/Parser/RichParser.php
-
 		-
 			rawMessage: 'Call to function method_exists() with PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocNode and ''getParamOutTypeTagV…'' will always evaluate to true.'
 			identifier: function.alreadyNarrowedType

src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php

@@ -15,6 +15,7 @@
 use PHPStan\BetterReflection\SourceLocator\Type\SourceLocator;
 use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\BetterReflection\SourceLocator\AutoloadFunctionsSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\AutoloadSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\ComposerJsonAndInstalledJsonSourceLocatorMaker;
@@ -26,8 +27,10 @@
 use PHPStan\Reflection\BetterReflection\SourceLocator\ReflectionClassSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\RewriteClassAliasSourceLocator;
 use PHPStan\Reflection\BetterReflection\SourceLocator\SkipClassAliasSourceLocator;
+use PHPStan\Reflection\BetterReflection\SourceLocator\SkipPolyfillSourceLocator;
 use function array_merge;
 use function array_unique;
+use function count;
 use function extension_loaded;
 use function is_dir;
 use function is_file;
@@ -49,6 +52,7 @@ public function __construct(
 		private Parser $parser,
 		#[AutowiredParameter(ref: '@php8PhpParser')]
 		private Parser $php8Parser,
+		private PhpVersion $phpVersion,
 		private PhpStormStubsSourceStubber $phpstormStubsSourceStubber,
 		private ReflectionSourceStubber $reflectionSourceStubber,
 		private OptimizedSingleFileSourceLocatorRepository $optimizedSingleFileSourceLocatorRepository,
@@ -126,12 +130,18 @@ public function create(): SourceLocator
 
 		$astPhp8Locator = new Locator($this->php8Parser);
 
+		$composerLocators = [];
+
 		foreach ($this->composerAutoloaderProjectPaths as $composerAutoloaderProjectPath) {
 			$locator = $this->composerJsonAndInstalledJsonSourceLocatorMaker->create($composerAutoloaderProjectPath);
 			if ($locator === null) {
 				continue;
 			}
-			$fileLocators[] = $locator;
+			$composerLocators[] = $locator;
+		}
+
+		if (count($composerLocators) > 0) {
+			$fileLocators[] = new SkipPolyfillSourceLocator(new AggregateSourceLocator($composerLocators), $this->phpVersion);
 		}
 
 		if (extension_loaded('phar')) {