rector: ThrowWithPreviousExceptionRector (#4874)

sreichel · web-flow · commit b5e4a0005807 · 2025-07-11T10:54:08.000+03:00
* rector: `ThrowWithPreviousExceptionRector` - see https://getrector.com/rule-detail/throw-with-previous-exception-rector * fix
diff --git a/.rector.php b/.rector.php
@@ -42,7 +42,10 @@
         ->withSkip([
             CodeQuality\Assign\CombinedAssignRector::class, # todo: TMP
             CodeQuality\BooleanNot\SimplifyDeMorganBinaryRector::class,
-            CodeQuality\Catch_\ThrowWithPreviousExceptionRector::class, # todo: TMP
+            # skip: causes issues with Mage_Api2_Model_Auth_Adapter_Oauth::getUserParams()
+            CodeQuality\Catch_\ThrowWithPreviousExceptionRector::class => [
+                __DIR__ . '/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php',
+            ],
             CodeQuality\Class_\CompleteDynamicPropertiesRector::class, # todo: TMP (!?!)
             CodeQuality\Class_\InlineConstructorDefaultToPropertyRector::class, # todo: TMP
             CodeQuality\ClassMethod\ExplicitReturnNullRector::class, # todo: TMP
diff --git a/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php b/app/code/core/Mage/Admin/Model/Acl/Role/Registry.php
@@ -31,7 +31,7 @@ public function addParent($role, $parents)
                 $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");
+            throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist", $e->getCode(), $e);
         }
 
         if (!is_array($parents)) {
@@ -46,7 +46,7 @@ public function addParent($role, $parents)
                 }
                 $roleParent = $this->get($roleParentId);
             } catch (Zend_Acl_Role_Registry_Exception $e) {
-                throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist");
+                throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", $e->getCode(), $e);
             }
             $this->_roles[$roleId]['parents'][$roleParentId] = $roleParent;
             $this->_roles[$roleParentId]['children'][$roleId] = $role;
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Currency/Cron.php
@@ -41,7 +41,7 @@ protected function _afterSave()
                 ->setPath(self::CRON_STRING_PATH)
                 ->save();
         } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'));
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Product/Alert/Cron.php
@@ -47,7 +47,7 @@ protected function _afterSave()
                 ->setPath(self::CRON_MODEL_PATH)
                 ->save();
         } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'));
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Sitemap/Cron.php
@@ -47,7 +47,7 @@ protected function _afterSave()
                 ->setPath(self::CRON_MODEL_PATH)
                 ->save();
         } catch (Exception $e) {
-            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'));
+            throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Api/Model/Acl/Role/Registry.php b/app/code/core/Mage/Api/Model/Acl/Role/Registry.php
@@ -31,7 +31,7 @@ public function addParent($role, $parents)
                 $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");
+            throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist", $e->getCode(), $e);
         }
 
         if (!is_array($parents)) {
@@ -46,7 +46,7 @@ public function addParent($role, $parents)
                 }
                 $roleParent = $this->get($roleParentId);
             } catch (Zend_Acl_Role_Registry_Exception $e) {
-                throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist");
+                throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", $e->getCode(), $e);
             }
             $this->_roles[$roleId]['parents'][$roleParentId] = $roleParent;
             $this->_roles[$roleParentId]['children'][$roleId] = $role;
diff --git a/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php b/app/code/core/Mage/Api/Model/Server/Handler/Abstract.php
@@ -287,7 +287,7 @@ public function call($sessionId, $apiPath, $args = [])
                 if ($model instanceof Mage_Api_Model_Resource_Abstract) {
                     $model->setResourceConfig($resources->$resourceName);
                 }
-            } catch (Exception $e) {
+            } catch (Exception) {
                 throw new Mage_Api_Exception('resource_path_not_callable');
             }
 
@@ -410,7 +410,7 @@ public function multiCall($sessionId, array $calls = [], $options = [])
 
                 try {
                     $model = Mage::getModel($modelName);
-                } catch (Exception $e) {
+                } catch (Exception) {
                     throw new Mage_Api_Exception('resource_path_not_callable');
                 }
 
diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php
@@ -20,6 +20,7 @@ class Mage_Api2_Model_Auth_Adapter_Oauth extends Mage_Api2_Model_Auth_Adapter_Ab
      * Returns stdClass object with two properties: type and id
      *
      * @return stdClass
