Require non-capturing catch

rajyan · Dec 18, 2021 · 89af4e7 · 89af4e7
1 parent f8c1bef
commit 89af4e7
Show file tree

Hide file tree

Showing 37 changed files with 67 additions and 57 deletions.
diff --git a/build/rector-downgrade.php b/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) {

diff --git a/phpcs.xml b/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>

diff --git a/src/Analyser/FileAnalyser.php b/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
 					}
 				};

diff --git a/src/Analyser/MutatingScope.php b/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) {

diff --git a/src/Analyser/ResultCache/ResultCacheManager.php b/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';
 		}
 	}

diff --git a/src/Command/AnalyseCommand.php b/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
 			}
 		}

diff --git a/src/Command/ClearResultCacheCommand.php b/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;
 		}
 

diff --git a/src/Command/CommandHelper.php b/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
 			}
 

diff --git a/src/Command/FixerApplication.php b/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;
 		}
 	}

diff --git a/src/Command/FixerWorkerCommand.php b/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;
 		}
 

diff --git a/src/Command/IgnoredRegexValidator.php b/src/Command/IgnoredRegexValidator.php
@@ -88,7 +88,7 @@ private function getIgnoredTypes(TreeNode $ast): array
 
 			try {
 				$type = $this->typeStringResolver->resolve($matches[1], null);
-			} catch (ParserException $e) {
+			} catch (ParserException) {
 				continue;
 			}
 

diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -98,7 +98,7 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 			if ($functionName instanceof Node\Name) {
 				try {
 					$dependenciesReflections[] = $this->getFunctionReflection($functionName, $scope);
-				} catch (FunctionNotFoundException $e) {
+				} catch (FunctionNotFoundException) {
 					// pass
 				}
 			} else {
@@ -224,7 +224,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 	{
 		try {
 			$classReflection = $this->reflectionProvider->getClass($className);
-		} catch (ClassNotFoundException $e) {
+		} catch (ClassNotFoundException) {
 			return;
 		}
 

diff --git a/src/Dependency/ExportedNodeFetcher.php b/src/Dependency/ExportedNodeFetcher.php
@@ -34,7 +34,7 @@ public function fetchNodes(string $fileName): array
 		try {
 			/** @var Node[] $ast */
 			$ast = $this->parser->parseFile($fileName);
-		} catch (ParserErrorsException $e) {
+		} catch (ParserErrorsException) {
 			return [];
 		}
 		$this->visitor->reset($fileName);

diff --git a/src/Php/PhpVersionFactoryFactory.php b/src/Php/PhpVersionFactoryFactory.php
@@ -44,7 +44,7 @@ public function create(): PhpVersionFactory
 					if (is_string($platformVersion)) {
 						$composerPhpVersion = $platformVersion;
 					}
-				} catch (CouldNotReadFileException | JsonException $e) {
+				} catch (CouldNotReadFileException | JsonException) {
 					// pass
 				}
 			}

diff --git a/src/Reflection/BetterReflection/BetterReflectionProvider.php b/src/Reflection/BetterReflection/BetterReflectionProvider.php
@@ -139,9 +139,9 @@ public function hasClass(string $className): bool
 		try {
 			$this->reflector->reflectClass($className);
 			return true;
-		} catch (IdentifierNotFound $e) {
+		} catch (IdentifierNotFound) {
 			return false;
-		} catch (InvalidIdentifierName $e) {
+		} catch (InvalidIdentifierName) {
 			return false;
 		}
 	}
@@ -154,7 +154,7 @@ public function getClass(string $className): ClassReflection
 
 		try {
 			$reflectionClass = $this->reflector->reflectClass($className);
-		} catch (IdentifierNotFound $e) {
+		} catch (IdentifierNotFound) {
 			throw new ClassNotFoundException($className);
 		}
 
