Leverage non-capturing catches

fancyweb · fancyweb · commit 2f62d5af2f9d · 2022-04-01T09:15:35.000+02:00
diff --git a/CacheWarmer/AbstractPhpFileCacheWarmer.php b/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -78,7 +78,7 @@ final protected function ignoreAutoloadException(string $class, \Exception $exce
     {
         try {
             ClassExistenceResource::throwOnRequiredClass($class, $exception);
-        } catch (\ReflectionException $e) {
+        } catch (\ReflectionException) {
         }
     }
 
diff --git a/CacheWarmer/AnnotationsCacheWarmer.php b/CacheWarmer/AnnotationsCacheWarmer.php
@@ -85,7 +85,7 @@ private function readAllComponents(Reader $reader, string $class)
 
         try {
             $reader->getClassAnnotations($reflectionClass);
-        } catch (AnnotationException $e) {
+        } catch (AnnotationException) {
             /*
              * Ignore any AnnotationException to not break the cache warming process if an Annotation is badly
              * configured or could not be found / read / etc.
@@ -99,14 +99,14 @@ private function readAllComponents(Reader $reader, string $class)
         foreach ($reflectionClass->getMethods() as $reflectionMethod) {
             try {
                 $reader->getMethodAnnotations($reflectionMethod);
-            } catch (AnnotationException $e) {
+            } catch (AnnotationException) {
             }
         }
 
         foreach ($reflectionClass->getProperties() as $reflectionProperty) {
             try {
                 $reader->getPropertyAnnotations($reflectionProperty);
-            } catch (AnnotationException $e) {
+            } catch (AnnotationException) {
             }
         }
     }
diff --git a/CacheWarmer/SerializerCacheWarmer.php b/CacheWarmer/SerializerCacheWarmer.php
@@ -54,7 +54,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
             foreach ($loader->getMappedClasses() as $mappedClass) {
                 try {
                     $metadataFactory->getMetadataFor($mappedClass);
-                } catch (AnnotationException $e) {
+                } catch (AnnotationException) {
                     // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
diff --git a/CacheWarmer/ValidatorCacheWarmer.php b/CacheWarmer/ValidatorCacheWarmer.php
@@ -57,7 +57,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool
                     if ($metadataFactory->hasMetadataFor($mappedClass)) {
                         $metadataFactory->getMetadataFor($mappedClass);
                     }
-                } catch (AnnotationException $e) {
+                } catch (AnnotationException) {
                     // ignore failing annotations
                 } catch (\Exception $e) {
                     $this->ignoreAutoloadException($mappedClass, $e);
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -202,7 +202,7 @@ private function relativeSymlinkWithFallback(string $originDir, string $targetDi
         try {
             $this->symlink($originDir, $targetDir, true);
             $method = self::METHOD_RELATIVE_SYMLINK;
-        } catch (IOException $e) {
+        } catch (IOException) {
             $method = $this->absoluteSymlinkWithFallback($originDir, $targetDir);
         }
 
@@ -219,7 +219,7 @@ private function absoluteSymlinkWithFallback(string $originDir, string $targetDi
         try {
             $this->symlink($originDir, $targetDir);
             $method = self::METHOD_ABSOLUTE_SYMLINK;
-        } catch (IOException $e) {
+        } catch (IOException) {
             // fall back to copy
             $method = $this->hardCopy($originDir, $targetDir);
         }
diff --git a/Command/ConfigDebugCommand.php b/Command/ConfigDebugCommand.php
@@ -195,7 +195,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
                 $config = $this->getConfig($this->findExtension($name), $this->compileContainer());
                 $paths = array_keys(self::buildPathsCompletion($config));
                 $suggestions->suggestValues($paths);
-            } catch (LogicException $e) {
+            } catch (LogicException) {
             }
         }
     }
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
@@ -153,7 +153,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                 if ($this->defaultViewsPath) {
                     $codePaths[] = $this->defaultViewsPath;
                 }
-            } catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException) {
                 // such a bundle does not exist, so treat the argument as path
                 $path = $input->getArgument('bundle');
 
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -186,7 +186,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
                     $codePaths[] = $this->defaultViewsPath;
                 }
                 $currentName = $foundBundle->getName();
-            } catch (\InvalidArgumentException $e) {
+            } catch (\InvalidArgumentException) {
                 // such a bundle does not exist, so treat the argument as path
                 $path = $input->getArgument('bundle');
 
diff --git a/Console/Descriptor/Descriptor.php b/Console/Descriptor/Descriptor.php
@@ -299,7 +299,7 @@ public static function getClassDescription(string $class, string &$resolvedClass
 
                 return trim(preg_replace('#\s*\n\s*\*\s*#', ' ', $docComment));
             }
-        } catch (\ReflectionException $e) {
+        } catch (\ReflectionException) {
         }
 
         return '';
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -563,7 +563,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, cal
             } else {
                 $r = new \ReflectionFunction($controller);
             }
-        } catch (\ReflectionException $e) {
+        } catch (\ReflectionException) {
             if (\is_array($controller)) {
                 $controller = implode('::', $controller);
             }
@@ -582,7 +582,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, cal
 
             try {
                 $r = new \ReflectionMethod($container->findDefinition($id)->getClass(), $method);
-            } catch (\ReflectionException $e) {
+            } catch (\ReflectionException) {
                 return $anchorText;
             }
         }
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -76,7 +76,7 @@ public function getRouteCollection(): RouteCollection
                 } else {
                     $this->collection->addResource(new FileExistenceResource($containerFile));
                 }
-            } catch (ParameterNotFoundException $exception) {
+            } catch (ParameterNotFoundException) {
             }
         }
 
diff --git a/Secrets/SodiumVault.php b/Secrets/SodiumVault.php
@@ -51,7 +51,7 @@ public function generateKeys(bool $override = false): bool
 
         try {
             $this->loadKeys();
-        } catch (\RuntimeException $e) {
+        } catch (\RuntimeException) {
             // ignore failures to load keys
         }
 
diff --git a/Test/WebTestCase.php b/Test/WebTestCase.php
@@ -45,7 +45,7 @@ protected static function createClient(array $options = [], array $server = []):
 
         try {
             $client = $kernel->getContainer()->get('test.client');
-        } catch (ServiceNotFoundException $e) {
+        } catch (ServiceNotFoundException) {
             if (class_exists(KernelBrowser::class)) {
                 throw new \LogicException('You cannot create the client used in functional tests if the "framework.test" config is not set to true.');
             }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ final protected function ignoreAutoloadException(string $class, \Exception $exce`
`78`	`78`	`{`
`79`	`79`	`try {`
`80`	`80`	`ClassExistenceResource::throwOnRequiredClass($class, $exception);`
`81`		`- } catch (\ReflectionException $e) {`
	`81`	`+ } catch (\ReflectionException) {`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private function readAllComponents(Reader $reader, string $class)`
`85`	`85`
`86`	`86`	`try {`
`87`	`87`	`$reader->getClassAnnotations($reflectionClass);`
`88`		`- } catch (AnnotationException $e) {`
	`88`	`+ } catch (AnnotationException) {`
`89`	`89`	`/*`
`90`	`90`	`* Ignore any AnnotationException to not break the cache warming process if an Annotation is badly`
`91`	`91`	`* configured or could not be found / read / etc.`
`@@ -99,14 +99,14 @@ private function readAllComponents(Reader $reader, string $class)`
`99`	`99`	`foreach ($reflectionClass->getMethods() as $reflectionMethod) {`
`100`	`100`	`try {`
`101`	`101`	`$reader->getMethodAnnotations($reflectionMethod);`
`102`		`- } catch (AnnotationException $e) {`
	`102`	`+ } catch (AnnotationException) {`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`foreach ($reflectionClass->getProperties() as $reflectionProperty) {`
`107`	`107`	`try {`
`108`	`108`	`$reader->getPropertyAnnotations($reflectionProperty);`
`109`		`- } catch (AnnotationException $e) {`
	`109`	`+ } catch (AnnotationException) {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected function doWarmUp(string $cacheDir, ArrayAdapter $arrayAdapter): bool`
`57`	`57`	`if ($metadataFactory->hasMetadataFor($mappedClass)) {`
`58`	`58`	`$metadataFactory->getMetadataFor($mappedClass);`
`59`	`59`	`}`
`60`		`- } catch (AnnotationException $e) {`
	`60`	`+ } catch (AnnotationException) {`
`61`	`61`	`// ignore failing annotations`
`62`	`62`	`} catch (\Exception $e) {`
`63`	`63`	`$this->ignoreAutoloadException($mappedClass, $e);`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti`
`195`	`195`	`$config = $this->getConfig($this->findExtension($name), $this->compileContainer());`
`196`	`196`	`$paths = array_keys(self::buildPathsCompletion($config));`
`197`	`197`	`$suggestions->suggestValues($paths);`
`198`		`- } catch (LogicException $e) {`
	`198`	`+ } catch (LogicException) {`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`153`	`153`	`if ($this->defaultViewsPath) {`
`154`	`154`	`$codePaths[] = $this->defaultViewsPath;`
`155`	`155`	`}`
`156`		`- } catch (\InvalidArgumentException $e) {`
	`156`	`+ } catch (\InvalidArgumentException) {`
`157`	`157`	`// such a bundle does not exist, so treat the argument as path`
`158`	`158`	`$path = $input->getArgument('bundle');`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`186`	`186`	`$codePaths[] = $this->defaultViewsPath;`
`187`	`187`	`}`
`188`	`188`	`$currentName = $foundBundle->getName();`
`189`		`- } catch (\InvalidArgumentException $e) {`
	`189`	`+ } catch (\InvalidArgumentException) {`
`190`	`190`	`// such a bundle does not exist, so treat the argument as path`
`191`	`191`	`$path = $input->getArgument('bundle');`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ public static function getClassDescription(string $class, string &$resolvedClass`
`299`	`299`
`300`	`300`	`return trim(preg_replace('#\s\n\s\\s#', ' ', $docComment));`
`301`	`301`	`}`
`302`		`- } catch (\ReflectionException $e) {`
	`302`	`+ } catch (\ReflectionException) {`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, cal`
`563`	`563`	`} else {`
`564`	`564`	`$r = new \ReflectionFunction($controller);`
`565`	`565`	`}`
`566`		`- } catch (\ReflectionException $e) {`
	`566`	`+ } catch (\ReflectionException) {`
`567`	`567`	`if (\is_array($controller)) {`
`568`	`568`	`$controller = implode('::', $controller);`
`569`	`569`	`}`
`@@ -582,7 +582,7 @@ private function formatControllerLink(mixed $controller, string $anchorText, cal`
`582`	`582`
`583`	`583`	`try {`
`584`	`584`	`$r = new \ReflectionMethod($container->findDefinition($id)->getClass(), $method);`
`585`		`- } catch (\ReflectionException $e) {`
	`585`	`+ } catch (\ReflectionException) {`
`586`	`586`	`return $anchorText;`
`587`	`587`	`}`
`588`	`588`	`}`