rector: CatchExceptionNameMatchingTypeRector (#5015)

* rector: `CatchExceptionNameMatchingTypeRector`

* phpstan

Author: sreichel

.phpmd.dist.xml

@@ -76,7 +76,7 @@
     [-] LongClassName
     [x] ShortClassName
     [-] LongVariable
-    [x] ShortVariable
+    [-] ShortVariable
     [x] ShortMethodName - TMP disabled
     -->
     <rule ref="rulesets/naming.xml">

.rector.php

@@ -71,7 +71,6 @@
             CodeQuality\Ternary\TernaryEmptyArrayArrayDimFetchToCoalesceRector::class, # todo: TMP
             CodeQuality\Ternary\UnnecessaryTernaryExpressionRector::class, # todo: TMP
             CodingStyle\Assign\SplitDoubleAssignRector::class, # todo: TMP
-            CodingStyle\Catch_\CatchExceptionNameMatchingTypeRector::class, # todo: TMP
             CodingStyle\ClassMethod\FuncGetArgsToVariadicParamRector::class, # todo: TMP
             CodingStyle\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector::class, # todo: TMP
             CodingStyle\Encapsed\EncapsedStringsToSprintfRector::class, # todo: TMP

app/code/core/Mage/Admin/Model/Acl/Role/Registry.php

@@ -30,8 +30,8 @@ public function addParent($role, $parents)
                 $roleId = $role;
                 $role = $this->get($role);
             }
-        } catch (Zend_Acl_Role_Registry_Exception $e) {
-            throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist", $e->getCode(), $e);
+        } catch (Zend_Acl_Role_Registry_Exception $zendAclRoleRegistryException) {
+            throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist", $zendAclRoleRegistryException->getCode(), $zendAclRoleRegistryException);
         }
 
         if (!is_array($parents)) {

app/code/core/Mage/Admin/Model/Resource/User.php

@@ -175,9 +175,9 @@ public function delete(Mage_Core_Model_Abstract $user)
             $adapter->delete($this->getMainTable(), $conditions);
             $adapter->delete($this->getTable('admin/role'), $conditions);
             $adapter->commit();
-        } catch (Throwable $e) {
+        } catch (Throwable $throwable) {
             $adapter->rollBack();
-            throw $e;
+            throw $throwable;
         }
 
         $this->_afterDelete($user);

app/code/core/Mage/Admin/Model/User.php

@@ -404,9 +404,9 @@ public function authenticate($username, $password)
                 'user'     => $this,
                 'result'   => $result,
             ]);
-        } catch (Mage_Core_Exception $e) {
+        } catch (Mage_Core_Exception $mageCoreException) {
             $this->unsetData();
-            throw $e;
+            throw $mageCoreException;
         }
 
         if (!$result) {

app/code/core/Mage/Adminhtml/Block/Widget/Grid.php

@@ -777,9 +777,9 @@ protected function _beforeToHtml()
     {
         try {
             $this->_prepareGrid();
-        } catch (Exception $e) {
+        } catch (Exception $exception) {
             $this->resetSavedParametersInSession();
-            throw $e;
+            throw $exception;
         }
 
         return parent::_beforeToHtml();

app/code/core/Mage/Adminhtml/Helper/Catalog/Product/Composite.php

@@ -125,10 +125,10 @@ public function renderConfigureResult($controller, Varien_Object $configureResul
 
             $isOk = true;
             $productType = $product->getTypeId();
-        } catch (Exception $e) {
+        } catch (Exception $exception) {
             $isOk = false;
             $productType = null;
-            Mage::register('composite_configure_result_error_message', $e->getMessage());
+            Mage::register('composite_configure_result_error_message', $exception->getMessage());
         }
 
         $this->_initConfigureResultLayout($controller, $isOk, $productType);

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php

@@ -40,8 +40,8 @@ protected function _afterSave()
                 ->setValue($cronExprString)
                 ->setPath(self::CRON_STRING_PATH)
                 ->save();
-        } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
+        } catch (Exception $exception) {
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $exception->getCode(), $exception);
         }
 
         return $this;

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php

@@ -47,8 +47,8 @@ protected function _afterSave()
                 ->setValue((string) Mage::getConfig()->getNode(self::CRON_MODEL_PATH))
                 ->setPath(self::CRON_MODEL_PATH)
                 ->save();
-        } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
+        } catch (Exception $exception) {
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $exception->getCode(), $exception);
         }
 
         return $this;

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php

@@ -47,8 +47,8 @@ protected function _afterSave()
                 ->setValue((string) Mage::getConfig()->getNode(self::CRON_MODEL_PATH))
                 ->setPath(self::CRON_MODEL_PATH)
                 ->save();
-        } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
+        } catch (Exception $exception) {
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $exception->getCode(), $exception);
         }
 
         return $this;