Leverage non-capturing catches

fancyweb · fancyweb · commit 9ec99bc1d771 · 2022-04-01T09:15:35.000+02:00
diff --git a/Countries.php b/Countries.php
@@ -68,7 +68,7 @@ public static function exists(string $alpha2Code): bool
             self::readEntry(['Names', $alpha2Code]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return false;
         }
     }
@@ -79,7 +79,7 @@ public static function alpha3CodeExists(string $alpha3Code): bool
             self::getAlpha2Code($alpha3Code);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return false;
         }
     }
diff --git a/Currencies.php b/Currencies.php
@@ -42,7 +42,7 @@ public static function exists(string $currency): bool
             self::readEntry(['Names', $currency, self::INDEX_NAME]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return false;
         }
     }
@@ -91,7 +91,7 @@ public static function getFractionDigits(string $currency): int
     {
         try {
             return self::readEntry(['Meta', $currency, self::INDEX_FRACTION_DIGITS], 'meta');
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return self::readEntry(['Meta', 'DEFAULT', self::INDEX_FRACTION_DIGITS], 'meta');
         }
     }
@@ -100,7 +100,7 @@ public static function getRoundingIncrement(string $currency): int
     {
         try {
             return self::readEntry(['Meta', $currency, self::INDEX_ROUNDING_INCREMENT], 'meta');
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return self::readEntry(['Meta', 'DEFAULT', self::INDEX_ROUNDING_INCREMENT], 'meta');
         }
     }
@@ -109,7 +109,7 @@ public static function getCashFractionDigits(string $currency): int
     {
         try {
             return self::readEntry(['Meta', $currency, self::INDEX_CASH_FRACTION_DIGITS], 'meta');
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return self::readEntry(['Meta', 'DEFAULT', self::INDEX_CASH_FRACTION_DIGITS], 'meta');
         }
     }
@@ -118,7 +118,7 @@ public static function getCashRoundingIncrement(string $currency): int
     {
         try {
             return self::readEntry(['Meta', $currency, self::INDEX_CASH_ROUNDING_INCREMENT], 'meta');
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return self::readEntry(['Meta', 'DEFAULT', self::INDEX_CASH_ROUNDING_INCREMENT], 'meta');
         }
     }
diff --git a/Data/Bundle/Reader/IntlBundleReader.php b/Data/Bundle/Reader/IntlBundleReader.php
@@ -33,7 +33,7 @@ public function read(string $path, string $locale): mixed
         try {
             // Never enable fallback. We want to know if a bundle cannot be found
             $bundle = new \ResourceBundle($locale, $path, false);
-        } catch (\Exception $e) {
+        } catch (\Exception) {
             $bundle = null;
         }
 
diff --git a/Data/Generator/LocaleDataGenerator.php b/Data/Generator/LocaleDataGenerator.php
@@ -100,7 +100,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
                 // Script, Region and Variants are optional. If none of them is
                 // available, the braces are not printed.
                 $localeNames[$locale] = $this->generateLocaleName($reader, $tempDir, $locale, $displayLocale, $pattern, $separator);
-            } catch (MissingResourceException $e) {
+            } catch (MissingResourceException) {
                 // Silently ignore incomplete locale names
                 // In this case one should configure at least one fallback locale that is complete (e.g. English) during
                 // runtime. Alternatively a translation for the missing resource can be proposed upstream.
diff --git a/Data/Generator/TimezoneDataGenerator.php b/Data/Generator/TimezoneDataGenerator.php
@@ -182,7 +182,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
             if (isset($this->zoneToCountryMapping[$id])) {
                 try {
                     $country = $reader->readEntry($tempDir.'/region', $locale, ['Countries', $this->zoneToCountryMapping[$id]]);
-                } catch (MissingResourceException $e) {
+                } catch (MissingResourceException) {
                     return null;
                 }
 
@@ -200,7 +200,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD
             foreach (\func_get_args() as $indices) {
                 try {
                     return $reader->readEntry($tempDir, $locale, $indices);
-                } catch (MissingResourceException $e) {
+                } catch (MissingResourceException) {
                 }
             }
 
diff --git a/Intl.php b/Intl.php
@@ -84,7 +84,7 @@ public static function getIcuVersion(): ?string
                     preg_match('/^ICU version (?:=>)?(.*)$/m', $output, $matches);
 
                     self::$icuVersion = trim($matches[1]);
-                } catch (\ReflectionException $e) {
+                } catch (\ReflectionException) {
                     self::$icuVersion = null;
                 }
             }
diff --git a/Languages.php b/Languages.php
@@ -44,7 +44,7 @@ public static function exists(string $language): bool
             self::readEntry(['Names', $language]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return false;
         }
     }
