Require non-capturing catch

Author: ondrejmirtes

build/rector-downgrade.php

@@ -6,6 +6,7 @@
 use Rector\DowngradePhp74\Rector\Coalesce\DowngradeNullCoalescingOperatorRector;
 use Rector\DowngradePhp74\Rector\ArrowFunction\ArrowFunctionToAnonymousFunctionRector;
 use Rector\DowngradePhp74\Rector\Property\DowngradeTypedPropertyRector;
+use Rector\DowngradePhp80\Rector\Catch_\DowngradeNonCapturingCatchesRector;
 use Rector\DowngradePhp80\Rector\ClassMethod\DowngradeTrailingCommasInParamUseRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
@@ -36,6 +37,7 @@
 
 	if ($targetPhpVersionId < 80000) {
 		$services->set(DowngradeTrailingCommasInParamUseRector::class);
+		$services->set(DowngradeNonCapturingCatchesRector::class);
 	}
 
 	if ($targetPhpVersionId < 70400) {

phpcs.xml

@@ -152,6 +152,11 @@
 			<property name="enable" value="true"/>
 		</properties>
 	</rule>
+	<rule ref="SlevomatCodingStandard.Exceptions.RequireNonCapturingCatch">
+		<properties>
+			<property name="enable" value="true"/>
+		</properties>
+	</rule>
 	<exclude-pattern>tests/*/data</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_1.php</exclude-pattern>
 	<exclude-pattern>tests/e2e/resultCache_2.php</exclude-pattern>

src/Analyser/FileAnalyser.php

@@ -199,11 +199,11 @@ public function analyseFile(
 						if ($dependencies->getExportedNode() !== null) {
 							$exportedNodes[] = $dependencies->getExportedNode();
 						}
-					} catch (AnalysedCodeException $e) {
+					} catch (AnalysedCodeException) {
 						// pass
-					} catch (IdentifierNotFound $e) {
+					} catch (IdentifierNotFound) {
 						// pass
-					} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+					} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection) {
 						// pass
 					}
 				};

src/Analyser/MutatingScope.php

@@ -3866,7 +3866,7 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 
 			try {
 				$expr = $this->parser->parseString('<?php ' . $exprString . ';')[0];
-			} catch (ParserErrorsException $e) {
+			} catch (ParserErrorsException) {
 				continue;
 			}
 			if (!$expr instanceof Node\Stmt\Expression) {
@@ -3928,7 +3928,7 @@ public function invalidateMethodsOnExpression(Expr $expressionToInvalidate): sel
 
 			try {
 				$expr = $this->parser->parseString('<?php ' . $exprString . ';')[0];
-			} catch (ParserErrorsException $e) {
+			} catch (ParserErrorsException) {
 				continue;
 			}
 			if (!$expr instanceof Node\Stmt\Expression) {

src/Analyser/ResultCache/ResultCacheManager.php

@@ -808,7 +808,7 @@ private function getPhpStanVersion(): string
 	{
 		try {
 			return PrettyVersions::getVersion('phpstan/phpstan')->getPrettyVersion();
-		} catch (OutOfBoundsException $e) {
+		} catch (OutOfBoundsException) {
 			return 'Version unknown';
 		}
 	}

src/Command/AnalyseCommand.php

@@ -191,7 +191,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				} elseif ($ci->getCiName() === CiDetector::CI_TEAMCITY) {
 					$errorFormat = 'teamcity';
 				}
-			} catch (CiNotDetectedException $e) {
+			} catch (CiNotDetectedException) {
 				// pass
 			}
 		}

src/Command/ClearResultCacheCommand.php

@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				false,
 				false,
 			);
-		} catch (InceptionNotSuccessfulException $e) {
+		} catch (InceptionNotSuccessfulException) {
 			return 1;
 		}
 

src/Command/CommandHelper.php

@@ -324,7 +324,7 @@ public static function begin(
 				$memoryLimitFileContents = FileReader::read($memoryLimitFile);
 				$errorOutput->writeLineFormatted(sprintf('It consumed around %s of memory.', $memoryLimitFileContents));
 				$errorOutput->writeLineFormatted('');
-			} catch (CouldNotReadFileException $e) {
+			} catch (CouldNotReadFileException) {
 				// pass
 			}
 

src/Command/FixerApplication.php

@@ -268,7 +268,7 @@ public function log(string $message): void
 
 		try {
 			$fixerProcess = $this->getFixerProcess($output, $serverPort);
-		} catch (FixerProcessException $e) {
+		} catch (FixerProcessException) {
 			return 1;
 		}
 
@@ -318,7 +318,7 @@ private function getFixerProcess(OutputInterface $output, int $serverPort): Proc
 
 		try {
 			$phar = new Phar($pharPath);
-		} catch (Throwable $e) {
+		} catch (Throwable) {
 			@unlink($pharPath);
 			@unlink($infoPath);
 			$output->writeln('<fg=red>PHPStan Pro PHAR signature is corrupted.</>');
@@ -407,8 +407,11 @@ private function downloadPhar(
 			),
 		);
 
-		/** @var array{url: string, version: string} $latestInfo */
-		$latestInfo = Json::decode((string) await($client->get('https://fixer-download-api.phpstan.com/latest'), $loop, 5.0)->getBody(), Json::FORCE_ARRAY); // @phpstan-ignore-line
+		/**
+		 * @var array{url: string, version: string} $latestInfo
+		 * @phpstan-ignore-next-line
+		 */
+		$latestInfo = Json::decode((string) await($client->get('https://fixer-download-api.phpstan.com/latest'), $loop, 5.0)->getBody(), Json::FORCE_ARRAY);
 		if ($currentVersion !== null && $latestInfo['version'] === $currentVersion) {
 			$this->writeInfoFile($infoPath, $latestInfo['version']);
 			$output->writeln('<fg=green>You\'re running the latest PHPStan Pro!</>');
@@ -586,7 +589,7 @@ private function getPhpstanVersion(): string
 	{
 		try {
 			return PrettyVersions::getVersion('phpstan/phpstan')->getPrettyVersion();
-		} catch (OutOfBoundsException $e) {
+		} catch (OutOfBoundsException) {
 			return 'Version unknown';
 		}
 	}
@@ -601,7 +604,7 @@ private function isDockerRunning(): bool
 			$contents = FileReader::read('/proc/1/cgroup');
 
 			return strpos($contents, 'docker') !== false;
-		} catch (CouldNotReadFileException $e) {
+		} catch (CouldNotReadFileException) {
 			return false;
 		}
 	}

src/Command/FixerWorkerCommand.php

@@ -122,7 +122,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 				$insteadOfFile,
 				false,
 			);
-		} catch (InceptionNotSuccessfulException $e) {
+		} catch (InceptionNotSuccessfulException) {
 			return 1;
 		}