@@ -336,9 +336,9 @@ public function resolveFunctionName(Node\Name $nameNode, ?Scope $scope): ?string
 			try {
 				$this->reflector->reflectFunction($name);
 				return true;
-			} catch (IdentifierNotFound $e) {
+			} catch (IdentifierNotFound) {
 				// pass
-			} catch (InvalidIdentifierName $e) {
+			} catch (InvalidIdentifierName) {
 				// pass
 			}
 
@@ -370,7 +370,7 @@ public function getConstant(Node\Name $nameNode, ?Scope $scope): GlobalConstantR
 			$constantValue = $constantReflection->getValue();
 			$constantValueType = ConstantTypeHelper::getTypeFromValue($constantValue);
 			$fileName = $constantReflection->getFileName();
-		} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+		} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection) {
 			$constantValueType = new MixedType();
 			$fileName = null;
 		}
@@ -388,9 +388,9 @@ public function resolveConstantName(Node\Name $nameNode, ?Scope $scope): ?string
 			try {
 				$this->reflector->reflectConstant($name);
 				return true;
-			} catch (IdentifierNotFound $e) {
+			} catch (IdentifierNotFound) {
 				// pass
-			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection $e) {
+			} catch (UnableToCompileNode | NotAClassReflection | NotAnInterfaceReflection) {
 				// pass
 			}
 			return false;

diff --git a/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php b/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
@@ -83,7 +83,7 @@ public function enterNode(Node $node): ?int
 		if ($node instanceof Node\Expr\FuncCall) {
 			try {
 				ConstantNodeChecker::assertValidDefineFunctionCall($node);
-			} catch (InvalidConstantNode $e) {
+			} catch (InvalidConstantNode) {
 				return null;
 			}
 

diff --git a/...lection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php b/...lection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php
@@ -56,14 +56,14 @@ public function create(string $projectInstallationPath): ?SourceLocator
 		try {
 			$composerJsonContents = FileReader::read($composerJsonPath);
 			$composer = Json::decode($composerJsonContents, Json::FORCE_ARRAY);
-		} catch (CouldNotReadFileException | JsonException $e) {
+		} catch (CouldNotReadFileException | JsonException) {
 			return null;
 		}
 
 		try {
 			$installedJsonContents = FileReader::read($installedJsonPath);
 			$installedJson = Json::decode($installedJsonContents, Json::FORCE_ARRAY);
-		} catch (CouldNotReadFileException | JsonException $e) {
+		} catch (CouldNotReadFileException | JsonException) {
 			return null;
 		}
 

diff --git a/src/Reflection/BetterReflection/SourceLocator/FileNodesFetcher.php b/src/Reflection/BetterReflection/SourceLocator/FileNodesFetcher.php
@@ -34,7 +34,7 @@ public function fetchNodes(string $fileName): FetchedNodesResult
 		try {
 			/** @var Node[] $ast */
 			$ast = $this->parser->parseFile($fileName);
-		} catch (ParserErrorsException $e) {
+		} catch (ParserErrorsException) {
 			return new FetchedNodesResult([], [], []);
 		}
 		$this->cachingVisitor->reset($fileName, $contents);

diff --git a/src/Reflection/ClassConstantReflection.php b/src/Reflection/ClassConstantReflection.php
@@ -66,7 +66,7 @@ public function getValue()
 	{
 		try {
 			return $this->reflection->getValue();
-		} catch (UnableToCompileNode $e) {
+		} catch (UnableToCompileNode) {
 			return NAN;
 		}
 	}

diff --git a/src/Reflection/ClassReflection.php b/src/Reflection/ClassReflection.php
@@ -571,7 +571,7 @@ public function isSubclassOf(string $className): bool
 
 		try {
 			return $this->subclasses[$className] = $this->reflection->isSubclassOf($className);
-		} catch (ReflectionException $e) {
+		} catch (ReflectionException) {
 			return $this->subclasses[$className] = false;
 		}
 	}