@@ -60,7 +60,7 @@ public static function getName(string $language, string $displayLocale = null):
     {
         try {
             return self::readEntry(['Names', $language], $displayLocale);
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             try {
                 return self::readEntry(['LocalizedNames', $language], $displayLocale);
             } catch (MissingResourceException $e) {
@@ -124,7 +124,7 @@ public static function alpha3CodeExists(string $language): bool
             self::getAlpha2Code($language);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             static $cache;
             if (null === $cache) {
                 $cache = array_flip(self::getAlpha3Codes());
@@ -170,7 +170,7 @@ public static function getAlpha3Names(string $displayLocale = null): array
             }
             try {
                 $alpha3Names[self::getAlpha3Code($alpha2Code)] = $name;
-            } catch (MissingResourceException $e) {
+            } catch (MissingResourceException) {
             }
         }
 
diff --git a/Locales.php b/Locales.php
@@ -43,7 +43,7 @@ public static function exists(string $locale): bool
             self::readEntry(['Names', $locale]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return \in_array($locale, self::getAliases(), true);
         }
     }
diff --git a/Scripts.php b/Scripts.php
@@ -35,7 +35,7 @@ public static function exists(string $script): bool
             self::readEntry(['Names', $script]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             return false;
         }
     }
diff --git a/Timezones.php b/Timezones.php
@@ -35,12 +35,12 @@ public static function exists(string $timezone): bool
             self::readEntry(['Names', $timezone]);
 
             return true;