+     * @throws Mage_Api2_Exception
      */
     public function getUserParams(Mage_Api2_Model_Request $request)
     {
diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php
@@ -29,7 +29,7 @@ public function interpret($body)
 
         try {
             $decoded = Zend_Json::decode($body);
-        } catch (Zend_Json_Exception $e) {
+        } catch (Zend_Json_Exception) {
             throw new Mage_Api2_Exception('Decoding error.', Mage_Api2_Model_Server::HTTP_BAD_REQUEST);
         }
 
diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php
@@ -827,7 +827,7 @@ protected function _isSubCallAllowed($resourceId)
         try {
             return $globalAcl->isAllowed($this->getApiUser(), $resourceId, $this->getOperation());
         } catch (Mage_Api2_Exception $e) {
-            throw new Exception('Invalid arguments for isAllowed() call');
+            throw new Exception('Invalid arguments for isAllowed() call', $e->getCode(), $e);
         }
     }
 
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -151,7 +151,7 @@ public function create($productId, $data, $store = null, $identifierType = null)
                 // Remove temporary directory
                 $ioAdapter->rmdir($tmpDirectory, true);
 
-                throw new Mage_Core_Exception($e->getMessage());
+                throw new Mage_Core_Exception($e->getMessage(), $e->getCode(), $e);
             }
 
             // Adding image to gallery
diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
@@ -87,9 +87,9 @@ public function validateSuffix($suffix)
             // Make message saying about suffix, not request path
             switch ($e->getCode()) {
                 case self::VERR_MANYSLASHES:
-                    throw new Mage_Core_Exception($this->__('Two and more slashes together are not permitted in url rewrite suffix'));
+                    throw new Mage_Core_Exception($this->__('Two and more slashes together are not permitted in url rewrite suffix'), $e->getCode(), $e);
                 case self::VERR_ANCHOR:
-                    throw new Mage_Core_Exception($this->__('Anchor symbol (#) is not supported in url rewrite suffix'));
+                    throw new Mage_Core_Exception($this->__('Anchor symbol (#) is not supported in url rewrite suffix'), $e->getCode(), $e);
             }
             throw $e;
         }
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -600,7 +600,7 @@ public function confirmAction()
                     throw new Exception('Failed to load customer by id.');
                 }
             } catch (Exception $e) {
-                throw new Exception($this->__('Wrong customer account specified.'));
+                throw new Exception($this->__('Wrong customer account specified.'), $e->getCode(), $e);
             }
 
             // check if it is inactive
@@ -614,7 +614,7 @@ public function confirmAction()
                     $customer->setConfirmation(null);
                     $customer->save();
                 } catch (Exception $e) {
-                    throw new Exception($this->__('Failed to confirm customer account.'));
+                    throw new Exception($this->__('Failed to confirm customer account.'), $e->getCode(), $e);
                 }
 
                 // log in and send greeting email, then die happy
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option.php
@@ -124,7 +124,7 @@ public function addVote($option)
             $adapter->commit();
         } catch (Exception $e) {
             $adapter->rollBack();
-            throw new Exception($e->getMessage());
+            throw new Exception($e->getMessage(), $e->getCode(), $e);
         }
         return $this;
     }
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Fedex.php
@@ -731,7 +731,7 @@ protected function _parseXml($xmlContent)
             try {
                 return simplexml_load_string($xmlContent);
             } catch (Exception $e) {
-                throw new Exception(Mage::helper('usa')->__('Failed to parse xml document: %s', $xmlContent));
+                throw new Exception(Mage::helper('usa')->__('Failed to parse xml document: %s', $xmlContent), $e->getCode(), $e);
             }
         } catch (Exception $e) {
             Mage::logException($e);
diff --git a/lib/Varien/Data/Tree/Db.php b/lib/Varien/Data/Tree/Db.php
@@ -232,7 +232,7 @@ public function moveNodeTo($node, $parentNode, $prevNode = null)
             $this->_conn->commit();
         } catch (Exception $e) {
             $this->_conn->rollBack();
-            throw new Exception('Can\'t move tree node');
+            throw new Exception('Can\'t move tree node', $e->getCode(), $e);
         }
     }
 
@@ -305,7 +305,7 @@ public function removeNode($node)
             $this->_conn->commit();
         } catch (Exception $e) {
             $this->_conn->rollBack();
-            throw new Exception('Can\'t remove tree node');
+            throw new Exception('Can\'t remove tree node', $e->getCode(), $e);
         }
         parent::removeNode($node);
         return $this;
diff --git a/lib/Varien/Data/Tree/Dbp.php b/lib/Varien/Data/Tree/Dbp.php
@@ -315,7 +315,7 @@ public function move($node, $newParent, $prevNode = null)
             $this->_conn->commit();
         } catch (Exception $e) {
             $this->_conn->rollBack();
-            throw new Exception("Can't move tree node due to error: " . $e->getMessage());
+            throw new Exception("Can't move tree node due to error: " . $e->getMessage(), $e->getCode(), $e);
         }
     }
 
diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php
@@ -141,7 +141,7 @@ public function save($destination = null, $newName = null)
                 $io = new Varien_Io_File();
                 $io->mkdir($destination);
             } catch (Exception $e) {
-                throw new Exception("Unable to write file into directory '{$destinationDir}'. Access forbidden.");
+                throw new Exception("Unable to write file into directory '{$destinationDir}'. Access forbidden.", $e->getCode(), $e);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function addParent($role, $parents)`
`31`	`31`	`$role = $this->get($role);`
`32`	`32`	`}`
`33`	`33`	`} catch (Zend_Acl_Role_Registry_Exception $e) {`
`34`		`- throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist");`
	`34`	`+ throw new Zend_Acl_Role_Registry_Exception("Child Role id '$roleId' does not exist", $e->getCode(), $e);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (!is_array($parents)) {`
`@@ -46,7 +46,7 @@ public function addParent($role, $parents)`
`46`	`46`	`}`
`47`	`47`	`$roleParent = $this->get($roleParentId);`
`48`	`48`	`} catch (Zend_Acl_Role_Registry_Exception $e) {`
`49`		`- throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist");`
	`49`	`+ throw new Zend_Acl_Role_Registry_Exception("Parent Role id '$roleParentId' does not exist", $e->getCode(), $e);`
`50`	`50`	`}`
`51`	`51`	`$this->_roles[$roleId]['parents'][$roleParentId] = $roleParent;`
`52`	`52`	`$this->_roles[$roleParentId]['children'][$roleId] = $role;`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected function _afterSave()`
`41`	`41`	`->setPath(self::CRON_STRING_PATH)`
`42`	`42`	`->save();`
`43`	`43`	`} catch (Exception $e) {`
`44`		`- throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'));`
	`44`	`+ throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);`
`45`	`45`	`}`
`46`	`46`	`return $this;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected function _afterSave()`
`47`	`47`	`->setPath(self::CRON_MODEL_PATH)`
`48`	`48`	`->save();`
`49`	`49`	`} catch (Exception $e) {`
`50`		`- throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'));`
	`50`	`+ throw new Exception(Mage::helper('cron')->__('Unable to save the cron expression.'), $e->getCode(), $e);`
`51`	`51`	`}`
`52`	`52`	`return $this;`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ public function call($sessionId, $apiPath, $args = [])`
`287`	`287`	`if ($model instanceof Mage_Api_Model_Resource_Abstract) {`
`288`	`288`	`$model->setResourceConfig($resources->$resourceName);`
`289`	`289`	`}`
`290`		`- } catch (Exception $e) {`
	`290`	`+ } catch (Exception) {`
`291`	`291`	`throw new Mage_Api_Exception('resource_path_not_callable');`
`292`	`292`	`}`
`293`	`293`
`@@ -410,7 +410,7 @@ public function multiCall($sessionId, array $calls = [], $options = [])`
`410`	`410`
`411`	`411`	`try {`
`412`	`412`	`$model = Mage::getModel($modelName);`
`413`		`- } catch (Exception $e) {`
	`413`	`+ } catch (Exception) {`
`414`	`414`	`throw new Mage_Api_Exception('resource_path_not_callable');`
`415`	`415`	`}`
`416`	`416`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ class Mage_Api2_Model_Auth_Adapter_Oauth extends Mage_Api2_Model_Auth_Adapter_Ab`
`20`	`20`	`* Returns stdClass object with two properties: type and id`
`21`	`21`	`*`
`22`	`22`	`* @return stdClass`
	`23`	`+ * @throws Mage_Api2_Exception`
`23`	`24`	`*/`
`24`	`25`	`public function getUserParams(Mage_Api2_Model_Request $request)`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function interpret($body)`
`29`	`29`
`30`	`30`	`try {`
`31`	`31`	`$decoded = Zend_Json::decode($body);`
`32`		`- } catch (Zend_Json_Exception $e) {`
	`32`	`+ } catch (Zend_Json_Exception) {`
`33`	`33`	`throw new Mage_Api2_Exception('Decoding error.', Mage_Api2_Model_Server::HTTP_BAD_REQUEST);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,7 @@ protected function _isSubCallAllowed($resourceId)`
`827`	`827`	`try {`
`828`	`828`	`return $globalAcl->isAllowed($this->getApiUser(), $resourceId, $this->getOperation());`
`829`	`829`	`} catch (Mage_Api2_Exception $e) {`
`830`		`- throw new Exception('Invalid arguments for isAllowed() call');`
	`830`	`+ throw new Exception('Invalid arguments for isAllowed() call', $e->getCode(), $e);`
`831`	`831`	`}`
`832`	`832`	`}`
`833`	`833`