Fix CommandHelper tests

Author: ondrejmirtes

tests/PHPStan/Command/CommandHelperTest.php

@@ -166,23 +166,12 @@ public function dataParameters(): array
 			[
 				__DIR__ . '/relative-paths/root.neon',
 				[
-					'bootstrap' => __DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'here.php',
 					'bootstrapFiles' => [
 						realpath(__DIR__ . '/../../../stubs/runtime/ReflectionUnionType.php'),
 						realpath(__DIR__ . '/../../../stubs/runtime/ReflectionAttribute.php'),
 						realpath(__DIR__ . '/../../../stubs/runtime/Attribute.php'),
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'here.php',
 					],
-					'autoload_files' => [
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'here.php',
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR . 'there.php',
-						__DIR__ . DIRECTORY_SEPARATOR . 'up.php',
-					],
-					'autoload_directories' => [
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src',
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths',
-						realpath(__DIR__ . '/../../../') . '/conf',
-					],
 					'scanFiles' => [
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'here.php',
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR . 'there.php',
@@ -197,17 +186,20 @@ public function dataParameters(): array
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src',
 					],
 					'memoryLimitFile' => __DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . '.memory_limit',
-					'excludes_analyse' => [
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src',
-						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . 'data',
-						'*/src/*/data',
+					'excludePaths' => [
+						'analyseAndScan' => [
+							__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src',
+							__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '*' . DIRECTORY_SEPARATOR . 'data',
+							'*/src/*/data',
+						],
+						'analyse' => [],
 					],
 				],
 			],
 			[
 				__DIR__ . '/relative-paths/nested/nested.neon',
 				[
-					'autoload_files' => [
+					'scanFiles' => [
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'nested' . DIRECTORY_SEPARATOR . 'here.php',
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'nested' . DIRECTORY_SEPARATOR . 'test' . DIRECTORY_SEPARATOR . 'there.php',
 						__DIR__ . DIRECTORY_SEPARATOR . 'relative-paths' . DIRECTORY_SEPARATOR . 'up.php',

tests/PHPStan/Command/relative-paths/nested/nested.neon

@@ -1,5 +1,5 @@
 parameters:
-	autoload_files:
+	scanFiles:
 		- here.php
 		- test/there.php
 		- ../up.php

tests/PHPStan/Command/relative-paths/root.neon

@@ -1,15 +1,6 @@
 parameters:
-	bootstrap: here.php
 	bootstrapFiles:
 		- here.php
-	autoload_files:
-		- here.php
-		- test/there.php
-		- ../up.php
-	autoload_directories:
-		- src
-		- .
-		- %rootDir%/conf
 	scanFiles:
 		- here.php
 		- test/there.php
@@ -21,7 +12,7 @@ parameters:
 	paths:
 		- src
 	memoryLimitFile: .memory_limit
-	excludes_analyse:
+	excludePaths:
 		- src
 		- src/*/data
 		- */src/*/data