-        } catch (MissingResourceException $e) {
+        } catch (MissingResourceException) {
             try {
                 new \DateTimeZone($timezone);
 
                 return true;
-            } catch (\Exception $e) {
+            } catch (\Exception) {
                 return false;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static function exists(string $alpha2Code): bool`
`68`	`68`	`self::readEntry(['Names', $alpha2Code]);`
`69`	`69`
`70`	`70`	`return true;`
`71`		`- } catch (MissingResourceException $e) {`
	`71`	`+ } catch (MissingResourceException) {`
`72`	`72`	`return false;`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -79,7 +79,7 @@ public static function alpha3CodeExists(string $alpha3Code): bool`
`79`	`79`	`self::getAlpha2Code($alpha3Code);`
`80`	`80`
`81`	`81`	`return true;`
`82`		`- } catch (MissingResourceException $e) {`
	`82`	`+ } catch (MissingResourceException) {`
`83`	`83`	`return false;`
`84`	`84`	`}`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public static function exists(string $currency): bool`
`42`	`42`	`self::readEntry(['Names', $currency, self::INDEX_NAME]);`
`43`	`43`
`44`	`44`	`return true;`
`45`		`- } catch (MissingResourceException $e) {`
	`45`	`+ } catch (MissingResourceException) {`
`46`	`46`	`return false;`
`47`	`47`	`}`
`48`	`48`	`}`
`@@ -91,7 +91,7 @@ public static function getFractionDigits(string $currency): int`
`91`	`91`	`{`
`92`	`92`	`try {`
`93`	`93`	`return self::readEntry(['Meta', $currency, self::INDEX_FRACTION_DIGITS], 'meta');`
`94`		`- } catch (MissingResourceException $e) {`
	`94`	`+ } catch (MissingResourceException) {`
`95`	`95`	`return self::readEntry(['Meta', 'DEFAULT', self::INDEX_FRACTION_DIGITS], 'meta');`
`96`	`96`	`}`
`97`	`97`	`}`
`@@ -100,7 +100,7 @@ public static function getRoundingIncrement(string $currency): int`
`100`	`100`	`{`
`101`	`101`	`try {`
`102`	`102`	`return self::readEntry(['Meta', $currency, self::INDEX_ROUNDING_INCREMENT], 'meta');`
`103`		`- } catch (MissingResourceException $e) {`
	`103`	`+ } catch (MissingResourceException) {`
`104`	`104`	`return self::readEntry(['Meta', 'DEFAULT', self::INDEX_ROUNDING_INCREMENT], 'meta');`
`105`	`105`	`}`
`106`	`106`	`}`
`@@ -109,7 +109,7 @@ public static function getCashFractionDigits(string $currency): int`
`109`	`109`	`{`
`110`	`110`	`try {`
`111`	`111`	`return self::readEntry(['Meta', $currency, self::INDEX_CASH_FRACTION_DIGITS], 'meta');`
`112`		`- } catch (MissingResourceException $e) {`
	`112`	`+ } catch (MissingResourceException) {`
`113`	`113`	`return self::readEntry(['Meta', 'DEFAULT', self::INDEX_CASH_FRACTION_DIGITS], 'meta');`
`114`	`114`	`}`
`115`	`115`	`}`
`@@ -118,7 +118,7 @@ public static function getCashRoundingIncrement(string $currency): int`
`118`	`118`	`{`
`119`	`119`	`try {`
`120`	`120`	`return self::readEntry(['Meta', $currency, self::INDEX_CASH_ROUNDING_INCREMENT], 'meta');`
`121`		`- } catch (MissingResourceException $e) {`
	`121`	`+ } catch (MissingResourceException) {`
`122`	`122`	`return self::readEntry(['Meta', 'DEFAULT', self::INDEX_CASH_ROUNDING_INCREMENT], 'meta');`
`123`	`123`	`}`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function read(string $path, string $locale): mixed`
`33`	`33`	`try {`
`34`	`34`	`// Never enable fallback. We want to know if a bundle cannot be found`
`35`	`35`	`$bundle = new \ResourceBundle($locale, $path, false);`
`36`		`- } catch (\Exception $e) {`
	`36`	`+ } catch (\Exception) {`
`37`	`37`	`$bundle = null;`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD`
`182`	`182`	`if (isset($this->zoneToCountryMapping[$id])) {`
`183`	`183`	`try {`
`184`	`184`	`$country = $reader->readEntry($tempDir.'/region', $locale, ['Countries', $this->zoneToCountryMapping[$id]]);`
`185`		`- } catch (MissingResourceException $e) {`
	`185`	`+ } catch (MissingResourceException) {`
`186`	`186`	`return null;`
`187`	`187`	`}`
`188`	`188`
`@@ -200,7 +200,7 @@ private function generateZones(BundleEntryReaderInterface $reader, string $tempD`
`200`	`200`	`foreach (\func_get_args() as $indices) {`
`201`	`201`	`try {`
`202`	`202`	`return $reader->readEntry($tempDir, $locale, $indices);`
`203`		`- } catch (MissingResourceException $e) {`
	`203`	`+ } catch (MissingResourceException) {`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public static function getIcuVersion(): ?string`
`84`	`84`	`preg_match('/^ICU version (?:=>)?(.*)$/m', $output, $matches);`
`85`	`85`
`86`	`86`	`self::$icuVersion = trim($matches[1]);`
`87`		`- } catch (\ReflectionException $e) {`
	`87`	`+ } catch (\ReflectionException) {`
`88`	`88`	`self::$icuVersion = null;`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static function exists(string $language): bool`
`44`	`44`	`self::readEntry(['Names', $language]);`
`45`	`45`
`46`	`46`	`return true;`
`47`		`- } catch (MissingResourceException $e) {`
	`47`	`+ } catch (MissingResourceException) {`
`48`	`48`	`return false;`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -60,7 +60,7 @@ public static function getName(string $language, string $displayLocale = null):`
`60`	`60`	`{`
`61`	`61`	`try {`
`62`	`62`	`return self::readEntry(['Names', $language], $displayLocale);`
`63`		`- } catch (MissingResourceException $e) {`
	`63`	`+ } catch (MissingResourceException) {`
`64`	`64`	`try {`
`65`	`65`	`return self::readEntry(['LocalizedNames', $language], $displayLocale);`
`66`	`66`	`} catch (MissingResourceException $e) {`
`@@ -124,7 +124,7 @@ public static function alpha3CodeExists(string $language): bool`
`124`	`124`	`self::getAlpha2Code($language);`
`125`	`125`
`126`	`126`	`return true;`
`127`		`- } catch (MissingResourceException $e) {`
	`127`	`+ } catch (MissingResourceException) {`
`128`	`128`	`static $cache;`
`129`	`129`	`if (null === $cache) {`
`130`	`130`	`$cache = array_flip(self::getAlpha3Codes());`
`@@ -170,7 +170,7 @@ public static function getAlpha3Names(string $displayLocale = null): array`
`170`	`170`	`}`
`171`	`171`	`try {`
`172`	`172`	`$alpha3Names[self::getAlpha3Code($alpha2Code)] = $name;`
`173`		`- } catch (MissingResourceException $e) {`
	`173`	`+ } catch (MissingResourceException) {`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static function exists(string $locale): bool`
`43`	`43`	`self::readEntry(['Names', $locale]);`
`44`	`44`
`45`	`45`	`return true;`
`46`		`- } catch (MissingResourceException $e) {`
	`46`	`+ } catch (MissingResourceException) {`
`47`	`47`	`return \in_array($locale, self::getAliases(), true);`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static function exists(string $script): bool`
`35`	`35`	`self::readEntry(['Names', $script]);`
`36`	`36`
`37`	`37`	`return true;`
`38`		`- } catch (MissingResourceException $e) {`
	`38`	`+ } catch (MissingResourceException) {`
`39`	`39`	`return false;`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@ public static function exists(string $timezone): bool`
`35`	`35`	`self::readEntry(['Names', $timezone]);`
`36`	`36`
`37`	`37`	`return true;`
`38`		`- } catch (MissingResourceException $e) {`
	`38`	`+ } catch (MissingResourceException) {`
`39`	`39`	`try {`
`40`	`40`	`new \DateTimeZone($timezone);`
`41`	`41`
`42`	`42`	`return true;`
`43`		`- } catch (\Exception $e) {`
	`43`	`+ } catch (\Exception) {`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`	`46`	`}`