Fix tests

Author: rvanvelzen

src/Testing/TestCaseSourceLocatorFactory.php

@@ -36,9 +36,18 @@ public function __construct(
 
 	public function create(): SourceLocator
 	{
+		$locators = [];
+
+		$astLocator = new Locator($this->phpParser);
+		$astPhp8Locator = new Locator($this->php8Parser);
+
+		$locators[] = new PhpInternalSourceLocator($astPhp8Locator, $this->phpstormStubsSourceStubber);
+		$locators[] = new AutoloadSourceLocator($this->fileNodesFetcher, true);
+		$locators[] = new PhpVersionBlacklistSourceLocator(new PhpInternalSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);
+		$locators[] = new PhpVersionBlacklistSourceLocator(new EvaledCodeSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);
+
 		$classLoaders = ClassLoader::getRegisteredLoaders();
 		$classLoaderReflection = new ReflectionClass(ClassLoader::class);
-		$locators = [];
 		if ($classLoaderReflection->hasProperty('vendorDir')) {
 			$vendorDirProperty = $classLoaderReflection->getProperty('vendorDir');
 			$vendorDirProperty->setAccessible(true);
@@ -56,14 +65,6 @@ public function create(): SourceLocator
 			}
 		}
 
-		$astLocator = new Locator($this->phpParser);
-		$astPhp8Locator = new Locator($this->php8Parser);
-
-		$locators[] = new PhpInternalSourceLocator($astPhp8Locator, $this->phpstormStubsSourceStubber);
-		$locators[] = new AutoloadSourceLocator($this->fileNodesFetcher, true);
-		$locators[] = new PhpVersionBlacklistSourceLocator(new PhpInternalSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);
-		$locators[] = new PhpVersionBlacklistSourceLocator(new EvaledCodeSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);
-
 		return new MemoizingSourceLocator(new AggregateSourceLocator($locators));
 	}
 

tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php

@@ -390,31 +390,35 @@ public function testRemoveArrayFromIterable(): void
 
 	public function testUnpackOperator(): void
 	{
+		$expectedType = PHP_VERSION_ID >= 80000 ? 'bool|float|int|string|Stringable|null' : 'bool|float|int|object|string|null';
+
 		$this->analyse([__DIR__ . '/data/unpack-operator.php'], [
 			[
-				'Parameter #2 ...$values of function sprintf expects bool|float|int|object|string|null, array<string> given.',
+				sprintf('Parameter #2 ...$values of function sprintf expects %s, array<string> given.', $expectedType),
 				18,
 			],
 			[
-				'Parameter #2 ...$values of function sprintf expects bool|float|int|object|string|null, array<int, string> given.',
+				sprintf('Parameter #2 ...$values of function sprintf expects %s, array<int, string> given.', $expectedType),
 				19,
 			],
 			[
-				'Parameter #2 ...$values of function sprintf expects bool|float|int|object|string|null, UnpackOperator\Foo given.',
+				sprintf('Parameter #2 ...$values of function sprintf expects %s, UnpackOperator\Foo given.', $expectedType),
 				22,
 			],
 			[
-				'Parameter #2 ...$values of function printf expects bool|float|int|object|string|null, UnpackOperator\Foo given.',
+				sprintf('Parameter #2 ...$values of function printf expects %s, UnpackOperator\Foo given.', $expectedType),
 				24,
 			],
 		]);
 	}
 
 	public function testFputCsv(): void
 	{
+		$expectedType = PHP_VERSION_ID >= 80000 ? 'bool|float|int|string|Stringable|null' : 'bool|float|int|object|string|null';
+
 		$this->analyse([__DIR__ . '/data/fputcsv-fields-parameter.php'], [
 			[
-				'Parameter #2 $fields of function fputcsv expects array<int|string, bool|float|int|object|string|null>, array<int, Fputcsv\Person> given.',
+				sprintf('Parameter #2 $fields of function fputcsv expects array<int|string, %s>, array<int, Fputcsv\Person> given.', $expectedType),
 				35,
 			],
 		]);