[BCB] Removed excludes_analyse config option

Author: ondrejmirtes

Diff for: UPGRADING.md

@@ -58,6 +58,10 @@ parameters:
 			identifier: missingType.generics
 ```
 
+### Removed option `excludes_analyse`
+
+It has been replaced with [`excludePaths`](https://phpstan.org/user-guide/ignoring-errors#excluding-whole-files).
+
 ### Paths in `excludePaths` and `ignoreErrors` have to be a valid file path or a fnmatch pattern
 
 If you are excluding a file path that might not exist but you still want to have it in `excludePaths`, append `(?)`:

Diff for: conf/config.neon

@@ -7,8 +7,7 @@ parameters:
 		- ../stubs/runtime/ReflectionAttribute.php
 		- ../stubs/runtime/Attribute.php
 		- ../stubs/runtime/ReflectionIntersectionType.php
-	excludes_analyse: []
-	excludePaths: null
+	excludePaths: []
 	level: null
 	paths: []
 	exceptions:
@@ -653,7 +652,6 @@ services:
 	-
 		class: PHPStan\File\FileExcluderFactory
 		arguments:
-			obsoleteExcludesAnalyse: %excludes_analyse%
 			excludePaths: %excludePaths%
 
 	-

Diff for: conf/parametersSchema.neon

@@ -1,7 +1,6 @@
 parametersSchema:
 	bootstrapFiles: listOf(string())
-	excludes_analyse: listOf(string())
-	excludePaths: schema(anyOf(
+	excludePaths: anyOf(
 		structure([
 			analyse: listOf(string()),
 		]),
@@ -12,7 +11,7 @@ parametersSchema:
 			analyse: listOf(string()),
 			analyseAndScan: listOf(string())
 		])
-	), nullable())
+	)
 	level: schema(anyOf(int(), string()), nullable())
 	paths: listOf(string())
 	exceptions: structure([

Diff for: src/Command/CommandHelper.php

@@ -524,21 +524,6 @@ public static function begin(
 			throw new InceptionNotSuccessfulException();
 		}
 
-		$excludesAnalyse = $container->getParameter('excludes_analyse');
-		$excludePaths = $container->getParameter('excludePaths');
-		if (count($excludesAnalyse) > 0 && $excludePaths !== null) {
-			$errorOutput->writeLineFormatted(sprintf('Configuration parameters <fg=cyan>excludes_analyse</> and <fg=cyan>excludePaths</> cannot be used at the same time.'));
-			$errorOutput->writeLineFormatted('');
-			$errorOutput->writeLineFormatted(sprintf('Parameter <fg=cyan>excludes_analyse</> has been deprecated so use <fg=cyan>excludePaths</> only from now on.'));
-			$errorOutput->writeLineFormatted('');
-
-			throw new InceptionNotSuccessfulException();
-		} elseif (count($excludesAnalyse) > 0) {
-			$errorOutput->writeLineFormatted('⚠️  You\'re using a deprecated config option <fg=cyan>excludes_analyse</>. ⚠️️');
-			$errorOutput->writeLineFormatted('');
-			$errorOutput->writeLineFormatted(sprintf('Parameter <fg=cyan>excludes_analyse</> has been deprecated so use <fg=cyan>excludePaths</> only from now on.'));
-		}
-
 		if ($container->hasParameter('scopeClass') && $container->getParameter('scopeClass') !== MutatingScope::class) {
 			$errorOutput->writeLineFormatted('⚠️  You\'re using a deprecated config option <fg=cyan>scopeClass</>. ⚠️️');
 			$errorOutput->writeLineFormatted('');

Diff for: src/DependencyInjection/NeonAdapter.php

@@ -31,7 +31,7 @@
 final class NeonAdapter implements Adapter
 {
 
-	public const CACHE_KEY = 'v28-ignore-errors';
+	public const CACHE_KEY = 'v29-excludes-analyse';
 
 	private const PREVENT_MERGING_SUFFIX = '!';
 
@@ -121,7 +121,6 @@ public function process(array $arr, string $fileKey, string $file): array
 
 			if (in_array($keyToResolve, [
 				'[parameters][paths][]',
-				'[parameters][excludes_analyse][]',
 				'[parameters][excludePaths][]',
 				'[parameters][excludePaths][analyse][]',
 				'[parameters][excludePaths][analyseAndScan][]',

Diff for: src/File/FileExcluderFactory.php

@@ -11,23 +11,17 @@ final class FileExcluderFactory
 {
 
 	/**
-	 * @param string[] $obsoleteExcludesAnalyse
-	 * @param array{analyse?: array<int, string>, analyseAndScan?: array<int, string>}|null $excludePaths
+	 * @param array{analyse?: array<int, string>, analyseAndScan?: array<int, string>} $excludePaths
 	 */
 	public function __construct(
 		private FileExcluderRawFactory $fileExcluderRawFactory,
-		private array $obsoleteExcludesAnalyse,
-		private ?array $excludePaths,
+		private array $excludePaths,
 	)
 	{
 	}
 
 	public function createAnalyseFileExcluder(): FileExcluder
 	{
-		if ($this->excludePaths === null) {
-			return $this->fileExcluderRawFactory->create($this->obsoleteExcludesAnalyse);
-		}
-
 		$paths = [];
 		if (array_key_exists('analyse', $this->excludePaths)) {
 			$paths = $this->excludePaths['analyse'];
@@ -41,10 +35,6 @@ public function createAnalyseFileExcluder(): FileExcluder
 
 	public function createScanFileExcluder(): FileExcluder
 	{
-		if ($this->excludePaths === null) {
-			return $this->fileExcluderRawFactory->create($this->obsoleteExcludesAnalyse);
-		}
-
 		$paths = [];
 		if (array_key_exists('analyseAndScan', $this->excludePaths)) {
 			$paths = $this->excludePaths['analyseAndScan'];

Diff for: src/Testing/TestCase.neon

@@ -10,7 +10,6 @@ services:
 			phpParser: @phpParserDecorator
 			php8Parser: @php8PhpParser
 			fileExtensions: %fileExtensions%
-			obsoleteExcludesAnalyse: %excludes_analyse%
 			excludePaths: %excludePaths%
 
 	cacheStorage:

Diff for: src/Testing/TestCaseSourceLocatorFactory.php

@@ -31,7 +31,6 @@ final class TestCaseSourceLocatorFactory
 
 	/**
 	 * @param string[] $fileExtensions
-	 * @param string[] $obsoleteExcludesAnalyse
 	 * @param array{analyse?: array<int, string>, analyseAndScan?: array<int, string>}|null $excludePaths
 	 */
 	public function __construct(
@@ -43,7 +42,6 @@ public function __construct(
 		private ReflectionSourceStubber $reflectionSourceStubber,
 		private PhpVersion $phpVersion,
 		private array $fileExtensions,
-		private array $obsoleteExcludesAnalyse,
 		private ?array $excludePaths,
 	)
 	{
@@ -56,7 +54,6 @@ public function create(): SourceLocator
 		$cacheKey = sha1(serialize([
 			$this->phpVersion->getVersionId(),
 			$this->fileExtensions,
-			$this->obsoleteExcludesAnalyse,
 			$this->excludePaths,
 		]));
 		if ($classLoaderReflection->hasProperty('vendorDir') && ! isset(self::$composerSourceLocatorsCache[$cacheKey])) {