@@ -580,7 +580,7 @@ public function implementsInterface(string $className): bool
 	{
 		try {
 			return $this->reflection->implementsInterface($className);
-		} catch (ReflectionException $e) {
+		} catch (ReflectionException) {
 			return false;
 		}
 	}
@@ -884,7 +884,7 @@ public function getTypeAliases(): array
 
 				try {
 					$typeAliases = $importedFromReflection->getTypeAliases();
-				} catch (CircularTypeAliasDefinitionException $e) {
+				} catch (CircularTypeAliasDefinitionException) {
 					return TypeAlias::invalid();
 				}
 

diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -103,7 +103,7 @@ public function getPrototype(): ClassMemberReflection
 				$prototypeDeclaringClass->getNativeMethod($prototypeMethod->getName())->getVariants(),
 				$tentativeReturnType,
 			);
-		} catch (ReflectionException $e) {
+		} catch (ReflectionException) {
 			return $this;
 		}
 	}

diff --git a/src/Reflection/Php/PhpMethodFromParserNodeReflection.php b/src/Reflection/Php/PhpMethodFromParserNodeReflection.php
@@ -98,7 +98,7 @@ public function getPrototype(): ClassMemberReflection
 	{
 		try {
 			return $this->declaringClass->getNativeMethod($this->getClassMethod()->name->name)->getPrototype();
-		} catch (MissingMethodFromReflectionException $e) {
+		} catch (MissingMethodFromReflectionException) {
 			return $this;
 		}
 	}

diff --git a/src/Reflection/Php/PhpMethodReflection.php b/src/Reflection/Php/PhpMethodReflection.php
@@ -177,7 +177,7 @@ public function getPrototype(): ClassMemberReflection
 				$prototypeDeclaringClass->getNativeMethod($prototypeMethod->getName())->getVariants(),
 				$tentativeReturnType,
 			);
-		} catch (ReflectionException $e) {
+		} catch (ReflectionException) {
 			return $this;
 		}
 	}

diff --git a/src/Reflection/Php/PhpParameterReflection.php b/src/Reflection/Php/PhpParameterReflection.php
@@ -55,7 +55,7 @@ public function getType(): Type
 					if ($this->reflection->isDefaultValueAvailable() && $this->reflection->getDefaultValue() === null) {
 						$phpDocType = TypeCombinator::addNull($phpDocType);
 					}
-				} catch (Throwable $e) {
+				} catch (Throwable) {
 					// pass
 				}
 			}
@@ -113,7 +113,7 @@ public function getDefaultValue(): ?Type
 				$defaultValue = $this->reflection->getDefaultValue();
 				return ConstantTypeHelper::getTypeFromValue($defaultValue);
 			}
-		} catch (Throwable $e) {
+		} catch (Throwable) {
 			return null;
 		}
 

diff --git a/src/Reflection/SignatureMap/NativeFunctionReflectionProvider.php b/src/Reflection/SignatureMap/NativeFunctionReflectionProvider.php
@@ -158,9 +158,9 @@ public function findFunctionReflection(string $functionName): ?NativeFunctionRef
 				}
 				$isDeprecated = $reflectionFunction->isDeprecated();
 			}
-		} catch (IdentifierNotFound $e) {
+		} catch (IdentifierNotFound) {
 			// pass
-		} catch (InvalidIdentifierName $e) {
+		} catch (InvalidIdentifierName) {
 			// pass
 		}
 

diff --git a/src/Rules/Api/PhpStanNamespaceIn3rdPartyPackageRule.php b/src/Rules/Api/PhpStanNamespaceIn3rdPartyPackageRule.php
@@ -81,9 +81,9 @@ private function findComposerJsonContents(string $fromDirectory): ?array
 
 		try {
 			return Json::decode(FileReader::read($composerJsonPath), Json::FORCE_ARRAY);
-		} catch (JsonException $e) {
+		} catch (JsonException) {
 			return null;
-		} catch (CouldNotReadFileException $e) {
+		} catch (CouldNotReadFileException) {
 			return null;
 		}
 	}