diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index bfb4c39bea7..36811ce6a3a 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -18,6 +18,8 @@
         'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
         // Docblocks should have the same indentation as the documented subject.
         'phpdoc_indent' => true,
+        // Annotations in PHPDoc should be ordered in defined sequence.
+        'phpdoc_order' => true,
         // Orders all @param annotations in DocBlocks according to method signature.
         'phpdoc_param_order' => true,
         // PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
diff --git a/app/code/core/Mage/Admin/Model/Block.php b/app/code/core/Mage/Admin/Model/Block.php
index 499dde319db..2f4585e97d6 100644
--- a/app/code/core/Mage/Admin/Model/Block.php
+++ b/app/code/core/Mage/Admin/Model/Block.php
@@ -30,9 +30,9 @@ protected function _construct()
     }
 
     /**
-     * @return array|true
      * @throws Exception
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validate()
     {
diff --git a/app/code/core/Mage/Admin/Model/Resource/User.php b/app/code/core/Mage/Admin/Model/Resource/User.php
index 4efce91c3d5..abe820ee2e9 100644
--- a/app/code/core/Mage/Admin/Model/Resource/User.php
+++ b/app/code/core/Mage/Admin/Model/Resource/User.php
@@ -157,8 +157,8 @@ protected function _afterLoad(Mage_Core_Model_Abstract $user)
     /**
      * Delete user role record with user
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function delete(Mage_Core_Model_Abstract $user)
     {
diff --git a/app/code/core/Mage/Admin/Model/User.php b/app/code/core/Mage/Admin/Model/User.php
index 841e2bdf141..07257270e62 100644
--- a/app/code/core/Mage/Admin/Model/User.php
+++ b/app/code/core/Mage/Admin/Model/User.php
@@ -203,8 +203,8 @@ public function saveExtra($data)
     /**
      * Save user roles
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function saveRelations()
     {
@@ -367,8 +367,8 @@ public function getAclRole()
      *
      * @param string $username
      * @param string $password
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function authenticate($username, $password)
     {
@@ -426,8 +426,8 @@ public function validatePasswordHash(string $string1, string $string2): bool
      *
      * @param string $username
      * @param string $password
-     * @return  $this
      * @throws Mage_Core_Exception
+     * @return  $this
      */
     public function login($username, $password)
     {
@@ -584,8 +584,8 @@ public function getStartupPageUrl()
      * Validate user attribute values.
      * Returns TRUE or array of errors.
      *
-     * @return array|true
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validate()
     {
@@ -651,8 +651,8 @@ public function validate()
      * Returns true or array of errors.
      *
      * @param string $password
-     * @return array|true
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validateCurrentPassword($password)
     {
@@ -677,8 +677,8 @@ public function validateCurrentPassword($password)
      * Stores new reset password link token and its creation time
      *
      * @param string $newResetPasswordLinkToken
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function changeResetPasswordLinkToken($newResetPasswordLinkToken)
     {
diff --git a/app/code/core/Mage/Admin/Model/Variable.php b/app/code/core/Mage/Admin/Model/Variable.php
index 88d24c3b56a..bed6d0ee577 100644
--- a/app/code/core/Mage/Admin/Model/Variable.php
+++ b/app/code/core/Mage/Admin/Model/Variable.php
@@ -30,9 +30,9 @@ protected function _construct()
     }
 
     /**
-     * @return array|bool
      * @throws Exception
      * @throws Zend_Validate_Exception
+     * @return array|bool
      */
     public function validate()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
index f5368ae93a7..0ef03b845a5 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/Role/Grid/User.php
@@ -28,8 +28,8 @@ public function __construct()
 
     /**
      * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -123,8 +123,8 @@ protected function _prepareColumns()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getGridUrl()
     {
@@ -134,8 +134,8 @@ public function getGridUrl()
 
     /**
      * @param bool $json
-     * @return array|int|string
      * @throws Exception
+     * @return array|int|string
      */
     protected function _getUsers($json = false)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
index 3efb64f6614..b17b3039f45 100644
--- a/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
+++ b/app/code/core/Mage/Adminhtml/Block/Api/User/Edit/Tab/Roles.php
@@ -93,8 +93,8 @@ public function getGridUrl()
 
     /**
      * @param bool $json
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _getSelectedRoles($json = false)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
index 634a240e732..e5cdb73ec2d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Edit/Form.php
@@ -86,8 +86,8 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getStoreConfigurationUrl()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
index 361adfb1523..24d8a7cd5a4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Category/Tab/Product.php
@@ -211,8 +211,8 @@ public function getGridUrl()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
index eb2b9ccd670..8b711156a98 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/New/Product/Created.php
@@ -24,8 +24,8 @@ public function __construct()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareLayout()
     {
@@ -47,8 +47,8 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getGroupAttributes()
     {
@@ -74,8 +74,8 @@ public function getCloseButtonHtml()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getAttributesBlockJson()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php
index 0b048fdca2f..bd0a441a901 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Attribute/Set/Grid.php
@@ -34,8 +34,8 @@ protected function _prepareCollection()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
index 8375c4f6be3..30e620b4a4c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Grouped.php
@@ -34,8 +34,8 @@ protected function _construct()
     /**
      * Retrieve product
      *
-     * @return Mage_Catalog_Model_Product
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Catalog_Model_Product
      */
     public function getProduct()
     {
@@ -54,8 +54,8 @@ public function getProduct()
     /**
      * Retrieve array of associated products
      *
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getAssociatedProducts()
     {
@@ -75,8 +75,8 @@ public function getAssociatedProducts()
     /**
      * Set preconfigured values to grouped associated products
      *
-     * @return Mage_Catalog_Block_Product_View_Type_Grouped
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Catalog_Block_Product_View_Type_Grouped
      */
     public function setPreconfiguredValue()
     {
@@ -107,8 +107,8 @@ public function getCanShowProductPrice($product)
     /**
      * Checks whether block is last fieldset in popup
      *
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function getIsLastFieldset()
     {
@@ -125,8 +125,8 @@ public function getIsLastFieldset()
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getCurrencyPrice($price)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
index b1f053e3fcd..47266fbab3f 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit.php
@@ -287,8 +287,8 @@ public function getIsConfigured()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSelectedTabId()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
index 3d8f18c86e2..e575b63e768 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Grid.php
@@ -46,8 +46,8 @@ protected function _getProduct()
 
     /**
      * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -84,8 +84,8 @@ protected function _addColumnFilterToCollection($column)
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getCreatedProducts()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
index 7f1d7a912b8..a61493a06da 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Super/Config/Simple.php
@@ -22,8 +22,8 @@ class Mage_Adminhtml_Block_Catalog_Product_Edit_Tab_Super_Config_Simple extends
     protected $_product = null;
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _prepareForm()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
index f209523fa5c..937f88d39c4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
+++ b/app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Price.php
@@ -24,8 +24,8 @@ public function __construct($attributes = [])
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getAfterElementHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
index 67d3e24ec1a..2a86b24fc49 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Account.php
@@ -17,8 +17,8 @@ class Mage_Adminhtml_Block_Customer_Edit_Tab_Account extends Mage_Adminhtml_Bloc
     /**
      * Initialize form
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function initForm()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
index 244bd85439c..6dc9ab0385d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Addresses.php
@@ -98,8 +98,8 @@ public function getDeleteButtonHtml()
     /**
      * Initialize form object
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function initForm()
     {
@@ -246,8 +246,8 @@ protected function _getAdditionalElementTypes()
     /**
      * Return JSON object with countries associated to possible websites
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getDefaultCountriesJson()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php
index 97f23f2a728..3723bad65bd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/Cart.php
@@ -147,8 +147,8 @@ public function getGridUrl()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getGridParentHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
index e6b8f0b5d64..40efe470f53 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tabs.php
@@ -23,8 +23,8 @@ public function __construct()
     }
 
     /**
-     * @return Mage_Adminhtml_Block_Widget_Tabs
      * @throws Exception
+     * @return Mage_Adminhtml_Block_Widget_Tabs
      */
     protected function _beforeToHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
index 511cb25c35e..227ab1b2c23 100644
--- a/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Customer/Group/Edit.php
@@ -27,8 +27,8 @@ public function __construct()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDeleteUrl()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php
index 90149368ac0..616a12e1c74 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Bar.php
@@ -74,9 +74,9 @@ public function setCurrency($currency)
     /**
      * Retrieve currency model if not set then return currency model for current store
      *
-     * @return Mage_Directory_Model_Currency
      * @throws Mage_Core_Model_Store_Exception
      * @throws Mage_Core_Exception
+     * @return Mage_Directory_Model_Currency
      */
     public function getCurrency()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
index f52da0017e8..1ab03cb02cf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
@@ -483,8 +483,8 @@ protected function getHeight()
     /**
      * Prepare chart data
      *
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _prepareData()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php
index 927d008fbea..d07e907b01e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Grids.php
@@ -34,8 +34,8 @@ public function __construct()
      *     2) specify url (BE CAREFUL)
      *     3) specify class 'ajax'
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
index cd79c96d063..7c5012d7c54 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Amounts.php
@@ -32,8 +32,8 @@ public function __construct()
     /**
      * Prepare chart data
      *
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _prepareData()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
index b4a77714e81..4d444be5481 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Orders.php
@@ -28,8 +28,8 @@ public function __construct()
     /**
      * Prepare chart data
      *
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _prepareData()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
index 47d512a0f89..ec418a4b2f8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Ordered.php
@@ -85,8 +85,8 @@ protected function _prepareColumns()
      * $row is bestseller row wrapped in Product model
      *
      * @param Mage_Catalog_Model_Product $row
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
index b6295534629..cb72ec448ad 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Tab/Products/Viewed.php
@@ -76,8 +76,8 @@ protected function _prepareColumns()
 
     /**
      * @param Mage_Catalog_Model_Product $row
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getRowUrl($row)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
index 44a107a0461..83815de9b3a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php
@@ -52,8 +52,8 @@ protected function _beforeToHtml()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSaveUrl()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
index 31deb09b900..207857a2f79 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid.php
@@ -31,8 +31,8 @@ public function __construct()
     /**
      * Prepare collection for grid
      *
-     * @return Mage_Adminhtml_Block_Widget_Grid
      * @throws Exception
+     * @return Mage_Adminhtml_Block_Widget_Grid
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
index f91eff8fcdf..78bc9ba355b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
+++ b/app/code/core/Mage/Adminhtml/Block/Newsletter/Subscriber/Grid/Filter/Website.php
@@ -30,8 +30,8 @@ protected function _getOptions()
     }
 
     /**
-     * @return Mage_Core_Model_Resource_Website_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Resource_Website_Collection
      */
     public function getCollection()
     {
@@ -46,8 +46,8 @@ public function getCollection()
     }
 
     /**
-     * @return null|array
      * @throws Mage_Core_Exception
+     * @return null|array
      */
     public function getCondition()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php
index e94bb3fc48a..986b9a0424a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php
+++ b/app/code/core/Mage/Adminhtml/Block/Notification/Toolbar.php
@@ -32,8 +32,8 @@ protected function _getHelper()
     /**
      * Check is show toolbar
      *
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function isShow()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php
index a20bfe70012..733d49d12b7 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Edit/Form.php
@@ -15,8 +15,8 @@
 class Mage_Adminhtml_Block_Permissions_Block_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     /**
-     * @return Mage_Adminhtml_Block_Widget_Form
      * @throws Exception
+     * @return Mage_Adminhtml_Block_Widget_Form
      */
     protected function _prepareForm()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php
index 62d83eef4cd..9273883ce9c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Block/Grid.php
@@ -34,8 +34,8 @@ protected function _prepareCollection()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
index 89f6c3160ad..95dd0610ed2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Buttons.php
@@ -92,8 +92,8 @@ public function getSaveButtonHtml()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDeleteButtonHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php
index 746468cc637..3086647386e 100644
--- a/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Permissions/Variable/Edit/Form.php
@@ -15,8 +15,8 @@
 class Mage_Adminhtml_Block_Permissions_Variable_Edit_Form extends Mage_Adminhtml_Block_Widget_Form
 {
     /**
-     * @return Mage_Adminhtml_Block_Widget_Form
      * @throws Exception
+     * @return Mage_Adminhtml_Block_Widget_Form
      */
     protected function _prepareForm()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
index 265f1dc4b1e..d5caa943dbd 100644
--- a/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
+++ b/app/code/core/Mage/Adminhtml/Block/Promo/Widget/Chooser/Sku.php
@@ -169,8 +169,8 @@ public function getGridUrl()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php
index 971d6b1c7f1..d1678d068ee 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php
@@ -26,8 +26,8 @@ public function __construct()
 
     /**
      * @param string $reportCode
-     * @return string
      * @throws Zend_Date_Exception
+     * @return string
      */
     protected function _getUpdatedAt($reportCode)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php
index ce135c58bd5..505f22affeb 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Abstract.php
@@ -17,8 +17,8 @@ class Mage_Adminhtml_Block_Sales_Order_Abstract extends Mage_Adminhtml_Block_Wid
     /**
      * Retrieve available order
      *
-     * @return Mage_Sales_Model_Order
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Order
      */
     public function getOrder()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
index e1286be9086..1fef43d6c31 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php
@@ -114,8 +114,8 @@ public function getDefaultRecipient()
     /**
      * Prepares form
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function _prepareForm()
     {
@@ -293,8 +293,8 @@ protected function _getFieldIdPrefix()
     /**
      * Aplies posted data to gift message
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _applyPostData()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
index 98bc7a78a93..2d9257f057b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -462,8 +462,8 @@ public function isMoveToWishlistAllowed($item)
     /**
      * Retrieve collection of customer wishlists
      *
-     * @return Mage_Wishlist_Model_Resource_Wishlist_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Wishlist_Model_Resource_Wishlist_Collection
      */
     public function getCustomerWishlists()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
index d87a7abef3b..3e799da24ee 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Search/Grid.php
@@ -54,8 +54,8 @@ public function getQuote()
 
     /**
      * @param Mage_Adminhtml_Block_Widget_Grid_Column $column
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _addColumnFilterToCollection($column)
     {
@@ -170,8 +170,8 @@ public function getGridUrl()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getSelectedProducts()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
index d6de401fbe6..4622a261bd6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Grid.php
@@ -139,8 +139,8 @@ protected function _prepareColumns()
     /**
      * Add link to RSS feed when enabled for filtered store-view
      *
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function addRssFeedLink()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
index 57666de6396..a71f6a2ec35 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -74,8 +74,8 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSaveButtonHtml()
     {
@@ -101,8 +101,8 @@ public function setEntity(Varien_Object $entity)
     /**
      * Retrieve entity for form
      *
-     * @return Mage_Sales_Model_Order
      * @throws Exception
+     * @return Mage_Sales_Model_Order
      */
     public function getEntity()
     {
@@ -117,8 +117,8 @@ public function getEntity()
     /**
      * Retrieve default value for giftmessage sender
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDefaultSender()
     {
@@ -136,8 +136,8 @@ public function getDefaultSender()
     /**
      * Retrieve default value for giftmessage recipient
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDefaultRecipient()
     {
@@ -170,8 +170,8 @@ public function getDefaultRecipient()
      * Retrieve real name for field
      *
      * @param string $name
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getFieldName($name)
     {
@@ -182,8 +182,8 @@ public function getFieldName($name)
      * Retrieve real html id for field
      *
      * @param string $id
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getFieldId($id)
     {
@@ -193,8 +193,8 @@ public function getFieldId($id)
     /**
      * Retrieve field html id prefix
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getFieldIdPrefix()
     {
@@ -204,8 +204,8 @@ public function getFieldIdPrefix()
     /**
      * Initialize gift message for entity
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _initMessage()
     {
@@ -228,8 +228,8 @@ protected function _initMessage()
     /**
      * Retrieve gift message for entity
      *
-     * @return Mage_GiftMessage_Model_Message
      * @throws Exception
+     * @return Mage_GiftMessage_Model_Message
      */
     public function getMessage()
     {
@@ -241,8 +241,8 @@ public function getMessage()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSaveUrl()
     {
@@ -259,8 +259,8 @@ public function getSaveUrl()
     /**
      * Retrieve block html id
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getHtmlId()
     {
@@ -271,8 +271,8 @@ public function getHtmlId()
      * Indicates that block can display giftmessages form
      *
      * TODO set return type
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function canDisplayGiftmessage()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
index e9d6a8c48e0..6199e71e294 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php
@@ -43,8 +43,8 @@ public function getFieldIdPrefix()
     /**
      * Indicate that block can display container
      *
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function canDisplayContainer()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
index 7c0364f4ff5..2323ef49ac3 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sitemap/Grid/Renderer/Link.php
@@ -17,8 +17,8 @@ class Mage_Adminhtml_Block_Sitemap_Grid_Renderer_Link extends Mage_Adminhtml_Blo
     /**
      * Prepare link to display in grid
      *
-     * @return string
      * @throws Mage_Core_Exception|Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function render(Varien_Object $row)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
index 2689752fbb8..b94b00ef813 100644
--- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
@@ -41,8 +41,8 @@ public function __construct()
     }
 
     /**
-     * @return Mage_Core_Model_Resource_Website_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Resource_Website_Collection
      * @deprecated
      */
     public function getWebsiteCollection()
@@ -172,8 +172,8 @@ public function setStoreVarName($varName)
     }
 
     /**
-     * @return mixed
      * @throws Exception
+     * @return mixed
      */
     public function getStoreId()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Csp/Hosts.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Csp/Hosts.php
index 647a9bbae4b..d8e221a9adb 100644
--- a/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Csp/Hosts.php
+++ b/app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field/Csp/Hosts.php
@@ -39,8 +39,8 @@ public function __construct()
      * Obtain existing data from form element
      *
      * Each row will be instance of Varien_Object
-     * @return array<string, Varien_Object> Array of rows
      * @throws Exception
+     * @return array<string, Varien_Object> Array of rows
      */
     public function getArrayRows(): array
     {
@@ -94,8 +94,8 @@ public function getArrayRows(): array
     /**
      * Extract and validate area and directive name from the node path
      *
-     * @return array{Mage_Core_Model_App_Area::AREA_ADMINHTML|Mage_Core_Model_App_Area::AREA_FRONTEND, value-of<Mage_Csp_Helper_Data::CSP_DIRECTIVES>} Array containing area and directiveName
      * @throws Exception If path format is invalid or contains disallowed values
+     * @return array{Mage_Core_Model_App_Area::AREA_ADMINHTML|Mage_Core_Model_App_Area::AREA_FRONTEND, value-of<Mage_Csp_Helper_Data::CSP_DIRECTIVES>} Array containing area and directiveName
      */
     private function _parseNodePath(): array
     {
@@ -122,8 +122,8 @@ private function _parseNodePath(): array
      * Render array cell for prototypeJS template
      *
      * @param string $columnName
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _renderCellTemplate($columnName)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
index 332bdd81523..f2666b751c2 100644
--- a/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
+++ b/app/code/core/Mage/Adminhtml/Block/Tax/Rate/Toolbar/Save.php
@@ -100,8 +100,8 @@ public function getSaveButtonHtml()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDeleteButtonHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
index fa19df21f40..e03d2d48690 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Form/Container.php
@@ -89,8 +89,8 @@ public function getBackUrl()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getDeleteUrl()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index 0d9ed3143d7..88867f495ae 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -333,8 +333,8 @@ public function getCollection()
      *
      * @param string $columnId
      * @param array $column
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addColumn($columnId, $column)
     {
@@ -436,8 +436,8 @@ public function removeColumn($columnId)
      * @param string $columnId
      * @param array|Varien_Object $column
      * @param string $after
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addColumnAfter($columnId, $column, $after)
     {
@@ -626,8 +626,8 @@ protected function _setCollectionOrder($column)
     /**
      * Prepare grid collection object
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareCollection()
     {
@@ -758,8 +758,8 @@ protected function _prepareMassactionColumn()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareGrid()
     {
@@ -1059,8 +1059,8 @@ public function getRssLists()
      * Can be overloaded in descendant classes to perform custom changes to url passed to addRssList()
      *
      * @param string $url
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _getRssUrl($url)
     {
@@ -1078,8 +1078,8 @@ protected function _getRssUrl($url)
      *
      * @param string $url
      * @param string $label
-     * @return  $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return  $this
      */
     public function addRssList($url, $label)
     {
@@ -1213,8 +1213,8 @@ protected function _exportCsvItem(Varien_Object $item, Varien_Io_File $adapter)
      *
      * Return array with keys type and value
      *
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function getCsvFile()
     {
@@ -1254,8 +1254,8 @@ public function getCsvFile()
     /**
      * Retrieve Grid data as CSV
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getCsv()
     {
@@ -1311,8 +1311,8 @@ public function getCsv()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getXml()
     {
@@ -1371,8 +1371,8 @@ protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter
      * Return array with keys type and value
      *
      * @param string $sheetName
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function getExcelFile($sheetName = '')
     {
@@ -1414,8 +1414,8 @@ public function getExcelFile($sheetName = '')
      * Retrieve grid data as MS Excel 2003 XML Document
      *
      * @param string $filename the Workbook sheet name
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getExcel($filename = '')
     {
@@ -1467,8 +1467,8 @@ public function getExcel($filename = '')
     }
 
     /**
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function canDisplayContainer()
     {
@@ -1507,8 +1507,8 @@ public function getAbsoluteGridUrl($params = [])
      *
      * @param string $paramName
      * @param mixed $default
-     * @return mixed
      * @throws Exception
+     * @return mixed
      */
     public function getParam($paramName, $default = null)
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
index 89a7bfdb8d8..d1e2b29afd8 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Filter/Date.php
@@ -30,8 +30,8 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getHtml()
     {
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
index 5bbc3b36a91..b998640fa7b 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Massaction/Item.php
@@ -42,8 +42,8 @@ public function getMassaction()
      * Set additional action block for this item
      *
      * @param Mage_Core_Block_Abstract|string $block
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setAdditionalActionBlock($block)
     {
diff --git a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
index 57d9b8ece92..c425c808b24 100644
--- a/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
+++ b/app/code/core/Mage/Adminhtml/Helper/Dashboard/Data.php
@@ -41,9 +41,9 @@ public function isChartEnabled(): bool
     /**
      * Retrieve stores configured in system.
      *
-     * @return Mage_Core_Model_Resource_Store_Collection
      * @throws Mage_Core_Model_Store_Exception
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Resource_Store_Collection
      */
     public function getStores()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
index 965bd1f986b..1ca4bc2788e 100644
--- a/app/code/core/Mage/Adminhtml/Model/Config/Data.php
+++ b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
@@ -410,8 +410,8 @@ public function getConfigRoot()
      * Secure set groups
      *
      * @param array $groups
-     * @return Mage_Adminhtml_Model_Config_Data
      * @throws Mage_Core_Exception
+     * @return Mage_Adminhtml_Model_Config_Data
      */
     public function setGroupsSecure($groups)
     {
@@ -488,8 +488,8 @@ protected function _isValidField($field)
      * Select group setter is secure or not based on the configuration
      *
      * @param array $groups
-     * @return Mage_Adminhtml_Model_Config_Data
      * @throws Mage_Core_Exception
+     * @return Mage_Adminhtml_Model_Config_Data
      */
     public function setGroupsSelector($groups)
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
index 3eb191a8a05..883fec47776 100644
--- a/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
+++ b/app/code/core/Mage/Adminhtml/Model/Giftmessage/Save.php
@@ -21,8 +21,8 @@ class Mage_Adminhtml_Model_Giftmessage_Save extends Varien_Object
     /**
      * Save all seted giftmessages
      *
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function saveAllInQuote()
     {
@@ -48,8 +48,8 @@ public function getSaved()
     }
 
     /**
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function saveAllInOrder()
     {
@@ -71,8 +71,8 @@ public function saveAllInOrder()
      *
      * @param int $entityId
      * @param array $giftmessage
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     protected function _saveOne($entityId, $giftmessage)
     {
@@ -119,8 +119,8 @@ protected function _saveOne($entityId, $giftmessage)
      *
      * @param Varien_Object $entityModel
      * @param null|Mage_GiftMessage_Model_Message $giftmessageModel
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     protected function _deleteOne($entityModel, $giftmessageModel = null)
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
index 40b8451d216..67f834d38f9 100644
--- a/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
+++ b/app/code/core/Mage/Adminhtml/Model/LayoutUpdate/Validator.php
@@ -80,9 +80,9 @@ public function getMessages()
      * getMessages() will return an array of messages that explain why the
      * validation failed.
      *
+     * @param string|Varien_Simplexml_Element $value
      * @throws Exception            Throw exception when xml object is not
      *                              instance of Varien_Simplexml_Element
-     * @param string|Varien_Simplexml_Element $value
      * @return bool
      */
     public function isValid($value)
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
index def7645b001..8014acaf97b 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custom.php
@@ -29,8 +29,8 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Custom extends Mage_Core_
     /**
      * Validate custom admin URL before save
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _beforeSave()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
index e99c9e6c1dc..34be828b41f 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Baseurl.php
@@ -13,8 +13,8 @@
 class Mage_Adminhtml_Model_System_Config_Backend_Baseurl extends Mage_Core_Model_Config_Data
 {
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _beforeSave()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
index b292a2d9cb4..5c064ca30e9 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
@@ -84,8 +84,8 @@ protected function _beforeSave()
     /**
      * Delete file after a file is uploaded
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _afterSave()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php
index 5276e0aa13c..a3472c8165d 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Filename.php
@@ -25,8 +25,8 @@ class Mage_Adminhtml_Model_System_Config_Backend_Filename extends Mage_Core_Mode
     /**
      * Processing object before save data
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _beforeSave()
     {
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
index 5b3f1fbdfd1..552205f702c 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Locale.php
@@ -17,8 +17,8 @@ class Mage_Adminhtml_Model_System_Config_Backend_Locale extends Mage_Core_Model_
     /**
      * Validate data before save data
      *
-     * @return Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Abstract
      */
     protected function _beforeSave()
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
index ad8c8aedeee..6163e8ba447 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Catalog/ProductController.php
@@ -52,8 +52,8 @@ protected function _construct()
     /**
      * Initialize product from request parameters
      *
-     * @return Mage_Catalog_Model_Product
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product
      */
     protected function _initProduct()
     {
@@ -792,8 +792,8 @@ public function saveAction()
      * Duplicates product attributes between stores.
      * @param array $stores list of store pairs: array(fromStore => toStore, fromStore => toStore,..)
      * @param Mage_Catalog_Model_Product $product whose attributes should be copied
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     protected function _copyAttributesBetweenStores(array $stores, Mage_Catalog_Model_Product $product)
     {
@@ -985,8 +985,8 @@ public function massStatusAction()
     /**
      * Validate batch of products before theirs status will be set
      *
-     * @throws Mage_Core_Exception
      * @param  int $status
+     * @throws Mage_Core_Exception
      */
     public function _validateMassStatus(array $productIds, $status)
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
index f977260ac83..d915b112a9e 100644
--- a/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/CustomerController.php
@@ -33,8 +33,8 @@ public function preDispatch()
 
     /**
      * @param string $idFieldName
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _initCustomer($idFieldName = 'id')
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
index 3a1e0206d13..34de7d5b9cf 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/CreditmemoController.php
@@ -76,8 +76,8 @@ protected function _initInvoice($order)
     /**
      * Initialize creditmemo model instance
      *
-     * @return false|Mage_Sales_Model_Order_Creditmemo
      * @throws Mage_Core_Exception
+     * @return false|Mage_Sales_Model_Order_Creditmemo
      */
     protected function _initCreditmemo($update = false)
     {
@@ -152,8 +152,8 @@ protected function _initCreditmemo($update = false)
     /**
      * Save creditmemo and related order, invoice in one transaction
      * @param Mage_Sales_Model_Order_Creditmemo $creditmemo
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _saveCreditmemo($creditmemo)
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
index 9920392d24b..bfc7d38ffc5 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/InvoiceController.php
@@ -26,8 +26,8 @@ protected function _getItemQtys()
     /**
      * Initialize invoice model instance
      *
-     * @return false|Mage_Sales_Model_Order_Invoice
      * @throws Mage_Core_Exception
+     * @return false|Mage_Sales_Model_Order_Invoice
      */
     protected function _initInvoice($update = false)
     {
@@ -76,8 +76,8 @@ protected function _initInvoice($update = false)
      * Save data for invoice and related order
      *
      * @param Mage_Sales_Model_Order_Invoice $invoice
-     * @return  Mage_Adminhtml_Sales_Order_InvoiceController
      * @throws Exception
+     * @return  Mage_Adminhtml_Sales_Order_InvoiceController
      */
     protected function _saveInvoice($invoice)
     {
@@ -94,8 +94,8 @@ protected function _saveInvoice($invoice)
      * Prepare shipment
      *
      * @param Mage_Sales_Model_Order_Invoice $invoice
-     * @return false|Mage_Sales_Model_Order_Shipment
      * @throws Mage_Core_Exception
+     * @return false|Mage_Sales_Model_Order_Shipment
      */
     protected function _prepareShipment($invoice)
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
index fd04168c775..c257c743c9c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Sales/Order/ShipmentController.php
@@ -26,8 +26,8 @@ protected function _getItemQtys()
     /**
      * Initialize shipment model instance
      *
-     * @return bool|Mage_Sales_Model_Order_Shipment
      * @throws Mage_Core_Exception
+     * @return bool|Mage_Sales_Model_Order_Shipment
      */
     protected function _initShipment()
     {
@@ -94,8 +94,8 @@ protected function _initShipment()
      * Save shipment and order in one transaction
      *
      * @param Mage_Sales_Model_Order_Shipment $shipment
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _saveShipment($shipment)
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
index 1242425bf29..2aa12f58dca 100644
--- a/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/System/VariableController.php
@@ -36,8 +36,8 @@ protected function _initLayout()
     /**
      * Initialize Variable object
      *
-     * @return Mage_Core_Model_Variable
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Variable
      */
     protected function _initVariable()
     {
diff --git a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
index c6777f26a4c..3ac2e78fa8c 100644
--- a/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
+++ b/app/code/core/Mage/Adminhtml/controllers/Tax/RateController.php
@@ -71,8 +71,8 @@ public function addAction()
     /**
      * Save Rate and Data
      *
-     * @return true|void
      * @throws Throwable
+     * @return true|void
      */
     public function saveAction()
     {
@@ -151,8 +151,8 @@ public function editAction()
     /**
      * Delete Rate and Data
      *
-     * @return true|void
      * @throws Throwable
+     * @return true|void
      */
     public function deleteAction()
     {
diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php
index d6c61564409..ee8bd826053 100644
--- a/app/code/core/Mage/Api/Helper/Data.php
+++ b/app/code/core/Mage/Api/Helper/Data.php
@@ -360,8 +360,8 @@ public function getCacheId()
      * @param null|string $routePath
      * @param null|array $routeParams
      * @param bool $htmlSpecialChars
-     * @return string
      * @throws Zend_Uri_Exception
+     * @return string
      */
     public function getServiceUrl($routePath = null, $routeParams = null, $htmlSpecialChars = false)
     {
diff --git a/app/code/core/Mage/Api/Model/Resource/User.php b/app/code/core/Mage/Api/Model/Resource/User.php
index a1fbef661de..9bb87092bda 100644
--- a/app/code/core/Mage/Api/Model/Resource/User.php
+++ b/app/code/core/Mage/Api/Model/Resource/User.php
@@ -219,8 +219,8 @@ protected function _beforeSave(Mage_Core_Model_Abstract $user)
     /**
      * Delete the object
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function delete(Mage_Core_Model_Abstract $user)
     {
diff --git a/app/code/core/Mage/Api/Model/Rules.php b/app/code/core/Mage/Api/Model/Rules.php
index c19373a6693..e32c8629683 100644
--- a/app/code/core/Mage/Api/Model/Rules.php
+++ b/app/code/core/Mage/Api/Model/Rules.php
@@ -50,8 +50,8 @@ public function getCollection()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function saveRel()
     {
diff --git a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
index 316759d8dd4..12fe0e30cff 100644
--- a/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Adapter/Soap.php
@@ -111,8 +111,8 @@ public function getController()
     /**
      * Run webservice
      *
-     * @return $this
      * @throws SoapFault
+     * @return $this
      */
     public function run()
     {
@@ -199,8 +199,8 @@ protected function _extensionLoaded()
      *
      * @param array $params
      * @param bool $withAuth
-     * @return string
      * @throws Zend_Uri_Exception
+     * @return string
      */
     protected function getWsdlUrl($params = null, $withAuth = true)
     {
diff --git a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
index 04c12258463..5617750bd56 100644
--- a/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/V2/Adapter/Soap.php
@@ -27,8 +27,8 @@ protected function _getWsdlConfig()
     /**
      * Run webservice
      *
-     * @return Mage_Api_Model_Server_Adapter_Soap
      * @throws SoapFault
+     * @return Mage_Api_Model_Server_Adapter_Soap
      */
     public function run()
     {
diff --git a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
index 8ba3f462528..1df7e61314b 100644
--- a/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
+++ b/app/code/core/Mage/Api/Model/Server/Wsi/Adapter/Soap.php
@@ -30,8 +30,8 @@ protected function _getWsdlConfig()
     /**
      * Run webservice
      *
-     * @return $this
      * @throws SoapFault
+     * @return $this
      */
     public function run()
     {
diff --git a/app/code/core/Mage/Api/Model/Session.php b/app/code/core/Mage/Api/Model/Session.php
index f69681a0be1..699af9b01dc 100644
--- a/app/code/core/Mage/Api/Model/Session.php
+++ b/app/code/core/Mage/Api/Model/Session.php
@@ -115,8 +115,8 @@ public function getIsInstaLogin(): bool
     /**
      * @param string $username
      * @param string $apiKey
-     * @return mixed
      * @throws Mage_Core_Exception
+     * @return mixed
      */
     public function login($username, $apiKey)
     {
@@ -223,8 +223,8 @@ public function isSessionExpired($user)
 
     /**
      * @param false|string $sessId
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isLoggedIn($sessId = false)
     {
diff --git a/app/code/core/Mage/Api/Model/User.php b/app/code/core/Mage/Api/Model/User.php
index 8aca71ea40a..a2fc5cc8ff0 100644
--- a/app/code/core/Mage/Api/Model/User.php
+++ b/app/code/core/Mage/Api/Model/User.php
@@ -104,8 +104,8 @@ public function save()
     /**
      * Delete user
      *
-     * @return $this|Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return $this|Mage_Core_Model_Abstract
      */
     public function delete()
     {
@@ -118,8 +118,8 @@ public function delete()
     /**
      * Save relations for users
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function saveRelations()
     {
@@ -227,8 +227,8 @@ public function getAclRole()
      *
      * @param string $username
      * @param string $apiKey
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function authenticate($username, $apiKey)
     {
@@ -251,8 +251,8 @@ public function authenticate($username, $apiKey)
      *
      * @param string $username
      * @param string $apiKey
-     * @return Mage_Api_Model_User
      * @throws Exception
+     * @return Mage_Api_Model_User
      */
     public function login($username, $apiKey)
     {
@@ -357,8 +357,8 @@ protected function _getHelper($helperName)
     /**
      * Validate user attribute values.
      *
-     * @return array|true
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validate()
     {
diff --git a/app/code/core/Mage/Api2/Helper/Data.php b/app/code/core/Mage/Api2/Helper/Data.php
index b984b01a29e..0f65ecc9870 100644
--- a/app/code/core/Mage/Api2/Helper/Data.php
+++ b/app/code/core/Mage/Api2/Helper/Data.php
@@ -164,8 +164,8 @@ public function isAllAttributesAllowed($userType)
      * Get operation type for specified operation
      *
      * @param Mage_Api2_Model_Resource::OPERATION_* $operation
-     * @return Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_*
      * @throws Exception
+     * @return Mage_Api2_Model_Resource::OPERATION_ATTRIBUTE_*
      */
     public function getTypeOfOperation($operation)
     {
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global.php b/app/code/core/Mage/Api2/Model/Acl/Global.php
index 094c785e394..b674c5eb72f 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global.php
@@ -19,8 +19,8 @@ class Mage_Api2_Model_Acl_Global
      *
      * @param string $resourceType
      * @param string $operation
-     * @return bool
      * @throws Mage_Api2_Exception
+     * @return bool
      */
     public function isAllowed(Mage_Api2_Model_Auth_User_Abstract $apiUser, $resourceType, $operation)
     {
diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
index 9191b51ab09..b74b85ce43e 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
@@ -133,8 +133,8 @@ public function __construct($options)
     /**
      * Initialize block
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _init()
     {
diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter.php b/app/code/core/Mage/Api2/Model/Auth/Adapter.php
index 98e0b824770..c215fbf230a 100644
--- a/app/code/core/Mage/Api2/Model/Auth/Adapter.php
+++ b/app/code/core/Mage/Api2/Model/Auth/Adapter.php
@@ -24,8 +24,8 @@ class Mage_Api2_Model_Auth_Adapter
     /**
      * Load adapters configuration and create adapters models
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _initAdapters()
     {
diff --git a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php
index 587556e2e59..21919f312f4 100644
--- a/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php
+++ b/app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth.php
@@ -19,8 +19,8 @@ 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
+     * @return stdClass
      */
     public function getUserParams(Mage_Api2_Model_Request $request)
     {
diff --git a/app/code/core/Mage/Api2/Model/Auth/User/Admin.php b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php
index dd99d22fc75..0032b1d2c75 100644
--- a/app/code/core/Mage/Api2/Model/Auth/User/Admin.php
+++ b/app/code/core/Mage/Api2/Model/Auth/User/Admin.php
@@ -32,8 +32,8 @@ public function getLabel()
     /**
      * Retrieve user role
      *
-     * @return int
      * @throws Exception
+     * @return int
      */
     public function getRole()
     {
@@ -72,8 +72,8 @@ public function getType()
      * Set user role
      *
      * @param int $role
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function setRole($role)
     {
diff --git a/app/code/core/Mage/Api2/Model/Config.php b/app/code/core/Mage/Api2/Model/Config.php
index 10c3dabf28f..3c5f6091111 100644
--- a/app/code/core/Mage/Api2/Model/Config.php
+++ b/app/code/core/Mage/Api2/Model/Config.php
@@ -330,8 +330,8 @@ public function getResourceWorkingModel($node)
      * Get resource allowed versions sorted in reverse order
      *
      * @param string $node
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function getVersions($node)
     {
diff --git a/app/code/core/Mage/Api2/Model/Dispatcher.php b/app/code/core/Mage/Api2/Model/Dispatcher.php
index 752e3bd2c83..75c17d2ca94 100644
--- a/app/code/core/Mage/Api2/Model/Dispatcher.php
+++ b/app/code/core/Mage/Api2/Model/Dispatcher.php
@@ -29,8 +29,8 @@ class Mage_Api2_Model_Dispatcher
     /**
      * Instantiate resource class, set parameters to the instance, run resource internal dispatch method
      *
-     * @return $this
      * @throws Mage_Api2_Exception
+     * @return $this
      */
     public function dispatch(Mage_Api2_Model_Request $request, Mage_Api2_Model_Response $response)
     {
@@ -64,8 +64,8 @@ public function dispatch(Mage_Api2_Model_Request $request, Mage_Api2_Model_Respo
      * @param string $apiType API type
      * @param string $userType API User type (e.g. admin, customer, guest)
      * @param int $version Requested version
-     * @return Mage_Api2_Model_Resource
      * @throws Mage_Api2_Exception
+     * @return Mage_Api2_Model_Resource
      */
     public static function loadResourceModel($model, $apiType, $userType, $version)
     {
@@ -119,8 +119,8 @@ public function getApiUser()
      *
      * @param string $resourceType
      * @param bool|string $requestedVersion
-     * @return int
      * @throws Mage_Api2_Exception
+     * @return int
      */
     public function getVersion($resourceType, $requestedVersion)
     {
diff --git a/app/code/core/Mage/Api2/Model/Renderer.php b/app/code/core/Mage/Api2/Model/Renderer.php
index d2b01d12398..09daaf96d8a 100644
--- a/app/code/core/Mage/Api2/Model/Renderer.php
+++ b/app/code/core/Mage/Api2/Model/Renderer.php
@@ -18,8 +18,8 @@ abstract class Mage_Api2_Model_Renderer
      * Get Renderer of given type
      *
      * @param array|string $acceptTypes
-     * @return false|Mage_Core_Model_Abstract
      * @throws Mage_Api2_Exception
+     * @return false|Mage_Core_Model_Abstract
      */
     public static function factory($acceptTypes)
     {
diff --git a/app/code/core/Mage/Api2/Model/Renderer/Xml.php b/app/code/core/Mage/Api2/Model/Renderer/Xml.php
index 6a1a817f8d0..48d365cce46 100644
--- a/app/code/core/Mage/Api2/Model/Renderer/Xml.php
+++ b/app/code/core/Mage/Api2/Model/Renderer/Xml.php
@@ -73,8 +73,8 @@ public function render($data)
      *
      * @param array|Varien_Object $data
      * @param bool $root
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _prepareData($data, $root = false)
     {
diff --git a/app/code/core/Mage/Api2/Model/Request.php b/app/code/core/Mage/Api2/Model/Request.php
index c194f9bf7d4..b3056d5e92a 100644
--- a/app/code/core/Mage/Api2/Model/Request.php
+++ b/app/code/core/Mage/Api2/Model/Request.php
@@ -147,8 +147,8 @@ public function getBodyParams()
     /**
      * Get Content-Type of request
      *
-     * @return string
      * @throws Mage_Api2_Exception
+     * @return string
      */
     public function getContentType()
     {
@@ -197,8 +197,8 @@ public function getModel()
     /**
      * Retrieve one of CRUD operation dependent on HTTP method
      *
-     * @return string
      * @throws Mage_Api2_Exception
+     * @return string
      */
     public function getOperation()
     {
diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter.php b/app/code/core/Mage/Api2/Model/Request/Interpreter.php
index 1ec65087292..6c16534ecaa 100644
--- a/app/code/core/Mage/Api2/Model/Request/Interpreter.php
+++ b/app/code/core/Mage/Api2/Model/Request/Interpreter.php
@@ -18,8 +18,8 @@ abstract class Mage_Api2_Model_Request_Interpreter
      * Request body interpreters factory
      *
      * @param string $type
-     * @return false|Mage_Core_Model_Abstract
      * @throws Mage_Api2_Exception
+     * @return false|Mage_Core_Model_Abstract
      */
     public static function factory($type)
     {
diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php
index 5674673d09f..bb6cb559dd3 100644
--- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php
+++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Json.php
@@ -18,8 +18,8 @@ class Mage_Api2_Model_Request_Interpreter_Json implements Mage_Api2_Model_Reques
      * Parse Request body into array of params
      *
      * @param string $body  Posted content from request
-     * @return null|array   Return NULL if content is invalid
      * @throws Exception|Mage_Api2_Exception
+     * @return null|array   Return NULL if content is invalid
      */
     public function interpret($body)
     {
diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php
index 8008cd049f8..c715bffb800 100644
--- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php
+++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Query.php
@@ -23,8 +23,8 @@ class Mage_Api2_Model_Request_Interpreter_Query implements Mage_Api2_Model_Reque
      * Parse request body into array of params
      *
      * @param string $body  Posted content from request
-     * @return array        Return always array
      * @throws Exception|Mage_Api2_Exception
+     * @return array        Return always array
      */
     public function interpret($body)
     {
diff --git a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php
index 58e1637a439..149874dc469 100644
--- a/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php
+++ b/app/code/core/Mage/Api2/Model/Request/Interpreter/Xml.php
@@ -32,8 +32,8 @@ class Mage_Api2_Model_Request_Interpreter_Xml implements Mage_Api2_Model_Request
      * Parse Request body into array of params
      *
      * @param string $body  Posted content from request
-     * @return array
      * @throws Exception|Mage_Api2_Exception
+     * @return array
      */
     public function interpret($body)
     {
diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php
index 0f7ae0d409c..7d10c765b32 100644
--- a/app/code/core/Mage/Api2/Model/Resource.php
+++ b/app/code/core/Mage/Api2/Model/Resource.php
@@ -860,8 +860,8 @@ protected function _getSubModel($resourceId, array $requestParams)
      * Check ACL permission for specified resource with current other conditions
      *
      * @param string $resourceId Resource identifier
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     protected function _isSubCallAllowed($resourceId)
     {
diff --git a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
index ff42e49bc89..9d5350e3848 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Validator/Fields.php
@@ -116,8 +116,8 @@ protected function _buildValidatorsChain(array $validationConfig)
      *
      * @param string $type
      * @param array $options
-     * @return Zend_Validate_Interface
      * @throws Exception If validator is not exist
+     * @return Zend_Validate_Interface
      */
     protected function _getValidatorInstance($type, $options)
     {
diff --git a/app/code/core/Mage/Api2/Model/Router.php b/app/code/core/Mage/Api2/Model/Router.php
index bb3ecac595e..09e7664fe4e 100644
--- a/app/code/core/Mage/Api2/Model/Router.php
+++ b/app/code/core/Mage/Api2/Model/Router.php
@@ -47,8 +47,8 @@ public function getRoutes()
      * Route the Request, the only responsibility of the class
      * Find route that match current URL, set parameters of the route to Request object
      *
-     * @return Mage_Api2_Model_Request
      * @throws Mage_Api2_Exception
+     * @return Mage_Api2_Model_Request
      */
     public function route(Mage_Api2_Model_Request $request)
     {
@@ -81,8 +81,8 @@ public function route(Mage_Api2_Model_Request $request)
      * Set API type to request as a result of one pass route
      *
      * @param bool $trimApiTypePath OPTIONAL If TRUE - /api/:api_type part of request path info will be trimmed
-     * @return $this
      * @throws Mage_Api2_Exception
+     * @return $this
      */
     public function routeApiType(Mage_Api2_Model_Request $request, $trimApiTypePath = true)
     {
diff --git a/app/code/core/Mage/Api2/Model/Server.php b/app/code/core/Mage/Api2/Model/Server.php
index 48cfb65ae74..0436636f35c 100644
--- a/app/code/core/Mage/Api2/Model/Server.php
+++ b/app/code/core/Mage/Api2/Model/Server.php
@@ -196,8 +196,8 @@ protected function _route(Mage_Api2_Model_Request $request)
     /**
      * Global ACL processing
      *
-     * @return $this
      * @throws Mage_Api2_Exception
+     * @return $this
      */
     protected function _allow(Mage_Api2_Model_Request $request, Mage_Api2_Model_Auth_User_Abstract $apiUser)
     {
diff --git a/app/code/core/Mage/Authorizenet/Model/Directpost.php b/app/code/core/Mage/Authorizenet/Model/Directpost.php
index 85aac9018d0..3e40f23ee31 100644
--- a/app/code/core/Mage/Authorizenet/Model/Directpost.php
+++ b/app/code/core/Mage/Authorizenet/Model/Directpost.php
@@ -61,8 +61,8 @@ public function validate()
      * Send authorize request to gateway
      *
      * @param  float $amount
-     * @return void
      * @throws Mage_Core_Exception
+     * @return void
      */
     public function authorize(Varien_Object $payment, $amount)
     {
@@ -74,8 +74,8 @@ public function authorize(Varien_Object $payment, $amount)
      *
      * @param Mage_Sales_Model_Order_Payment $payment
      * @param float $amount
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function capture(Varien_Object $payment, $amount)
     {
@@ -144,8 +144,8 @@ public function canVoid(Varien_Object $payment)
     /**
      * Void the payment through gateway
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function void(Varien_Object $payment)
     {
@@ -211,8 +211,8 @@ public function processCreditmemo($creditmemo, $payment)
      * Need to decode Last 4 digits for request.
      *
      * @param float $amount
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function refund(Varien_Object $payment, $amount)
     {
@@ -234,8 +234,8 @@ public function refund(Varien_Object $payment, $amount)
      *
      * @param Mage_Sales_Model_Order_Payment $payment
      * @param string $amount
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _refund(Varien_Object $payment, $amount)
     {
@@ -391,8 +391,8 @@ public function setResponseData(array $postData)
     /**
      * Validate response data. Needed in controllers.
      *
-     * @return bool true in case of validation success.
      * @throws Mage_Core_Exception in case of validation error
+     * @return bool true in case of validation success.
      */
     public function validateResponse()
     {
@@ -486,8 +486,8 @@ protected function _fillPaymentByResponse(Varien_Object $payment)
     /**
      * Check response code came from authorize.net.
      *
-     * @return true in case of Approved response
      * @throws Mage_Core_Exception in case of Declined or Error response from Authorize.net
+     * @return true in case of Approved response
      */
     public function checkResponseCode()
     {
@@ -506,8 +506,8 @@ public function checkResponseCode()
     /**
      * Check transaction id came from Authorize.net
      *
-     * @return true in case of right transaction id
      * @throws Mage_Core_Exception in case of bad transaction id.
+     * @return true in case of right transaction id
      */
     public function checkTransId()
     {
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
index 2e0e2e13f5a..7ee021bd55b 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Search/Grid.php
@@ -42,8 +42,8 @@ protected function _beforeToHtml()
     }
 
     /**
-     * @return Mage_Adminhtml_Block_Widget_Grid
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Adminhtml_Block_Widget_Grid
      */
     protected function _prepareCollection()
     {
@@ -75,9 +75,9 @@ protected function _prepareCollection()
     }
 
     /**
-     * @return Mage_Adminhtml_Block_Widget_Grid
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Adminhtml_Block_Widget_Grid
      */
     protected function _prepareColumns()
     {
@@ -146,8 +146,8 @@ protected function _prepareColumns()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getGridUrl()
     {
@@ -155,8 +155,8 @@ public function getGridUrl()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getSelectedProducts()
     {
@@ -164,8 +164,8 @@ protected function _getSelectedProducts()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _getProducts()
     {
@@ -179,8 +179,8 @@ protected function _getProducts()
     }
 
     /**
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
diff --git a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
index 7d2322188ea..6c50a5668cb 100644
--- a/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
+++ b/app/code/core/Mage/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tabs.php
@@ -17,8 +17,8 @@ class Mage_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tabs extends Mage_Adminht
     protected $_attributeTabBlock = 'bundle/adminhtml_catalog_product_edit_tab_attributes';
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
index 1a8fe0e97b9..ad4bec7eeca 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/Price.php
@@ -40,8 +40,8 @@ public function isRatesGraterThenZero()
      * Check if we have display prices including and excluding tax
      * With corrections for Dynamic prices
      *
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function displayBothPrices()
     {
diff --git a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
index 5c89cc6a24c..a83367e4a48 100644
--- a/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
+++ b/app/code/core/Mage/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
@@ -171,8 +171,8 @@ public function getProduct()
      *
      * @param Mage_Catalog_Model_Product $selection
      * @param bool $includeContainer
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     {
@@ -212,8 +212,8 @@ public function getSelectionPrice($selection)
      *
      * @param Mage_Catalog_Model_Product $selection
      * @param bool $includeContainer
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getSelectionTitlePrice($selection, $includeContainer = true)
     {
@@ -245,8 +245,8 @@ public function setValidationContainer($elementId, $containerId)
      *
      * @param float $price
      * @param bool $includeContainer
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function formatPriceString($price, $includeContainer = true)
     {
diff --git a/app/code/core/Mage/Bundle/Model/Product/Price.php b/app/code/core/Mage/Bundle/Model/Product/Price.php
index 88b41e5f47b..57aa2f925d0 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Price.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Price.php
@@ -61,8 +61,8 @@ public function getPrice($product)
      *
      * @param Mage_Catalog_Model_Product $product
      * @param null|float $qty
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getTotalBundleItemsPrice($product, $qty = null)
     {
@@ -103,8 +103,8 @@ public function getTotalBundleItemsPrice($product, $qty = null)
      *
      * @param null|float $qty
      * @param Mage_Catalog_Model_Product $product
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getFinalPrice($qty, $product)
     {
@@ -131,8 +131,8 @@ public function getFinalPrice($qty, $product)
      * @param float $productQty
      * @param Mage_Catalog_Model_Product $childProduct
      * @param float $childProductQty
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getChildFinalPrice($product, $productQty, $childProduct, $childProductQty)
     {
@@ -144,8 +144,8 @@ public function getChildFinalPrice($product, $productQty, $childProduct, $childP
      *
      * @param Mage_Catalog_Model_Product $product
      * @param string $which
-     * @return array|float
      * @throws Mage_Core_Model_Store_Exception
+     * @return array|float
      * @deprecated after 1.5.1.0
      * @see Mage_Bundle_Model_Product_Price::getTotalPrices()
      */
@@ -160,8 +160,8 @@ public function getPrices($product, $which = null)
      * @param Mage_Catalog_Model_Product $product
      * @param string $which
      * @param null|bool $includeTax
-     * @return array|float
      * @throws Mage_Core_Model_Store_Exception
+     * @return array|float
      * @see Mage_Bundle_Model_Product_Price::getTotalPrices()
      *
      * @deprecated after 1.5.1.0
@@ -178,8 +178,8 @@ public function getPricesDependingOnTax($product, $which = null, $includeTax = n
      * @param null|string $which
      * @param null|bool $includeTax
      * @param bool $takeTierPrice
-     * @return array|float
      * @throws Mage_Core_Model_Store_Exception
+     * @return array|float
      */
     public function getTotalPrices($product, $which = null, $includeTax = null, $takeTierPrice = true)
     {
@@ -272,8 +272,8 @@ public function getTotalPrices($product, $which = null, $includeTax = null, $tak
      * @param Mage_Catalog_Model_Product $product
      * @param null|bool $includeTax
      * @param bool $takeTierPrice
-     * @return int|mixed
      * @throws Mage_Core_Model_Store_Exception
+     * @return int|mixed
      */
     protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
     {
@@ -338,8 +338,8 @@ protected function _getMinimalBundleOptionsPrice($product, $includeTax, $takeTie
      * @param Mage_Catalog_Model_Product $product
      * @param null|bool $includeTax
      * @param bool $takeTierPrice
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     protected function _getMaximalBundleOptionsPrice($product, $includeTax, $takeTierPrice)
     {
@@ -369,8 +369,8 @@ protected function _getMaximalBundleOptionsPrice($product, $includeTax, $takeTie
      * @param Mage_Bundle_Model_Option $option
      * @param bool $takeTierPrice
      * @param null|bool $includeTax
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     protected function _getSelectionPrices($product, $option, $takeTierPrice, $includeTax)
     {
@@ -481,8 +481,8 @@ public function getOptions($product)
      * @param Mage_Catalog_Model_Product $selectionProduct
      * @param null|float $selectionQty
      * @param null|bool $multiplyQty Whether to multiply selection's price by its quantity
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      * @deprecated after 1.6.2.0
      * @see Mage_Bundle_Model_Product_Price::getSelectionFinalTotalPrice()
      */
@@ -497,8 +497,8 @@ public function getSelectionPrice($bundleProduct, $selectionProduct, $selectionQ
      * @param Mage_Catalog_Model_Product $bundleProduct
      * @param Mage_Catalog_Model_Product $selectionProduct
      * @param float $qty
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qty = null)
     {
@@ -513,8 +513,8 @@ public function getSelectionPreFinalPrice($bundleProduct, $selectionProduct, $qt
      * @param float $bundleQty
      * @param float $selectionQty
      * @param bool $multiplyQty
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      * @see Mage_Bundle_Model_Product_Price::getSelectionFinalTotalPrice()
      *
      * @deprecated after 1.5.1.0
@@ -545,8 +545,8 @@ public function getSelectionFinalPrice(
      * @param null|float $selectionQty
      * @param bool $multiplyQty
      * @param bool $takeTierPrice
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getSelectionFinalTotalPrice(
         $bundleProduct,
@@ -590,8 +590,8 @@ public function getSelectionFinalTotalPrice(
      * @param Mage_Catalog_Model_Product $bundleProduct
      * @param float|string $price
      * @param int $bundleQty
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
     {
@@ -609,8 +609,8 @@ public function getLowestPrice($bundleProduct, $price, $bundleQty = 1)
      *
      * @param Mage_Catalog_Model_Product $product
      * @param float $finalPrice
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     protected function _applyGroupPrice($product, $finalPrice)
     {
@@ -630,8 +630,8 @@ protected function _applyGroupPrice($product, $finalPrice)
      * Get product group price
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return null|float
      * @throws Mage_Core_Exception
+     * @return null|float
      */
     public function getGroupPrice($product)
     {
@@ -669,8 +669,8 @@ public function getGroupPrice($product)
      * @param Mage_Catalog_Model_Product $product
      * @param float $qty
      * @param float $finalPrice
-     * @return  float
      * @throws Mage_Core_Model_Store_Exception
+     * @return  float
      */
     protected function _applyTierPrice($product, $qty, $finalPrice)
     {
@@ -694,8 +694,8 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
      *
      * @param null|float $qty
      * @param Mage_Catalog_Model_Product $product
-     * @return array|float
      * @throws Mage_Core_Exception
+     * @return array|float
      */
     public function getTierPrice($qty, $product)
     {
@@ -791,8 +791,8 @@ public function getTierPrice($qty, $product)
      * @param mixed $wId
      * @param mixed $gId
      * @param null|int $productId
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public static function calculatePrice(
         $basePrice,
@@ -951,8 +951,8 @@ public static function calculatePrice(
      * @param string $specialPriceFrom
      * @param string $specialPriceTo
      * @param mixed $store
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public static function calculateSpecialPrice(
         $finalPrice,
diff --git a/app/code/core/Mage/Bundle/Model/Product/Type.php b/app/code/core/Mage/Bundle/Model/Product/Type.php
index 941c65ab74f..7fcc6ca2bf3 100644
--- a/app/code/core/Mage/Bundle/Model/Product/Type.php
+++ b/app/code/core/Mage/Bundle/Model/Product/Type.php
@@ -918,8 +918,8 @@ public function getSearchableData($product = null)
      * Check if product can be bought
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function checkProductBuyState($product = null)
     {
diff --git a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
index a01f5641750..a79ac898d18 100644
--- a/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
+++ b/app/code/core/Mage/Bundle/Model/Resource/Price/Index.php
@@ -73,8 +73,8 @@ protected function _getWebsites()
     /**
      * Retrieve customer groups collection array
      *
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     protected function _getCustomerGroups()
     {
@@ -94,8 +94,8 @@ protected function _getCustomerGroups()
      * @param array|int|Mage_Catalog_Model_Product|Mage_Catalog_Model_Product_Condition_Interface $product
      * @param int $lastEntityId
      * @param int $limit
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getProducts($product = null, $lastEntityId = 0, $limit = 100)
     {
@@ -142,8 +142,8 @@ public function getProducts($product = null, $lastEntityId = 0, $limit = 100)
      * Reindex Bundle product Price Index
      *
      * @param array|int|Mage_Catalog_Model_Product|Mage_Catalog_Model_Product_Condition_Interface $products
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function reindex($products = null)
     {
@@ -168,8 +168,8 @@ public function reindex($products = null)
      *
      * @param int $productId
      * @param int $priceType
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _reindexProduct($productId, $priceType)
     {
@@ -239,8 +239,8 @@ protected function _reindexProduct($productId, $priceType)
      * @param int $groupId
      * @param float $minPrice
      * @param float $maxPrice
-     * @return $this
      * @throws Zend_Db_Exception
+     * @return $this
      */
     protected function _savePriceIndex($productId, $websiteId, $groupId, $minPrice, $maxPrice)
     {
@@ -262,8 +262,8 @@ protected function _savePriceIndex($productId, $websiteId, $groupId, $minPrice,
      * Retrieve bundle options with selections and prices by product
      *
      * @param int $productId
-     * @return array
      * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception
+     * @return array
      */
     public function getSelections($productId)
     {
@@ -315,8 +315,8 @@ public function getSelections($productId)
      * Retrieve salable product statuses
      *
      * @param array|int $products
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getProductsSalableStatus($products, Mage_Core_Model_Website $website)
     {
@@ -419,8 +419,8 @@ public function getProductsPriceFromIndex($productIds)
      * Retrieve product(s) price data
      *
      * @param array|int $products
-     * @return array
      * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception
+     * @return array
      */
     public function getProductsPriceData($products, Mage_Core_Model_Website $website)
     {
@@ -452,8 +452,8 @@ public function getProductsPriceData($products, Mage_Core_Model_Website $website
      * Add attribute data to select
      *
      * @param string $attributeCode
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _addAttributeDataToSelect(
         Varien_Db_Select $select,
@@ -528,8 +528,8 @@ protected function _getBasePrice($productId, array $priceData, $website, $custom
      * Retrieve custom options for product
      *
      * @param int $productId
-     * @return array
      * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception
+     * @return array
      */
     public function getCustomOptions($productId, Mage_Core_Model_Website $website)
     {
@@ -835,8 +835,8 @@ public function _calculateSpecialPrice($finalPrice, array $priceData, Mage_Core_
      * @param array|int $productIds
      * @param int $websiteId
      * @param int $groupId
-     * @return array
      * @throws Zend_Db_Adapter_Exception|Zend_Db_Statement_Exception
+     * @return array
      */
     public function loadPriceIndex($productIds, $websiteId, $groupId)
     {
diff --git a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
index cebc7489faa..b9867ce7b98 100644
--- a/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
+++ b/app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php
@@ -219,8 +219,8 @@ public function getOrderOptions($item = null)
     /**
      * Retrieve Order Item
      *
-     * @return Mage_Sales_Model_Order_Item
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Order_Item
      */
     public function getOrderItem()
     {
diff --git a/app/code/core/Mage/Catalog/Block/Category/View.php b/app/code/core/Mage/Catalog/Block/Category/View.php
index 483677dd244..d944dabe63a 100644
--- a/app/code/core/Mage/Catalog/Block/Category/View.php
+++ b/app/code/core/Mage/Catalog/Block/Category/View.php
@@ -15,8 +15,8 @@
 class Mage_Catalog_Block_Category_View extends Mage_Core_Block_Template
 {
     /**
-     * @return $this|Mage_Core_Block_Template
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this|Mage_Core_Block_Template
      */
     protected function _prepareLayout()
     {
@@ -75,8 +75,8 @@ public function isTopCategory()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getRssLink()
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
index 4fae337a9dc..ef00752f066 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Abstract.php
@@ -269,8 +269,8 @@ public function addPriceBlockType($type, $block = '', $template = '')
      *
      * @param false|string $templateType
      * @param bool $displayIfNoReviews
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getReviewsSummaryHtml(
         Mage_Catalog_Model_Product $product,
@@ -386,8 +386,8 @@ protected function callParentToHtml()
      * Get tier prices (formatted)
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getTierPrices($product = null)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/Gallery.php b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
index 8eb2b66be42..4da226f9c40 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Gallery.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Gallery.php
@@ -43,8 +43,8 @@ public function getGalleryCollection()
     }
 
     /**
-     * @return null|Varien_Object
      * @throws Exception
+     * @return null|Varien_Object
      */
     public function getCurrentImage()
     {
@@ -100,8 +100,8 @@ public function getImageWidth()
     }
 
     /**
-     * @return false|Varien_Object
      * @throws Exception
+     * @return false|Varien_Object
      */
     public function getPreviusImage()
     {
@@ -123,8 +123,8 @@ public function getPreviusImage()
     }
 
     /**
-     * @return false|Varien_Object
      * @throws Exception
+     * @return false|Varien_Object
      */
     public function getNextImage()
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/List.php b/app/code/core/Mage/Catalog/Block/Product/List.php
index db7c07b9638..2591d151d82 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List.php
@@ -211,8 +211,8 @@ public function setCollection($collection)
 
     /**
      * @param array|int|Mage_Core_Model_Config_Element|string $code
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addAttribute($code)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/Send.php b/app/code/core/Mage/Catalog/Block/Product/Send.php
index e6bbe08e228..72171a325f9 100644
--- a/app/code/core/Mage/Catalog/Block/Product/Send.php
+++ b/app/code/core/Mage/Catalog/Block/Product/Send.php
@@ -34,8 +34,8 @@ public function getEmail()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getProductId()
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/View.php b/app/code/core/Mage/Catalog/Block/Product/View.php
index b5ba1942bf2..252b91a36f4 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View.php
@@ -75,8 +75,8 @@ protected function _prepareLayout()
     /**
      * Retrieve current product model
      *
-     * @return Mage_Catalog_Model_Product
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product
      */
     public function getProduct()
     {
@@ -104,8 +104,8 @@ public function canEmailToFriend()
      *
      * @param Mage_Catalog_Model_Product $product
      * @param array $additional
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getAddToCartUrl($product, $additional = [])
     {
@@ -116,8 +116,8 @@ public function getAddToCartUrl($product, $additional = [])
      * Get JSON encoded configuration array which can be used for JS dynamic
      * price calculation depending on product options
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getJsonConfig()
     {
@@ -149,8 +149,8 @@ public function getJsonConfig()
     /**
      * Return true if product has options
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function hasOptions()
     {
@@ -164,8 +164,8 @@ public function hasOptions()
     /**
      * Check if product has required options
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function hasRequiredOptions()
     {
@@ -178,8 +178,8 @@ public function hasRequiredOptions()
      * presses some button or link. In editing mode we better show these options
      * instantly.
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isStartCustomization()
     {
@@ -191,8 +191,8 @@ public function isStartCustomization()
      * Also restricts it by minimal qty.
      *
      * @param null|Mage_Catalog_Model_Product $product
-     * @return float|int
      * @throws Mage_Core_Exception
+     * @return float|int
      */
     public function getProductDefaultQty($product = null)
     {
@@ -206,8 +206,8 @@ public function getProductDefaultQty($product = null)
     /**
      * Retrieve block cache tags
      *
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getCacheTags()
     {
@@ -220,8 +220,8 @@ public function getCacheTags()
      * @param Mage_Catalog_Model_Product $product
      * @param array $additional
      * @param bool $addFormKey
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getAddToCartUrlCustom($product, $additional = [], $addFormKey = true)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options.php b/app/code/core/Mage/Catalog/Block/Product/View/Options.php
index d149b95237a..d3d453ec8f7 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options.php
@@ -126,8 +126,8 @@ public function hasOptions()
      * Get price configuration
      *
      * @param Mage_Catalog_Model_Product_Option|Mage_Catalog_Model_Product_Option_Value $option
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     protected function _getPriceConfiguration($option)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
index 29728f86769..d7ab1845bd1 100644
--- a/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
+++ b/app/code/core/Mage/Catalog/Block/Product/View/Options/Abstract.php
@@ -71,8 +71,8 @@ public function getOption()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getFormatedPrice()
     {
@@ -91,8 +91,8 @@ public function getFormatedPrice()
      *
      * @param array $value
      * @param bool $flag
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _formatPrice($value, $flag = true)
     {
@@ -138,8 +138,8 @@ protected function _formatPrice($value, $flag = true)
      *
      * @param float $price
      * @param bool $includingTax
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function getPrice($price, $includingTax = null)
     {
diff --git a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
index 4b618e6d274..bc9c1a723fd 100644
--- a/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
+++ b/app/code/core/Mage/Catalog/Block/Seo/Sitemap/Tree/Pager.php
@@ -27,8 +27,8 @@ class Mage_Catalog_Block_Seo_Sitemap_Tree_Pager extends Mage_Page_Block_Html_Pag
 
     /**
      * @param int $displacement
-     * @return int
      * @throws Exception
+     * @return int
      */
     public function getCurrentPage($displacement = 0)
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Category.php b/app/code/core/Mage/Catalog/Helper/Category.php
index df102f5b850..f3dbf93f48a 100644
--- a/app/code/core/Mage/Catalog/Helper/Category.php
+++ b/app/code/core/Mage/Catalog/Helper/Category.php
@@ -42,8 +42,8 @@ class Mage_Catalog_Helper_Category extends Mage_Core_Helper_Abstract
      * @param bool|string $sorted
      * @param bool $asCollection
      * @param bool $toLoad
-     * @return array|Mage_Catalog_Model_Resource_Category_Collection|Varien_Data_Collection|Varien_Data_Tree_Node_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return array|Mage_Catalog_Model_Resource_Category_Collection|Varien_Data_Collection|Varien_Data_Tree_Node_Collection
      */
     public function getStoreCategories($sorted = false, $asCollection = false, $toLoad = true)
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Image.php b/app/code/core/Mage/Catalog/Helper/Image.php
index 82ef6848e23..e055b2c9c0f 100644
--- a/app/code/core/Mage/Catalog/Helper/Image.php
+++ b/app/code/core/Mage/Catalog/Helper/Image.php
@@ -627,8 +627,8 @@ public function getOriginalSizeArray()
      * Check - is this file an image
      *
      * @param string $filePath
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function validateUploadFile($filePath)
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Flat.php b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
index 1f240eb5edf..c3d50a07bd3 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Flat.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Flat.php
@@ -84,8 +84,8 @@ class Mage_Catalog_Helper_Product_Flat extends Mage_Catalog_Helper_Flat_Abstract
     /**
      * Retrieve Catalog Product Flat Flag object
      *
-     * @return Mage_Catalog_Model_Product_Flat_Flag
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product_Flat_Flag
      */
     public function getFlag()
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php b/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php
index 40ebf280563..3efea8dbc1c 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php
@@ -89,8 +89,8 @@ public function convertPrice($price, $round = false, $storeId = null)
      * Retrieve current store
      *
      * @param null|bool|int|Mage_Core_Model_Store|string $storeId
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getCurrentStore($storeId = null)
     {
diff --git a/app/code/core/Mage/Catalog/Helper/Product/View.php b/app/code/core/Mage/Catalog/Helper/Product/View.php
index 67e6f2a0d31..2a2f0287c1d 100644
--- a/app/code/core/Mage/Catalog/Helper/Product/View.php
+++ b/app/code/core/Mage/Catalog/Helper/Product/View.php
@@ -28,9 +28,9 @@ class Mage_Catalog_Helper_Product_View extends Mage_Core_Helper_Abstract
      * @param Mage_Catalog_Model_Product $product
      * @param Mage_Core_Controller_Front_Action $controller
      *
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function initProductLayout($product, $controller)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
index a72d4b048e0..d01a934d967 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest.php
@@ -169,8 +169,8 @@ protected function _getFileName($data)
     /**
      * Retrieve file extension using MIME type
      *
-     * @throws Mage_Api2_Exception
      * @param string $mimeType
+     * @throws Mage_Api2_Exception
      * @return string
      */
     protected function _getExtensionByMimeType($mimeType)
@@ -185,8 +185,8 @@ protected function _getExtensionByMimeType($mimeType)
     /**
      * Get file URI by its id. File URI is used by media backend to identify image
      *
-     * @throws Mage_Api2_Exception
      * @param int $imageId
+     * @throws Mage_Api2_Exception
      * @return string
      */
     protected function _getImageFileById($imageId)
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php
index c566c64399c..6a9db3556c9 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product/Image/Rest/Admin/V1.php
@@ -87,8 +87,8 @@ protected function _create(array $data)
     /**
      * Get added image ID
      *
-     * @throws Mage_Api2_Exception
      * @param string $imageFileUri
+     * @throws Mage_Api2_Exception
      * @return int
      */
     protected function _getCreatedImageId($imageFileUri)
diff --git a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index 159aa252171..a34eefc5acf 100644
--- a/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/core/Mage/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -19,8 +19,8 @@ class Mage_Catalog_Model_Attribute_Backend_Customlayoutupdate extends Mage_Eav_M
      * In case invalid data throws exception.
      *
      * @param Varien_Object $object
-     * @return bool
      * @throws Mage_Eav_Model_Entity_Attribute_Exception
+     * @return bool
      */
     public function validate($object)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index d95236309db..61875717abc 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -341,8 +341,8 @@ public function getProductCollection()
      * Retrieve all customer attributes
      *
      * @param bool $noDesignAttributes
-     * @return Mage_Eav_Model_Entity_Attribute[]
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Attribute[]
      * @todo Use with Flat Resource
      */
     public function getAttributes($noDesignAttributes = false)
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api.php b/app/code/core/Mage/Catalog/Model/Category/Api.php
index 4c19391db55..8760df3bbc4 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api.php
@@ -104,8 +104,8 @@ public function level($website = null, $store = null, $categoryId = null)
      *
      * @param null|int $parentId
      * @param int|string $store
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function tree($parentId = null, $store = null)
     {
@@ -386,8 +386,8 @@ public function delete($categoryId)
      * @param int|string  $productId      The product ID or SKU
      * @param null|string $identifierType Should be 'sku' when working with SKU's. Leave null when using ID's
      *
-     * @return int
      * @throws Mage_Api_Exception
+     * @return int
      */
     protected function _getProductId($productId, $identifierType = null)
     {
@@ -436,8 +436,8 @@ public function assignedProducts($categoryId, $store = null)
      * @param int $productId
      * @param int $position
      * @param null|string $identifierType Should be 'sku' when working with SKU's. Leave null when using ID's
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function assignProduct($categoryId, $productId, $position = null, $identifierType = null)
     {
@@ -463,8 +463,8 @@ public function assignProduct($categoryId, $productId, $position = null, $identi
      * @param int $productId
      * @param null|int $position
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function updateProduct($categoryId, $productId, $position = null, $identifierType = null)
     {
@@ -493,8 +493,8 @@ public function updateProduct($categoryId, $productId, $position = null, $identi
      * @param int $categoryId
      * @param null|int $productId
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function removeProduct($categoryId, $productId, $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
index d6e27ca32eb..0e7abc7dab2 100644
--- a/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Category/Api/V2.php
@@ -53,10 +53,10 @@ public function info($categoryId, $store = null, $attributes = null)
      * @param int $parentId
      * @param array $categoryData
      * @param null|int|string $store
-     * @return int
      * @throws Mage_Api_Exception
      * @throws Mage_Eav_Model_Entity_Attribute_Exception
      * @throws Mage_Core_Exception
+     * @return int
      */
     public function create($parentId, $categoryData, $store = null)
     {
@@ -109,8 +109,8 @@ public function create($parentId, $categoryData, $store = null)
      * @param int $categoryId
      * @param array $categoryData
      * @param int|string $store
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function update($categoryId, $categoryData, $store = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
index 2d002fab611..63f4906e667 100644
--- a/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Layer/Filter/Category.php
@@ -62,8 +62,8 @@ public function getResetValue()
      * Apply category filter to layer
      *
      * @param   Varien_Object $filterBlock
-     * @return  $this
      * @throws  Mage_Core_Exception
+     * @return  $this
      */
     public function apply(Zend_Controller_Request_Abstract $request, $filterBlock)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api.php b/app/code/core/Mage/Catalog/Model/Product/Api.php
index e550429b160..e1835ccece3 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api.php
@@ -210,9 +210,9 @@ public function create($type, $set, $sku, $productData, $store = null)
      * @param array $productData
      * @param null|int|string $store
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function update($productId, $productData, $store = null, $identifierType = null)
     {
@@ -364,8 +364,8 @@ public function getSpecialPrice($productId, $store = null)
      *
      * @param int|string $productId
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function delete($productId, $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
index 92b3472520f..22c09ef984c 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -149,9 +149,9 @@ public function create($type, $set, $sku, $productData, $store = null)
      * @param array|stdClass $productData
      * @param int|string $store
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function update($productId, $productData, $store = null, $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
index 98ee562b585..66af0de0c54 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Backend/Media.php
@@ -90,8 +90,8 @@ public function validate($object)
 
     /**
      * @param Mage_Catalog_Model_Product $object
-     * @return $this|Mage_Eav_Model_Entity_Attribute_Backend_Abstract|void
      * @throws Zend_Json_Exception
+     * @return $this|Mage_Eav_Model_Entity_Attribute_Backend_Abstract|void
      */
     public function beforeSave($object)
     {
@@ -282,8 +282,8 @@ public function afterSave($object)
      *                                                      leave blank if image should be only in gallery
      * @param bool                    $move              if true, it will move source file
      * @param bool                    $exclude           mark image as disabled in product page view
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function addImage(
         Mage_Catalog_Model_Product $product,
@@ -386,8 +386,8 @@ public function addImage(
      * @param string $filePath path, where image cand be found
      * @param bool $move if true, it will move source file
      * @param bool $exclude mark image as disabled in product page view
-     * @return array array of parallel arrays with original and renamed files
      * @throws Mage_Core_Exception
+     * @return array array of parallel arrays with original and renamed files
      */
     public function addImagesWithDifferentMediaAttributes(
         Mage_Catalog_Model_Product $product,
@@ -643,8 +643,8 @@ protected function _getUniqueFileName($file, $dirsep)
      * Copy image and return new filename.
      *
      * @param string $file
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     protected function _copyImage($file)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
index a8fdc62e546..629f1447cc6 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -17,9 +17,9 @@ class Mage_Catalog_Model_Product_Attribute_Frontend_Image extends Mage_Eav_Model
     /**
      * @param Varien_Object $object
      * @param string $size
-     * @return false|string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return false|string
      */
     public function getUrl($object, $size = null)
     {
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
index 8750cc783f2..0cc33414769 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Media/Api.php
@@ -72,8 +72,8 @@ public function items($productId, $store = null, $identifierType = null)
      * @param string $file
      * @param int|string $store
      * @param null|string $identifierType
-     * @return array
      * @throws Mage_Api_Exception
+     * @return array
      */
     public function info($productId, $file, $store = null, $identifierType = null)
     {
@@ -95,8 +95,8 @@ public function info($productId, $file, $store = null, $identifierType = null)
      * @param array $data
      * @param int|string $store
      * @param null|string $identifierType
-     * @return string
      * @throws Mage_Api_Exception
+     * @return string
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
@@ -189,8 +189,8 @@ public function create($productId, $data, $store = null, $identifierType = null)
      * @param array $data
      * @param int|string $store
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
@@ -262,8 +262,8 @@ public function update($productId, $file, $data, $store = null, $identifierType
      * @param int|string $productId
      * @param string $file
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function remove($productId, $file, $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
index aa611da4a17..21f10b4d024 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Attribute/Tierprice/Api.php
@@ -24,8 +24,8 @@ public function __construct()
     /**
      * @param int $productId
      * @param null|string $identifierType
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function info($productId, $identifierType = null)
     {
@@ -61,8 +61,8 @@ public function info($productId, $identifierType = null)
      * @param int|string $productId
      * @param array $tierPrices
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function update($productId, $tierPrices, $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
index d989c5524cf..4bbb33f1551 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Link/Api/V2.php
@@ -22,8 +22,8 @@ class Mage_Catalog_Model_Product_Link_Api_V2 extends Mage_Catalog_Model_Product_
      * @param int|string $linkedProductId
      * @param array $data
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function assign($type, $productId, $linkedProductId, $data = [], $identifierType = null)
     {
@@ -82,8 +82,8 @@ public function assign($type, $productId, $linkedProductId, $data = [], $identif
      * @param int|string $linkedProductId
      * @param array $data
      * @param null|string $identifierType
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function update($type, $productId, $linkedProductId, $data = [], $identifierType = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
index 3b08f1e13c8..1bec0c4a7d5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
@@ -20,8 +20,8 @@ class Mage_Catalog_Model_Product_Option_Type_Date extends Mage_Catalog_Model_Pro
     /**
      * Validate user input for option
      *
-     * @throws Mage_Core_Exception
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
+     * @throws Mage_Core_Exception
      * @return Mage_Catalog_Model_Product_Option_Type_Default
      */
     public function validateUserValue($values)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
index d9522cdd521..c9b57e4815e 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Default.php
@@ -63,8 +63,8 @@ public function setOption($option)
     /**
      * Option Instance getter
      *
-     * @return Mage_Catalog_Model_Product_Option
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product_Option
      */
     public function getOption()
     {
@@ -192,8 +192,8 @@ public function getConfigData($key)
     /**
      * Validate user input for option
      *
-     * @throws Mage_Core_Exception
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
+     * @throws Mage_Core_Exception
      * @return $this
      */
     public function validateUserValue($values)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
index 128bc7c470c..302541d7613 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -75,8 +75,8 @@ protected function _getProcessingParams()
      * Returns file info array if we need to get file from already existing file.
      * Or returns null, if we need to get file from uploaded array.
      *
-     * @return null|array
      * @throws Mage_Core_Exception
+     * @return null|array
      */
     protected function _getCurrentConfigFileInfo()
     {
@@ -104,8 +104,8 @@ protected function _getCurrentConfigFileInfo()
      * Validate user input for option
      *
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
-     * @return $this
      * @throws Mage_Core_Exception|Zend_Validate_Exception
+     * @return $this
      */
     public function validateUserValue($values)
     {
@@ -150,8 +150,8 @@ public function validateUserValue($values)
     /**
      * Validate uploaded file
      *
-     * @return $this
      * @throws Mage_Core_Exception|Zend_File_Transfer_Exception
+     * @return $this
      * @SuppressWarnings("PHPMD.Superglobals")
      */
     protected function _validateUploadedFile()
@@ -299,9 +299,9 @@ protected function _validateUploadedFile()
      * Validate file
      *
      * @param array $optionValue
-     * @return bool
      * @throws Mage_Core_Exception
      * @throws Zend_Validate_Exception
+     * @return bool
      */
     protected function _validateFile($optionValue)
     {
@@ -398,8 +398,8 @@ protected function _validateFile($optionValue)
      * Get Error messages for validator Errors
      * @param array $errors Array of validation failure message codes @see Zend_Validate::getErrors()
      * @param array $fileInfo File info
-     * @return array Array of error messages
      * @throws Mage_Core_Exception
+     * @return array Array of error messages
      */
     protected function _getValidatorErrors($errors, $fileInfo)
     {
@@ -425,8 +425,8 @@ protected function _getValidatorErrors($errors, $fileInfo)
     /**
      * Prepare option value for cart
      *
-     * @return mixed Prepared option value
      * @throws Mage_Core_Exception
+     * @return mixed Prepared option value
      */
     public function prepareForCart()
     {
@@ -503,8 +503,8 @@ public function getFormattedOptionValue($optionValue)
      * Format File option html
      *
      * @param array|string $optionValue Serialized string of option data or its data array
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     protected function _getOptionHtml($optionValue)
     {
@@ -537,8 +537,8 @@ protected function _getOptionHtml($optionValue)
      * Create a value from a storable representation
      *
      * @param mixed $value
-     * @return array
      * @throws Exception
+     * @return array
      */
     protected function _unserializeValue($value)
     {
@@ -741,8 +741,8 @@ protected function _createWriteableDir($path)
      *
      * @param string $route
      * @param array $params
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _getOptionDownloadUrl($route, $params)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
index 0f8e05d6157..bf2e70c72d3 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Select.php
@@ -17,8 +17,8 @@ class Mage_Catalog_Model_Product_Option_Type_Select extends Mage_Catalog_Model_P
     /**
      * Validate user input for option
      *
-     * @throws Mage_Core_Exception
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
+     * @throws Mage_Core_Exception
      * @return Mage_Catalog_Model_Product_Option_Type_Default
      */
     public function validateUserValue($values)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
index df6539b9be4..54327e01ddf 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Type/Text.php
@@ -22,8 +22,8 @@ public function getUserValue(): string
     /**
      * Validate user input for option
      *
-     * @throws Mage_Core_Exception
      * @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
+     * @throws Mage_Core_Exception
      * @return $this
      */
     public function validateUserValue($values)
diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
index 6a2c1308665..406e113bdf5 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Option/Value.php
@@ -127,8 +127,8 @@ public function getProduct()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function saveValues()
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Status.php b/app/code/core/Mage/Catalog/Model/Product/Status.php
index 20cbe7a8c36..7d5ba7eeffd 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Status.php
@@ -299,8 +299,8 @@ public function getAttribute()
      *
      * @param Mage_Eav_Model_Entity_Collection_Abstract $collection
      * @param string $dir direction
-     * @return Mage_Catalog_Model_Product_Status
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product_Status
      */
     public function addValueSortToCollection($collection, $dir = 'asc')
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
index 3e8183b5928..2ec67c620be 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php
@@ -556,8 +556,8 @@ protected function _prepareOptionsForCart(Varien_Object $buyRequest, $product =
      * Check if product can be bought
      *
      * @param  Mage_Catalog_Model_Product $product
-     * @return Mage_Catalog_Model_Product_Type_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product_Type_Abstract
      */
     public function checkProductBuyState($product = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
index 3e4066993b7..7381be88b24 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Configurable.php
@@ -670,8 +670,8 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process
      * Check if product can be bought
      *
      * @param  Mage_Catalog_Model_Product $product
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function checkProductBuyState($product = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index c44c5397be3..53d3377ebcd 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -320,8 +320,8 @@ public function getFormatedTierPrice($qty, $product)
      * Get formatted by currency product price
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return float|string
      * @throws Mage_Core_Model_Store_Exception
+     * @return float|string
      */
     public function getFormatedPrice($product)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Product/Visibility.php b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
index 4eda2acebdc..523cd2dd9f2 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Visibility.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Visibility.php
@@ -247,8 +247,8 @@ public function getAttribute()
      *
      * @param Mage_Catalog_Model_Resource_Product_Collection $collection
      * @param string $dir direction
-     * @return Mage_Catalog_Model_Product_Visibility
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Product_Visibility
      */
     public function addValueSortToCollection($collection, $dir = 'asc')
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
index bd2ee45a4fb..f908269bb62 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Indexer/Product.php
@@ -301,8 +301,8 @@ public function catalogCategorySave(Mage_Index_Model_Event $event)
     /**
      * Reindex not anchor root categories
      *
-     * @return $this
      * @throws Zend_Db_Adapter_Exception
+     * @return $this
      */
     protected function _refreshNotAnchorRootCategories(?array $categoryIds = null)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php
index 10abd6171e1..c487a36cfe1 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Collection/Abstract.php
@@ -79,8 +79,8 @@ public function getDefaultStoreId()
      *
      * @param string $table
      * @param array|int $attributeIds
-     * @return Varien_Db_Select|Zend_Db_Select
      * @throws Mage_Core_Exception
+     * @return Varien_Db_Select|Zend_Db_Select
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
index c00935b191c..1d1d6e644cb 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Collection.php
@@ -1767,9 +1767,9 @@ protected function _productLimitationJoinPrice()
      * Join Product Price Table with left-join possibility
      *
      * @param bool $joinLeft
-     * @return $this
      * @throws Zend_Db_Exception
      * @throws Zend_Db_Select_Exception
+     * @return $this
      * @see Mage_Catalog_Model_Resource_Product_Collection::_productLimitationJoinPrice()
      */
     protected function _productLimitationPrice($joinLeft = false)
@@ -2071,8 +2071,8 @@ public function addTierPriceData()
      *
      * @param string $comparisonFormat - expression for sprintf()
      * @param array $fields - list of fields
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addPriceDataFieldFilter($comparisonFormat, $fields)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php
index 24932a10f8a..2b8aa37788c 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Eav/Abstract.php
@@ -43,8 +43,8 @@ public function reindexAll()
      * Rebuild index data by entities
      *
      * @param array|int $processIds
-     * @return Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract
      * @throws Exception
+     * @return Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract
      */
     public function reindexEntities($processIds)
     {
@@ -238,8 +238,8 @@ protected function _removeAttributeIndexData($attributeId)
      * Synchronize temporary index table with index table by attribute id
      *
      * @param int $attributeId
-     * @return Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract
      * @throws Exception
+     * @return Mage_Catalog_Model_Resource_Product_Indexer_Eav_Abstract
      */
     protected function _synchronizeAttributeIndexData($attributeId)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
index 1a9a14da746..9c273473ea5 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php
@@ -93,8 +93,8 @@ public function catalogProductDelete(Mage_Index_Model_Event $event)
      * Copy data from temporary index table to main table by defined ids
      *
      * @param array $processIds
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _copyIndexDataToMainTable($processIds)
     {
@@ -304,8 +304,8 @@ public function reindexProductIds($ids)
      * Retrieve Price indexer by Product Type
      *
      * @param string $productTypeId
-     * @return Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Resource_Product_Indexer_Price_Interface
      */
     protected function _getIndexer($productTypeId)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php
index 82a46861590..4a5c59f4e8e 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Status.php
@@ -81,9 +81,9 @@ public function refreshEnabledIndex($productId, $storeId)
      * @param int $productId
      * @param int $storeId
      * @param int $value
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Zend_Db_Adapter_Exception
+     * @return $this
      */
     public function updateProductStatus($productId, $storeId, $value)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php
index 45d6305d018..68765fb6782 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Website.php
@@ -34,8 +34,8 @@ protected function _getProductResource()
      *
      * @param array $websiteIds
      * @param array $productIds
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function removeProducts($websiteIds, $productIds)
     {
@@ -69,8 +69,8 @@ public function removeProducts($websiteIds, $productIds)
      *
      * @param array $websiteIds
      * @param array $productIds
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addProducts($websiteIds, $productIds)
     {
diff --git a/app/code/core/Mage/Catalog/Model/Url.php b/app/code/core/Mage/Catalog/Model/Url.php
index b2fd22fc107..fb7c33671f8 100644
--- a/app/code/core/Mage/Catalog/Model/Url.php
+++ b/app/code/core/Mage/Catalog/Model/Url.php
@@ -362,8 +362,8 @@ protected function _refreshCategoryRewrites(Varien_Object $category, $parentPath
     /**
      * Refresh product rewrite
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _refreshProductRewrite(Varien_Object $product, Varien_Object $category)
     {
@@ -919,8 +919,8 @@ public function getProductRequestPath($product, $category)
      * @param Mage_Catalog_Model_Product|Varien_Object $product
      * @param Mage_Catalog_Model_Category|Varien_Object $category
      * @param string $parentPath
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function generatePath($type = 'target', $product = null, $category = null, $parentPath = null)
     {
diff --git a/app/code/core/Mage/Catalog/controllers/CategoryController.php b/app/code/core/Mage/Catalog/controllers/CategoryController.php
index cd54a0f3a29..ded9e824690 100644
--- a/app/code/core/Mage/Catalog/controllers/CategoryController.php
+++ b/app/code/core/Mage/Catalog/controllers/CategoryController.php
@@ -17,8 +17,8 @@ class Mage_Catalog_CategoryController extends Mage_Core_Controller_Front_Action
     /**
      * Initialize requested category object
      *
-     * @return false|Mage_Catalog_Model_Category
      * @throws Mage_Core_Exception
+     * @return false|Mage_Catalog_Model_Category
      */
     protected function _initCategory()
     {
@@ -59,8 +59,8 @@ protected function _initCategory()
     /**
      * Initialize requested category object
      *
-     * @return Mage_Catalog_Model_Category
      * @throws Mage_Core_Exception
+     * @return Mage_Catalog_Model_Category
      * @deprecated use method _initCategory
      */
     protected function _initCatagory()
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
index 391f8a50d7b..07f3473d69f 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
@@ -52,8 +52,8 @@ protected function _construct()
     }
 
     /**
-     * @return Mage_Eav_Model_Entity_Attribute_Abstract|mixed
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Attribute_Abstract|mixed
      */
     public function getTierPriceAttribute()
     {
@@ -67,8 +67,8 @@ public function getTierPriceAttribute()
     }
 
     /**
-     * @return Mage_Eav_Model_Entity_Attribute_Abstract|mixed
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Attribute_Abstract|mixed
      */
     public function getPriceAttribute()
     {
diff --git a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
index 49996e3f896..2987fa5526a 100644
--- a/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
+++ b/app/code/core/Mage/CatalogIndex/Model/Retreiver.php
@@ -74,8 +74,8 @@ protected function _construct()
      * Returns data retriever model by specified product type
      *
      * @param string $type
-     * @return false|Mage_CatalogIndex_Model_Data_Abstract
      * @throws Mage_Core_Exception
+     * @return false|Mage_CatalogIndex_Model_Data_Abstract
      */
     public function getRetreiver($type)
     {
diff --git a/app/code/core/Mage/CatalogInventory/Model/Observer.php b/app/code/core/Mage/CatalogInventory/Model/Observer.php
index ed9244a9dd5..acda334ed32 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Observer.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Observer.php
@@ -309,8 +309,8 @@ protected function _removeErrorsFromQuoteAndItem($item, $code)
      * Check product inventory data when quote item quantity declaring
      *
      * @param  Varien_Event_Observer $observer
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function checkQuoteItemQty($observer)
     {
diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php
index 22dc10301c4..9faa45b1c9a 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Status.php
@@ -27,8 +27,8 @@ protected function _construct()
      * @param float|int $qty
      * @param int $stockId
      * @param null|int $websiteId
-     * @return $this
      * @throws Zend_Db_Adapter_Exception
+     * @return $this
      */
     public function saveProductStatus(
         Mage_CatalogInventory_Model_Stock_Status $object,
diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
index 79e52fe953f..ecbbb57f370 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Stock/Item/Api.php
@@ -61,8 +61,8 @@ public function items($productIds)
     /**
      * @param string $productId
      * @param array $data
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function update($productId, $data)
     {
diff --git a/app/code/core/Mage/CatalogRule/Model/Observer.php b/app/code/core/Mage/CatalogRule/Model/Observer.php
index a0326551bcc..d7e25a6aecd 100644
--- a/app/code/core/Mage/CatalogRule/Model/Observer.php
+++ b/app/code/core/Mage/CatalogRule/Model/Observer.php
@@ -385,8 +385,8 @@ public function catalogAttributeDeleteAfter(Varien_Event_Observer $observer)
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function prepareCatalogProductCollectionPrices(Varien_Event_Observer $observer)
     {
diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
index d420e5cc822..16ceade47de 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Advanced/Result.php
@@ -107,8 +107,8 @@ public function getProductListHtml()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getFormUrl()
     {
diff --git a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
index dd8a6637f7c..8557226c39d 100644
--- a/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
+++ b/app/code/core/Mage/CatalogSearch/Block/Autocomplete.php
@@ -20,8 +20,8 @@ class Mage_CatalogSearch_Block_Autocomplete extends Mage_Core_Block_Abstract
     protected $_suggestData;
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/CatalogSearch/Model/Advanced.php b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
index 73fa23545c2..f2279d8610e 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Advanced.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Advanced.php
@@ -317,8 +317,8 @@ public function getProductCollection()
      * Prepare product collection
      *
      * @param Mage_CatalogSearch_Model_Resource_Advanced_Collection $collection
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function prepareProductCollection($collection)
     {
diff --git a/app/code/core/Mage/Centinel/Model/Api.php b/app/code/core/Mage/Centinel/Model/Api.php
index bd063110c6e..3f82a1d983b 100644
--- a/app/code/core/Mage/Centinel/Model/Api.php
+++ b/app/code/core/Mage/Centinel/Model/Api.php
@@ -154,8 +154,8 @@ protected function _call($method, $data)
     /**
      * Getter for API call URL
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _getApiEndpointUrl()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Agreements.php b/app/code/core/Mage/Checkout/Block/Agreements.php
index ed456cd7bd7..744e144d31f 100644
--- a/app/code/core/Mage/Checkout/Block/Agreements.php
+++ b/app/code/core/Mage/Checkout/Block/Agreements.php
@@ -18,8 +18,8 @@
 class Mage_Checkout_Block_Agreements extends Mage_Core_Block_Template
 {
     /**
-     * @return mixed
      * @throws Mage_Core_Model_Store_Exception
+     * @return mixed
      */
     public function getAgreements()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Cart.php b/app/code/core/Mage/Checkout/Block/Cart.php
index 0d0ab4ddbd9..9a9b8d0a850 100644
--- a/app/code/core/Mage/Checkout/Block/Cart.php
+++ b/app/code/core/Mage/Checkout/Block/Cart.php
@@ -167,8 +167,8 @@ public function getMethods($nameInLayout)
      * Return HTML of checkout method (link, button etc.)
      *
      * @param string $name Block name in layout
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getMethodHtml($name)
     {
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
index 1c5f2275a5f..d8da15d88c6 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Item/Renderer.php
@@ -250,8 +250,8 @@ public function getDeleteUrlCustom($addFormKey = true)
     /**
      * Get item ajax delete url
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getAjaxDeleteUrl()
     {
@@ -270,8 +270,8 @@ public function getAjaxDeleteUrl()
     /**
      * Get item ajax update url
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getAjaxUpdateUrl()
     {
@@ -512,8 +512,8 @@ public function getCacheTags()
     /**
      * Returns true if user is going through checkout process now.
      *
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function isOnCheckoutPage()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
index 0ff62499b75..7b71feaeb53 100644
--- a/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/core/Mage/Checkout/Block/Cart/Sidebar.php
@@ -160,8 +160,8 @@ public function getCheckoutUrl()
     /**
      * Define if Shopping Cart Sidebar enabled
      *
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function getIsNeedToDisplaySideBar()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
index 1f350fd2d1c..2eefc5c997e 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Addresses.php
@@ -37,8 +37,8 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function getItems()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
index fbf7d106605..77b6abd07c8 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Overview.php
@@ -70,8 +70,8 @@ public function getPaymentHtml()
     /**
      * Get object with payment info posted data
      *
-     * @return Varien_Object
      * @throws Exception
+     * @return Varien_Object
      */
     public function getPayment()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
index 18f511e0275..d107611ecf9 100644
--- a/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
+++ b/app/code/core/Mage/Checkout/Block/Multishipping/Shipping.php
@@ -60,8 +60,8 @@ public function getAddressCount()
 
     /**
      * @param Mage_Sales_Model_Quote_Address $address
-     * @return array|mixed
      * @throws Exception
+     * @return array|mixed
      */
     public function getAddressItems($address)
     {
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
index 8a466ceb215..5893967528f 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Abstract.php
@@ -160,8 +160,8 @@ public function getAddressesHtmlSelect($type)
 
     /**
      * @param string $type
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getCountryHtmlSelect($type)
     {
@@ -192,8 +192,8 @@ public function getRegionHtmlSelect($type)
 
     /**
      * @deprecated
-     * @return bool|mixed
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool|mixed
      */
     public function getCountryOptions()
     {
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
index e3e0cd823b0..32e54947ca0 100644
--- a/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/core/Mage/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -19,8 +19,8 @@ class Mage_Checkout_Block_Onepage_Shipping_Method_Available extends Mage_Checkou
     protected $_address;
 
     /**
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function getShippingRates()
     {
diff --git a/app/code/core/Mage/Checkout/Helper/Data.php b/app/code/core/Mage/Checkout/Helper/Data.php
index 98936267d37..8a7ee37937e 100644
--- a/app/code/core/Mage/Checkout/Helper/Data.php
+++ b/app/code/core/Mage/Checkout/Helper/Data.php
@@ -62,8 +62,8 @@ public function convertPrice($price, $format = true)
     }
 
     /**
-     * @return null|array
      * @throws Mage_Core_Model_Store_Exception
+     * @return null|array
      */
     public function getRequiredAgreementIds()
     {
diff --git a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
index 910c6fe527d..7d87f1bee3f 100644
--- a/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
+++ b/app/code/core/Mage/Checkout/Model/Api/Resource/Customer.php
@@ -32,8 +32,8 @@ class Mage_Checkout_Model_Api_Resource_Customer extends Mage_Checkout_Model_Api_
 
     /**
      * @param int $customerId
-     * @return Mage_Customer_Model_Customer
      * @throws Mage_Api_Exception
+     * @return Mage_Customer_Model_Customer
      */
     protected function _getCustomer($customerId)
     {
diff --git a/app/code/core/Mage/Checkout/Model/Session.php b/app/code/core/Mage/Checkout/Model/Session.php
index bf174627b27..5568d81c4f2 100644
--- a/app/code/core/Mage/Checkout/Model/Session.php
+++ b/app/code/core/Mage/Checkout/Model/Session.php
@@ -243,8 +243,8 @@ public function getQuote()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _getQuoteIdKey()
     {
diff --git a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
index e7a32839c92..10814395b45 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Multishipping.php
@@ -412,8 +412,8 @@ public function setPaymentMethod($payment)
     /**
      * Prepare order based on quote address
      *
-     * @return  Mage_Sales_Model_Order
      * @throws  Mage_Checkout_Exception
+     * @return  Mage_Sales_Model_Order
      */
     protected function _prepareOrder(Mage_Sales_Model_Quote_Address $address)
     {
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index 47fa7ed919c..a73a50accdd 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -243,8 +243,8 @@ public function getAddress($addressId)
      *
      * @param array $data
      * @param int $customerAddressId
-     * @return array|true
      * @throws Mage_Core_Exception
+     * @return array|true
      */
     public function saveBilling($data, $customerAddressId)
     {
diff --git a/app/code/core/Mage/Checkout/controllers/CartController.php b/app/code/core/Mage/Checkout/controllers/CartController.php
index 33835ea7810..e42d44df106 100644
--- a/app/code/core/Mage/Checkout/controllers/CartController.php
+++ b/app/code/core/Mage/Checkout/controllers/CartController.php
@@ -54,8 +54,8 @@ protected function _getQuote()
     /**
      * Set back redirect url to response
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _goBack()
     {
diff --git a/app/code/core/Mage/Checkout/controllers/OnepageController.php b/app/code/core/Mage/Checkout/controllers/OnepageController.php
index ba6dbd12396..db78d05a613 100644
--- a/app/code/core/Mage/Checkout/controllers/OnepageController.php
+++ b/app/code/core/Mage/Checkout/controllers/OnepageController.php
@@ -544,9 +544,9 @@ protected function _getOrder()
     /**
      * Create invoice
      *
-     * @return Mage_Sales_Model_Service_Order
      * @throws Mage_Core_Exception
      * @throws Mage_Payment_Model_Info_Exception
+     * @return Mage_Sales_Model_Service_Order
      */
     protected function _initInvoice()
     {
diff --git a/app/code/core/Mage/Cms/Block/Block.php b/app/code/core/Mage/Cms/Block/Block.php
index cdec816bf90..01969af5388 100644
--- a/app/code/core/Mage/Cms/Block/Block.php
+++ b/app/code/core/Mage/Cms/Block/Block.php
@@ -32,9 +32,9 @@ protected function _construct()
     /**
      * Prepare Content HTML
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
@@ -59,8 +59,8 @@ protected function _toHtml()
     /**
      * Retrieve values of properties that unambiguously identify unique content
      *
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getCacheKeyInfo()
     {
diff --git a/app/code/core/Mage/Cms/Block/Page.php b/app/code/core/Mage/Cms/Block/Page.php
index 8d2606e7fd6..e9562b3f671 100644
--- a/app/code/core/Mage/Cms/Block/Page.php
+++ b/app/code/core/Mage/Cms/Block/Page.php
@@ -19,8 +19,8 @@ class Mage_Cms_Block_Page extends Mage_Core_Block_Abstract
     /**
      * Retrieve Page instance
      *
-     * @return Mage_Cms_Model_Page
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Cms_Model_Page
      */
     public function getPage()
     {
@@ -111,9 +111,9 @@ protected function _prepareLayout()
     /**
      * Prepare HTML content
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
index 856962cfaa2..cda78eeb085 100644
--- a/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
+++ b/app/code/core/Mage/Cms/Block/Widget/Page/Link.php
@@ -59,8 +59,8 @@ public function getHref()
      * Prepare anchor title attribute using passed title
      * as parameter or retrieve page title from DB using passed identifier or page id.
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getTitle()
     {
@@ -84,8 +84,8 @@ public function getTitle()
      * If anchor text was not specified use title instead and
      * if title will be blank string, page identifier will be used.
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getAnchorText()
     {
diff --git a/app/code/core/Mage/Cms/Helper/Page.php b/app/code/core/Mage/Cms/Helper/Page.php
index 3b0620e6e76..b7ff4f326b7 100644
--- a/app/code/core/Mage/Cms/Helper/Page.php
+++ b/app/code/core/Mage/Cms/Helper/Page.php
@@ -30,8 +30,8 @@ class Mage_Cms_Helper_Page extends Mage_Core_Helper_Abstract
      * Call from controller action
      *
      * @param string $pageId
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId = null)
     {
@@ -43,8 +43,8 @@ public function renderPage(Mage_Core_Controller_Front_Action $action, $pageId =
      *
      * @param string $pageId
      * @param bool $renderLayout
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $pageId = null, $renderLayout = true)
     {
@@ -132,8 +132,8 @@ protected function _renderPage(Mage_Core_Controller_Varien_Action $action, $page
      *
      * @param string $pageId
      * @param bool $renderLayout
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function renderPageExtended(Mage_Core_Controller_Varien_Action $action, $pageId = null, $renderLayout = true)
     {
@@ -144,8 +144,8 @@ public function renderPageExtended(Mage_Core_Controller_Varien_Action $action, $
      * Retrieve page direct URL
      *
      * @param string $pageId
-     * @return null|string
      * @throws Mage_Core_Model_Store_Exception
+     * @return null|string
      */
     public function getPageUrl($pageId = null)
     {
diff --git a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php
index 5886d66fac2..bf39bda22c3 100644
--- a/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php
+++ b/app/code/core/Mage/Cms/Model/Adminhtml/Template/Filter.php
@@ -21,9 +21,8 @@ class Mage_Cms_Model_Adminhtml_Template_Filter extends Mage_Cms_Model_Template_F
      *
      * @param array $construction
      *
-     * @return string
-     *
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function mediaDirective($construction)
     {
diff --git a/app/code/core/Mage/Cms/Model/Resource/Block.php b/app/code/core/Mage/Cms/Model/Resource/Block.php
index 8d4c0fa69f2..27d237124cd 100644
--- a/app/code/core/Mage/Cms/Model/Resource/Block.php
+++ b/app/code/core/Mage/Cms/Model/Resource/Block.php
@@ -36,8 +36,8 @@ protected function _beforeDelete(Mage_Core_Model_Abstract $object)
     /**
      * Perform operations before object save
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _beforeSave(Mage_Core_Model_Abstract $object)
     {
diff --git a/app/code/core/Mage/Cms/Model/Resource/Page.php b/app/code/core/Mage/Cms/Model/Resource/Page.php
index 84c89123a95..a0cd4518e5c 100644
--- a/app/code/core/Mage/Cms/Model/Resource/Page.php
+++ b/app/code/core/Mage/Cms/Model/Resource/Page.php
@@ -187,8 +187,8 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object)
      * @param string $field
      * @param mixed $value
      * @param Mage_Cms_Model_Page $object
-     * @return Zend_Db_Select
      * @throws Exception
+     * @return Zend_Db_Select
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -331,8 +331,8 @@ public function checkIdentifier($identifier, $storeId)
      * Retrieves cms page title from DB by passed identifier.
      *
      * @param int|string $identifier
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getCmsPageTitleByIdentifier($identifier)
     {
@@ -424,8 +424,8 @@ public function setStore($store)
     /**
      * Retrieve store model
      *
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
diff --git a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
index e5bf1c21ab1..3d3a7cd39e9 100644
--- a/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/core/Mage/Cms/Model/Wysiwyg/Images/Storage.php
@@ -271,8 +271,8 @@ public function deleteFile($target)
      *
      * @param string $targetPath Target directory
      * @param string $type Type of storage, e.g. image, media etc.
-     * @return array|bool|void
      *@throws Mage_Core_Exception
+     * @return array|bool|void
      */
     public function uploadFile($targetPath, $type = null)
     {
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
index 8699badc90a..4983d6474d9 100644
--- a/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
+++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Productimg.php
@@ -272,8 +272,8 @@ public function getGlobalSwatchUrl(
      * @param string $value
      * @param int $width
      * @param int $height
-     * @return false|string $destPath
      * @throws Mage_Core_Exception
+     * @return false|string $destPath
      */
     public function createSwatchImage($value, $width, $height)
     {
diff --git a/app/code/core/Mage/Core/Block/Abstract.php b/app/code/core/Mage/Core/Block/Abstract.php
index 1672ce59550..ca0e204244f 100644
--- a/app/code/core/Mage/Core/Block/Abstract.php
+++ b/app/code/core/Mage/Core/Block/Abstract.php
@@ -234,8 +234,8 @@ protected function _getApp()
     /**
      * Retrieve request object
      *
-     * @return Mage_Core_Controller_Request_Http
      * @throws Exception
+     * @return Mage_Core_Controller_Request_Http
      */
     public function getRequest()
     {
diff --git a/app/code/core/Mage/Core/Block/Html/Calendar.php b/app/code/core/Mage/Core/Block/Html/Calendar.php
index 42a326fd33e..06e680d556e 100644
--- a/app/code/core/Mage/Core/Block/Html/Calendar.php
+++ b/app/code/core/Mage/Core/Block/Html/Calendar.php
@@ -16,8 +16,8 @@
 class Mage_Core_Block_Html_Calendar extends Mage_Core_Block_Template
 {
     /**
-     * @return string
      * @throws Zend_Locale_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Core/Block/Store/Switcher.php b/app/code/core/Mage/Core/Block/Store/Switcher.php
index 1238510612b..1e3f3ac6b3f 100644
--- a/app/code/core/Mage/Core/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Core/Block/Store/Switcher.php
@@ -34,8 +34,8 @@ public function __construct()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _loadData()
     {
@@ -101,8 +101,8 @@ public function getStoreCount()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getLanguageCount()
     {
@@ -117,8 +117,8 @@ public function getLanguageCount()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCurrentStoreId()
     {
@@ -126,8 +126,8 @@ public function getCurrentStoreId()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getCurrentStoreCode()
     {
diff --git a/app/code/core/Mage/Core/Block/Template/Zend.php b/app/code/core/Mage/Core/Block/Template/Zend.php
index 88035e31c3b..bc07eead1fe 100644
--- a/app/code/core/Mage/Core/Block/Template/Zend.php
+++ b/app/code/core/Mage/Core/Block/Template/Zend.php
@@ -31,8 +31,8 @@ public function _construct()
     /**
      * @param array|string $key
      * @param null|array|string $value
-     * @return $this|Mage_Core_Block_Template
      * @throws Zend_View_Exception
+     * @return $this|Mage_Core_Block_Template
      */
     public function assign($key, $value = null)
     {
diff --git a/app/code/core/Mage/Core/Controller/Request/Http.php b/app/code/core/Mage/Core/Controller/Request/Http.php
index 38c92117e3b..e0028f36faf 100644
--- a/app/code/core/Mage/Core/Controller/Request/Http.php
+++ b/app/code/core/Mage/Core/Controller/Request/Http.php
@@ -88,8 +88,8 @@ public function getOriginalPathInfo()
     }
 
     /**
-     * @return null|string
      * @throws Mage_Core_Model_Store_Exception
+     * @return null|string
      */
     public function getStoreCodeFromPath()
     {
diff --git a/app/code/core/Mage/Core/Controller/Varien/Action.php b/app/code/core/Mage/Core/Controller/Varien/Action.php
index 18dd6d2b635..657648bd672 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Action.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Action.php
@@ -263,8 +263,8 @@ public function loadLayout($handles = null, $generateBlocks = true, $generateXml
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function addActionLayoutHandles()
     {
@@ -286,8 +286,8 @@ public function addActionLayoutHandles()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function loadLayoutUpdates()
     {
diff --git a/app/code/core/Mage/Core/Controller/Varien/Front.php b/app/code/core/Mage/Core/Controller/Varien/Front.php
index d04e29c7a8e..a7bffe37440 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Front.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Front.php
@@ -155,8 +155,8 @@ public function init()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function dispatch()
     {
diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
index 2b4ec2b136e..c22e97a0d51 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Standard.php
@@ -300,8 +300,8 @@ protected function _validateControllerInstance($controllerInstance)
      *
      * @param string $realModule
      * @param string $controller
-     * @return false|string
      * @throws Mage_Core_Exception
+     * @return false|string
      */
     protected function _validateControllerClassName($realModule, $controller)
     {
@@ -326,8 +326,8 @@ protected function _validateControllerClassName($realModule, $controller)
     /**
      * @param string $controllerFileName
      * @param string $controllerClassName
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      * @deprecated
      * @see _includeControllerClass()
      */
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index 0db834f971f..cd852e396d9 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -322,8 +322,8 @@ public function getHashPassword($password, $salt = false)
     /**
      * @param string $password
      * @param string $hash
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function validateHash($password, $hash)
     {
@@ -624,8 +624,8 @@ private function _decorateArrayObject($element, $key, $value, $dontSkip)
      * Array has some limitations. Appropriate exceptions will be thrown
      *
      * @param string $rootName
-     * @return SimpleXMLElement
      * @throws Exception
+     * @return SimpleXMLElement
      */
     public function assocToXml(array $array, $rootName = '_')
     {
@@ -651,8 +651,8 @@ public function assocToXml(array $array, $rootName = '_')
      * Function, that actually recursively transforms array to xml
      *
      * @param string $rootName
-     * @return SimpleXMLElement
      * @throws Exception
+     * @return SimpleXMLElement
      */
     // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private function _assocToXml(array $array, $rootName, SimpleXMLElement &$xml)
@@ -743,8 +743,8 @@ public function jsonEncode($valueToEncode, $cycleCheck = false, $options = [])
      *
      * @param string $encodedValue
      * @param int $objectDecodeType
-     * @return mixed
      * @throws Zend_Json_Exception
+     * @return mixed
      */
     public function jsonDecode($encodedValue, $objectDecodeType = Zend_Json::TYPE_ARRAY)
     {
@@ -920,8 +920,8 @@ public function getPublicFilesValidPath()
     /**
      * Check LFI protection
      *
-     * @throws Mage_Core_Exception
      * @param string $name
+     * @throws Mage_Core_Exception
      * @return bool
      */
     public function checkLfiProtection($name)
diff --git a/app/code/core/Mage/Core/Helper/String.php b/app/code/core/Mage/Core/Helper/String.php
index d0d1613e177..4cab20c40d7 100644
--- a/app/code/core/Mage/Core/Helper/String.php
+++ b/app/code/core/Mage/Core/Helper/String.php
@@ -533,8 +533,8 @@ public function uniOrd($c)
     /**
      * UnSerialize string
      * @param null|string $str
-     * @return null|void
      * @throws Exception
+     * @return null|void
      */
     public function unserialize($str)
     {
diff --git a/app/code/core/Mage/Core/Helper/UnserializeArray.php b/app/code/core/Mage/Core/Helper/UnserializeArray.php
index b821c06b423..34c7db29c9f 100644
--- a/app/code/core/Mage/Core/Helper/UnserializeArray.php
+++ b/app/code/core/Mage/Core/Helper/UnserializeArray.php
@@ -16,8 +16,8 @@ class Mage_Core_Helper_UnserializeArray
 {
     /**
      * @param string $str
-     * @return array
      * @throws Exception
+     * @return array
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
     public function unserialize($str)
diff --git a/app/code/core/Mage/Core/Helper/Url.php b/app/code/core/Mage/Core/Helper/Url.php
index c68a8766e76..f7a59983957 100644
--- a/app/code/core/Mage/Core/Helper/Url.php
+++ b/app/code/core/Mage/Core/Helper/Url.php
@@ -181,8 +181,8 @@ public function encodePunycode($url)
      * Retrieve decoding domain name from punycode
      *
      * @param string $url decode url from Punycode
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function decodePunycode($url)
     {
diff --git a/app/code/core/Mage/Core/Helper/Url/Rewrite.php b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
index 8867eceec92..a0023d34a22 100644
--- a/app/code/core/Mage/Core/Helper/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Helper/Url/Rewrite.php
@@ -34,8 +34,8 @@ class Mage_Core_Helper_Url_Rewrite extends Mage_Core_Helper_Abstract
      * If something is wrong with a path it throws localized error message and error code,
      * that can be checked to by wrapper func to alternate error message
      *
-     * @throws Mage_Core_Exception
      * @param string $requestPath
+     * @throws Mage_Core_Exception
      * @return bool
      */
     protected function _validateRequestPath($requestPath)
@@ -80,8 +80,8 @@ public function validateRequestPath($requestPath)
      * Validates suffix for url rewrites to inform user about errors in it
      * Either returns TRUE (success) or throws error (validation failed)
      *
-     * @throws Exception|Mage_Core_Exception
      * @param string $suffix
+     * @throws Exception|Mage_Core_Exception
      * @return bool
      */
     public function validateSuffix($suffix)
diff --git a/app/code/core/Mage/Core/Model/Abstract.php b/app/code/core/Mage/Core/Model/Abstract.php
index fd695458878..5850534ad70 100644
--- a/app/code/core/Mage/Core/Model/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Abstract.php
@@ -245,8 +245,8 @@ public function getResourceName()
     /**
      * Get collection instance
      *
-     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     public function getResourceCollection()
     {
@@ -263,8 +263,8 @@ public function getResourceCollection()
     }
 
     /**
-     * @return false|Mage_Core_Model_Resource_Db_Collection_Abstract
      * @throws Mage_Core_Exception
+     * @return false|Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     public function getCollection()
     {
@@ -356,8 +356,8 @@ protected function _hasModelChanged()
     /**
      * Save object data
      *
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function save()
     {
@@ -521,8 +521,8 @@ protected function _afterSave()
     /**
      * Delete object from database
      *
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function delete()
     {
diff --git a/app/code/core/Mage/Core/Model/App.php b/app/code/core/Mage/Core/Model/App.php
index e923e42b139..64da31cc987 100644
--- a/app/code/core/Mage/Core/Model/App.php
+++ b/app/code/core/Mage/Core/Model/App.php
@@ -854,8 +854,8 @@ public function getArea($code)
      * Retrieve application store object
      *
      * @param null|bool|int|Mage_Core_Model_Store|string $id
-     * @return null|Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return null|Mage_Core_Model_Store
      */
     public function getStore($id = null)
     {
@@ -1402,8 +1402,8 @@ public function addEventArea($area)
     /**
      * @param string $eventName
      * @param array $args
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function dispatchEvent($eventName, $args)
     {
@@ -1477,8 +1477,8 @@ public function dispatchEvent($eventName, $args)
      * @param string $method
      * @param Varien_Event_Observer $observer
      * @param string $observerName
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _callObserverMethod($object, $method, $observer, $observerName = 'undefined')
     {
diff --git a/app/code/core/Mage/Core/Model/App/Area.php b/app/code/core/Mage/Core/Model/App/Area.php
index 51fc2a5a6bf..3a2d2b971f5 100644
--- a/app/code/core/Mage/Core/Model/App/Area.php
+++ b/app/code/core/Mage/Core/Model/App/Area.php
@@ -147,9 +147,9 @@ protected function _initTranslate()
     }
 
     /**
-     * @return $this|void
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this|void
      */
     protected function _initDesign()
     {
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index 513f234f5a5..6dc4958c532 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -517,8 +517,8 @@ public function getCache()
      *   - CLI: throws exception
      *   - Other: 503 error
      *
-     * @return void
      * @throws Exception
+     * @return void
      * @SuppressWarnings("PHPMD.ExitExpression")
      */
     public function getCacheSaveLock($waitTime = null, $ignoreFailure = false)
@@ -1236,8 +1236,8 @@ public function getModuleSetup($module = '')
      * @deprecated in favor of Mage_Core_Model_Config_Options
      * @todo get global dir config
      * @param string $type
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getBaseDir($type = 'base')
     {
diff --git a/app/code/core/Mage/Core/Model/Config/Options.php b/app/code/core/Mage/Core/Model/Config/Options.php
index cb5a78a107b..827b02d8e55 100644
--- a/app/code/core/Mage/Core/Model/Config/Options.php
+++ b/app/code/core/Mage/Core/Model/Config/Options.php
@@ -56,8 +56,8 @@ protected function _construct()
 
     /**
      * @param string $type
-     * @return mixed
      * @throws Mage_Core_Exception
+     * @return mixed
      */
     public function getDir($type)
     {
@@ -160,8 +160,8 @@ public function getSysTmpDir()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getVarDir()
     {
@@ -178,8 +178,8 @@ public function getVarDir()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getTmpDir()
     {
diff --git a/app/code/core/Mage/Core/Model/Cookie.php b/app/code/core/Mage/Core/Model/Cookie.php
index c4ebfd82302..47b8e6183e9 100644
--- a/app/code/core/Mage/Core/Model/Cookie.php
+++ b/app/code/core/Mage/Core/Model/Cookie.php
@@ -185,8 +185,8 @@ public function getSameSite(): string
      * Is https secure request
      * Use secure on adminhtml only
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isSecure()
     {
@@ -213,9 +213,9 @@ public function isSecure()
      * @param bool|int $secure
      * @param bool $httponly
      * @param string $sameSite
-     * @return $this
      * @throws Zend_Controller_Response_Exception
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function set($name, $value, $period = null, $path = null, $domain = null, $secure = null, $httponly = null, $sameSite = null)
     {
@@ -289,9 +289,9 @@ public function set($name, $value, $period = null, $path = null, $domain = null,
      * @param bool|int $secure
      * @param bool $httponly
      * @param string $sameSite
-     * @return $this
      * @throws Zend_Controller_Response_Exception
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function renew($name, $period = null, $path = null, $domain = null, $secure = null, $httponly = null, $sameSite = null)
     {
@@ -327,9 +327,9 @@ public function get($name = null)
      * @param bool|int $secure
      * @param bool|int $httponly
      * @param string $sameSite
-     * @return $this
      * @throws Zend_Controller_Response_Exception
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function delete($name, $path = null, $domain = null, $secure = null, $httponly = null, $sameSite = null)
     {
diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php
index bd7fd9342e2..48573b45c00 100644
--- a/app/code/core/Mage/Core/Model/Date.php
+++ b/app/code/core/Mage/Core/Model/Date.php
@@ -214,8 +214,8 @@ public function checkDateTime($year, $month, $day, $hour = 0, $minute = 0, $seco
     /**
      * @param string $dateTimeString
      * @param string $dateTimeFormat
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      * @deprecated since 1.1.7
      */
     public function parseDateTime($dateTimeString, $dateTimeFormat)
diff --git a/app/code/core/Mage/Core/Model/Design/Fallback.php b/app/code/core/Mage/Core/Model/Design/Fallback.php
index c2c116c19a3..16404d72a54 100644
--- a/app/code/core/Mage/Core/Model/Design/Fallback.php
+++ b/app/code/core/Mage/Core/Model/Design/Fallback.php
@@ -113,8 +113,8 @@ protected function _isInheritanceDefined($area, $package, $theme)
      * @param string $area
      * @param string $package
      * @param string $theme
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     protected function _getFallbackScheme($area, $package, $theme)
     {
diff --git a/app/code/core/Mage/Core/Model/Design/Package.php b/app/code/core/Mage/Core/Model/Design/Package.php
index 1e19aa33320..ccc46f4b20f 100644
--- a/app/code/core/Mage/Core/Model/Design/Package.php
+++ b/app/code/core/Mage/Core/Model/Design/Package.php
@@ -450,8 +450,8 @@ protected function _fallback($file, array &$params, array $fallbackScheme = [[]]
      * $params['_type'] is required
      *
      * @param string $file
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getFilename($file, array $params)
     {
@@ -511,8 +511,8 @@ public function getLocaleFileName($file, array $params = [])
      * Get skin file url
      *
      * @param null|string $file
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSkinUrl($file = null, array $params = [])
     {
diff --git a/app/code/core/Mage/Core/Model/Email.php b/app/code/core/Mage/Core/Model/Email.php
index 1f773d29ad6..1ced248dcf7 100644
--- a/app/code/core/Mage/Core/Model/Email.php
+++ b/app/code/core/Mage/Core/Model/Email.php
@@ -112,8 +112,8 @@ public function getSubject()
     }
 
     /**
-     * @return $this
      * @throws Zend_Mail_Exception
+     * @return $this
      */
     public function send()
     {
diff --git a/app/code/core/Mage/Core/Model/Email/Template/Filter.php b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
index 736d4c70b21..faeefdc44e0 100644
--- a/app/code/core/Mage/Core/Model/Email/Template/Filter.php
+++ b/app/code/core/Mage/Core/Model/Email/Template/Filter.php
@@ -129,8 +129,8 @@ public function setStoreId($storeId)
      * Getter
      * if $_storeId is null return Design store id
      *
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getStoreId()
     {
@@ -196,8 +196,8 @@ public function blockDirective($construction)
      * Retrieve layout html directive
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function layoutDirective($construction)
     {
@@ -260,8 +260,8 @@ protected function _getBlockParameters($value)
      * Retrieve Skin URL directive
      *
      * @param array $construction
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function skinDirective($construction)
     {
@@ -288,8 +288,8 @@ public function mediaDirective($construction)
      * Support url and direct_url properties
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function storeDirective($construction)
     {
@@ -350,8 +350,8 @@ public function htmlescapeDirective($construction)
      * Var directive with modifiers support
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function varDirective($construction)
     {
@@ -428,8 +428,8 @@ public function modifierEscape($value, $type = 'html')
      * also allow additional parameter "store"
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function protocolDirective($construction)
     {
@@ -458,8 +458,8 @@ public function protocolDirective($construction)
      * Store config directive
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function configDirective($construction)
     {
@@ -477,8 +477,8 @@ public function configDirective($construction)
      * Custom Variable directive
      *
      * @param array $construction
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function customvarDirective($construction)
     {
@@ -563,8 +563,8 @@ public function filter($value)
      *
      * @param string $value raw parameters
      * @param string $default default value
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     protected function _getVariable($value, $default = '{no_value_defined}')
     {
diff --git a/app/code/core/Mage/Core/Model/Encryption.php b/app/code/core/Mage/Core/Model/Encryption.php
index ee2d1a35788..cf967fd710f 100644
--- a/app/code/core/Mage/Core/Model/Encryption.php
+++ b/app/code/core/Mage/Core/Model/Encryption.php
@@ -118,8 +118,8 @@ public function hash($data, $version = self::HASH_VERSION_MD5)
      *
      * @param string $password
      * @param string $hash
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function validateHash($password, $hash)
     {
diff --git a/app/code/core/Mage/Core/Model/File/Uploader.php b/app/code/core/Mage/Core/Model/File/Uploader.php
index 00dd7d331ef..5366d7b1c69 100644
--- a/app/code/core/Mage/Core/Model/File/Uploader.php
+++ b/app/code/core/Mage/Core/Model/File/Uploader.php
@@ -95,8 +95,8 @@ public function checkAllowedExtension($extension)
      *
      * @param string $destinationFolder
      * @param null|string $newFileName
-     * @return array|bool
      * @throws Exception
+     * @return array|bool
      */
     public function save($destinationFolder, $newFileName = null)
     {
diff --git a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
index 54106c4bd4e..fe6e14d817f 100644
--- a/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
+++ b/app/code/core/Mage/Core/Model/File/Validator/AvailablePath.php
@@ -192,8 +192,8 @@ public function getAvailablePaths()
      * getMessages() will return an array of messages that explain why the
      * validation failed.
      *
-     * @throws Exception        Throw exception on empty both paths masks types
      * @param string $value     File/dir path
+     * @throws Exception        Throw exception on empty both paths masks types
      * @return bool
      */
     public function isValid($value)
diff --git a/app/code/core/Mage/Core/Model/Input/Filter.php b/app/code/core/Mage/Core/Model/Input/Filter.php
index 31e8bb284c6..1b3cb17d2e1 100644
--- a/app/code/core/Mage/Core/Model/Input/Filter.php
+++ b/app/code/core/Mage/Core/Model/Input/Filter.php
@@ -195,8 +195,8 @@ public function filter($data)
      * @param null|array $filters
      * @param bool $isFilterListSimple
      * @param-out array $filters
-     * @return array
      * @throws Exception    Exception when filter is not found or not instance of defined instances
+     * @return array
      */
     protected function _filter(array $data, &$filters = null, $isFilterListSimple = false)
     {
@@ -258,8 +258,8 @@ protected function _applyFiltrationWithHelper($value, Mage_Core_Helper_Abstract
      * Try to create Magento helper for filtration based on $filterData. Return false on failure
      *
      * @param array $filterData
-     * @return Mage_Core_Helper_Abstract
      * @throws Exception
+     * @return Mage_Core_Helper_Abstract
      */
     protected function _getFiltrationHelper($filterData)
     {
@@ -302,8 +302,8 @@ protected function _getZendFilter($filterData)
      * Get Magento filters
      *
      * @param array $filterData
-     * @return Zend_Filter_Interface
      * @throws Exception
+     * @return Zend_Filter_Interface
      */
     protected function _createCustomZendFilter($filterData)
     {
@@ -330,8 +330,8 @@ protected function _createCustomZendFilter($filterData)
      * Get native Zend_Filter
      *
      * @param array $filterData
-     * @return Zend_Filter_Interface
      * @throws Exception
+     * @return Zend_Filter_Interface
      */
     protected function _createNativeZendFilter($filterData)
     {
diff --git a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
index 7dcf867406c..cbaa06a1b3a 100644
--- a/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
+++ b/app/code/core/Mage/Core/Model/Input/Filter/MaliciousCode.php
@@ -88,8 +88,8 @@ public function setExpressions(array $expressions)
      *
      * @param string $html
      * @param bool $removeWrapper flag for remove wrapper tags: Doctype, html, body
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function linkFilter($html, $removeWrapper = true)
     {
diff --git a/app/code/core/Mage/Core/Model/Layout/Update.php b/app/code/core/Mage/Core/Model/Layout/Update.php
index 7ddde6312a1..04dc2949c39 100644
--- a/app/code/core/Mage/Core/Model/Layout/Update.php
+++ b/app/code/core/Mage/Core/Model/Layout/Update.php
@@ -302,8 +302,8 @@ public function merge($handle)
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function fetchFileLayoutUpdates()
     {
@@ -335,8 +335,8 @@ public function fetchFileLayoutUpdates()
 
     /**
      * @param string $handle
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      */
     public function fetchPackageLayoutUpdates($handle)
     {
diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php
index a72914fed29..c4791e40469 100644
--- a/app/code/core/Mage/Core/Model/Layout/Validator.php
+++ b/app/code/core/Mage/Core/Model/Layout/Validator.php
@@ -131,9 +131,9 @@ protected function _getDisallowedBlockConfigValue()
      * getMessages() will return an array of messages that explain why the
      * validation failed.
      *
+     * @param string|Varien_Simplexml_Element $value
      * @throws Exception            Throw exception when xml object is not
      *                              instance of Varien_Simplexml_Element
-     * @param string|Varien_Simplexml_Element $value
      * @return bool
      */
     public function isValid($value)
diff --git a/app/code/core/Mage/Core/Model/Resource/Cache.php b/app/code/core/Mage/Core/Model/Resource/Cache.php
index 91e5b045d4c..87898869f76 100644
--- a/app/code/core/Mage/Core/Model/Resource/Cache.php
+++ b/app/code/core/Mage/Core/Model/Resource/Cache.php
@@ -45,8 +45,8 @@ public function getAllOptions()
      * Save all options to option table
      *
      * @param array $options
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function saveAllOptions($options)
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
index 2433a3ef6d7..ec2e862e83e 100644
--- a/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Db/Abstract.php
@@ -396,8 +396,8 @@ public function load(Mage_Core_Model_Abstract $object, $value, $field = null)
      * @param string $field
      * @param mixed $value
      * @param Mage_Core_Model_Abstract $object
-     * @return Varien_Db_Select
      * @throws Exception
+     * @return Varien_Db_Select
      */
     protected function _getLoadSelect($field, $value, $object)
     {
@@ -502,8 +502,8 @@ public function forsedSave(Mage_Core_Model_Abstract $object)
     /**
      * Delete the object
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function delete(Mage_Core_Model_Abstract $object)
     {
@@ -630,8 +630,8 @@ protected function _prepareValueForSave($value, $type)
     /**
      * Check for unique values existence
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _checkUnique(Mage_Core_Model_Abstract $object)
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
index 08645c58924..e94d8710861 100644
--- a/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
+++ b/app/code/core/Mage/Core/Model/Resource/Db/Collection/Abstract.php
@@ -512,8 +512,8 @@ public function getData()
     /**
      * Prepare select for load
      *
-     * @return string
      * @throws Zend_Db_Select_Exception
+     * @return string
      */
     protected function _prepareSelect(Varien_Db_Select $select)
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
index 96e5ea9b829..5ed3e540b40 100644
--- a/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
+++ b/app/code/core/Mage/Core/Model/Resource/File/Storage/File.php
@@ -183,8 +183,8 @@ public function saveDir($dir)
      * @param  string $filePath
      * @param  string $content
      * @param  bool $overwrite
-     * @return bool true if file written, otherwise false
      * @throws Mage_Core_Exception
+     * @return bool true if file written, otherwise false
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
diff --git a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
index 732e047c32f..d45b3e5c507 100644
--- a/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
+++ b/app/code/core/Mage/Core/Model/Resource/Helper/Mysql4.php
@@ -158,8 +158,8 @@ protected function _prepareGroup(Varien_Db_Select $select, $autoReset = false)
      * Prepare and returns having array
      *
      * @param bool $autoReset
-     * @return array
      * @throws Zend_Db_Exception
+     * @return array
      */
     protected function _prepareHaving(Varien_Db_Select $select, $autoReset = false)
     {
@@ -227,8 +227,8 @@ protected function _assembleLimit($query, $limitCount, $limitOffset, $columnList
      * Prepare select column list
      *
      * @param string $groupByCondition
-     * @return array
      * @throws Zend_Db_Exception
+     * @return array
      */
     public function prepareColumnsList(Varien_Db_Select $select, $groupByCondition = null)
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Iterator.php b/app/code/core/Mage/Core/Model/Resource/Iterator.php
index 219d663bbd4..8db9ad23f3c 100644
--- a/app/code/core/Mage/Core/Model/Resource/Iterator.php
+++ b/app/code/core/Mage/Core/Model/Resource/Iterator.php
@@ -46,8 +46,8 @@ public function walk($query, array $callbacks, array $args = [], $adapter = null
      *
      * @param string|Zend_Db_Select|Zend_Db_Statement_Interface $query
      * @param Zend_Db_Adapter_Abstract $conn
-     * @return Zend_Db_Statement_Interface
      * @throws Mage_Core_Exception
+     * @return Zend_Db_Statement_Interface
      */
     protected function _getStatement($query, $conn = null)
     {
diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php
index 9ddc4207b15..7b6520da50f 100644
--- a/app/code/core/Mage/Core/Model/Resource/Setup.php
+++ b/app/code/core/Mage/Core/Model/Resource/Setup.php
@@ -584,8 +584,8 @@ protected function _setResourceVersion($actionType, $version)
      * @param string $actionType self::TYPE_*
      * @param string $fromVersion
      * @param string $toVersion
-     * @return false|string
      * @throws Mage_Core_Exception
+     * @return false|string
      */
 
     protected function _modifyResourceDb($actionType, $fromVersion, $toVersion)
diff --git a/app/code/core/Mage/Core/Model/Resource/Transaction.php b/app/code/core/Mage/Core/Model/Resource/Transaction.php
index 802b2200f37..2ed0e2aadce 100644
--- a/app/code/core/Mage/Core/Model/Resource/Transaction.php
+++ b/app/code/core/Mage/Core/Model/Resource/Transaction.php
@@ -123,8 +123,8 @@ public function addCommitCallback($callback)
     /**
      * Initialize objects save transaction
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function save()
     {
@@ -160,8 +160,8 @@ public function save()
     /**
      * Initialize objects delete transaction
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function delete()
     {
diff --git a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
index 63eadfc9be2..d4809b8d3cb 100644
--- a/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
+++ b/app/code/core/Mage/Core/Model/Session/Abstract/Varien.php
@@ -53,8 +53,8 @@ class Mage_Core_Model_Session_Abstract_Varien extends Varien_Object
      * Configure and start session
      *
      * @param string $sessionName
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      * @SuppressWarnings("PHPMD.Superglobals")
      * @SuppressWarnings("PHPMD.ExitExpression")
      */
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index 78bc9bef563..0baaf21bf73 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -201,8 +201,8 @@ public function removeTag($tags)
     /**
      * Implement logic of custom rewrites
      *
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
+     * @return bool
      * @deprecated since 1.7.0.2. Refactored and moved to Mage_Core_Controller_Request_Rewrite
      * @SuppressWarnings("PHPMD.Superglobals")
      */
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
index b58598cd834..106646ce363 100644
--- a/app/code/core/Mage/Cron/Model/Schedule.php
+++ b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -58,8 +58,8 @@ public function getIsError(): bool
 
     /**
      * @param string $expr
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setCronExpr($expr)
     {
@@ -114,8 +114,8 @@ public function trySchedule($time)
     /**
      * @param string $expr
      * @param int $num
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function matchCronExpression($expr, $num)
     {
diff --git a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
index 42c8584b80b..f7e6a887165 100644
--- a/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
+++ b/app/code/core/Mage/Customer/Block/Account/Dashboard/Sidebar.php
@@ -86,8 +86,8 @@ public function getWishlistAddToCartLink($wishlistItem)
     }
 
     /**
-     * @return Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     public function getCompareItems()
     {
diff --git a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
index 8c7dbf285d7..6f2a34f2496 100644
--- a/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
+++ b/app/code/core/Mage/Customer/Block/Address/Renderer/Default.php
@@ -65,8 +65,8 @@ public function getFormat(?Mage_Customer_Model_Address_Abstract $address = null)
      * Render address
      *
      * @param null|string $format
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function render(Mage_Customer_Model_Address_Abstract $address, $format = null)
     {
diff --git a/app/code/core/Mage/Customer/Block/Widget/Name.php b/app/code/core/Mage/Customer/Block/Widget/Name.php
index f373799f548..57c073e9f1b 100644
--- a/app/code/core/Mage/Customer/Block/Widget/Name.php
+++ b/app/code/core/Mage/Customer/Block/Widget/Name.php
@@ -187,8 +187,8 @@ protected function _getAttribute($attributeCode)
      * Retrieve store attribute label
      *
      * @param string $attributeCode
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getStoreLabel($attributeCode)
     {
diff --git a/app/code/core/Mage/Customer/Model/Address/Config.php b/app/code/core/Mage/Customer/Model/Address/Config.php
index 1602c836a2c..3e386e70bef 100644
--- a/app/code/core/Mage/Customer/Model/Address/Config.php
+++ b/app/code/core/Mage/Customer/Model/Address/Config.php
@@ -49,8 +49,8 @@ class Mage_Customer_Model_Address_Config extends Mage_Core_Model_Config_Base
 
     /**
      * @param null|bool|int|Mage_Core_Model_Store|string $store
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function setStore($store)
     {
diff --git a/app/code/core/Mage/Customer/Model/Config/Share.php b/app/code/core/Mage/Customer/Model/Config/Share.php
index 7081a89f937..19a0197ab50 100644
--- a/app/code/core/Mage/Customer/Model/Config/Share.php
+++ b/app/code/core/Mage/Customer/Model/Config/Share.php
@@ -62,8 +62,8 @@ public function toOptionArray()
     /**
      * Check for email duplicates before saving customers sharing options
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function _beforeSave()
     {
diff --git a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
index 30a94533c6b..edf5537411d 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Adapter/Customer.php
@@ -270,9 +270,9 @@ public function __construct()
     }
 
     /**
-     * @return Mage_Eav_Model_Convert_Adapter_Entity
      * @throws Mage_Core_Model_Store_Exception
      * @throws Varien_Convert_Exception
+     * @return Mage_Eav_Model_Convert_Adapter_Entity
      */
     public function load()
     {
@@ -373,8 +373,8 @@ public function getCustomer()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function save()
     {
diff --git a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
index 152b387a79c..8b5937e322c 100644
--- a/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Convert/Parser/Customer.php
@@ -214,8 +214,8 @@ public function getCollection($storeId)
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function unparse()
     {
diff --git a/app/code/core/Mage/Customer/Model/Customer.php b/app/code/core/Mage/Customer/Model/Customer.php
index 1664d2d1bdd..80cde92960b 100644
--- a/app/code/core/Mage/Customer/Model/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Customer.php
@@ -302,8 +302,8 @@ public function authenticate($login, $password)
      * Load customer by email
      *
      * @param string $customerEmail
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function loadByEmail($customerEmail)
     {
@@ -314,8 +314,8 @@ public function loadByEmail($customerEmail)
     /**
      * Processing object before save data
      *
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _beforeSave()
     {
@@ -387,8 +387,8 @@ public function getName()
     /**
      * Add address to address collection
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addAddress(Mage_Customer_Model_Address $address)
     {
@@ -418,8 +418,8 @@ public function getAddressById($addressId)
      * Getting customer address object from collection by identifier
      *
      * @param int $addressId
-     * @return Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address
      */
     public function getAddressItemById($addressId)
     {
@@ -439,8 +439,8 @@ public function getAddressCollection()
     /**
      * Customer addresses collection
      *
-     * @return Mage_Customer_Model_Resource_Address_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Resource_Address_Collection
      */
     public function getAddressesCollection()
     {
@@ -461,8 +461,8 @@ public function getAddressesCollection()
     /**
      * Retrieve customer address array
      *
-     * @return Mage_Customer_Model_Address[]
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address[]
      */
     public function getAddresses()
     {
@@ -473,8 +473,8 @@ public function getAddresses()
     /**
      * Retrieve all customer attributes
      *
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getAttributes()
     {
@@ -491,8 +491,8 @@ public function getAttributes()
      * Get customer attribute model object
      *
      * @param string $attributeCode
-     * @return null|Mage_Customer_Model_Customer
      * @throws Mage_Core_Exception
+     * @return null|Mage_Customer_Model_Customer
      */
     public function getAttribute($attributeCode)
     {
@@ -568,8 +568,8 @@ public function generatePassword($length = 8)
      * Validate password with salted hash
      *
      * @param string $password
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function validatePassword($password)
     {
@@ -607,8 +607,8 @@ public function decryptPassword($password)
      * Retrieve default address by type(attribute)
      *
      * @param string $attributeCode address type attribute code
-     * @return false|Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return false|Mage_Customer_Model_Address
      */
     public function getPrimaryAddress($attributeCode)
     {
@@ -620,8 +620,8 @@ public function getPrimaryAddress($attributeCode)
     /**
      * Get customer default billing address
      *
-     * @return Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address
      */
     public function getPrimaryBillingAddress()
     {
@@ -631,8 +631,8 @@ public function getPrimaryBillingAddress()
     /**
      * Get customer default billing address
      *
-     * @return Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address
      */
     public function getDefaultBillingAddress()
     {
@@ -642,8 +642,8 @@ public function getDefaultBillingAddress()
     /**
      * Get default customer shipping address
      *
-     * @return Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address
      */
     public function getPrimaryShippingAddress()
     {
@@ -653,8 +653,8 @@ public function getPrimaryShippingAddress()
     /**
      * Get default customer shipping address
      *
-     * @return Mage_Customer_Model_Address
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address
      */
     public function getDefaultShippingAddress()
     {
@@ -683,8 +683,8 @@ public function getPrimaryAddressIds()
     /**
      * Retrieve all customer default addresses
      *
-     * @return Mage_Customer_Model_Address[]
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address[]
      */
     public function getPrimaryAddresses()
     {
@@ -711,8 +711,8 @@ public function getPrimaryAddresses()
     /**
      * Retrieve not default addresses
      *
-     * @return Mage_Customer_Model_Address[]
      * @throws Mage_Core_Exception
+     * @return Mage_Customer_Model_Address[]
      */
     public function getAdditionalAddresses()
     {
@@ -813,8 +813,8 @@ public function getRandomConfirmationKey()
     /**
      * Send email with new customer password
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function sendPasswordReminderEmail()
     {
@@ -836,8 +836,8 @@ public function sendPasswordReminderEmail()
     /**
      * Send info email about changed password or email
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function sendChangedPasswordOrEmail()
     {
@@ -889,9 +889,9 @@ protected function _sendEmailTemplate($template, $sender, $templateParams = [],
     /**
      * Send email with reset password confirmation link
      *
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function sendPasswordResetConfirmationEmail()
     {
@@ -947,8 +947,8 @@ public function sendPasswordLinkEmail(bool $isNew = false)
     /**
      * Retrieve customer group identifier
      *
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getGroupId()
     {
@@ -964,8 +964,8 @@ public function getGroupId()
     /**
      * Retrieve customer tax class identifier
      *
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getTaxClassId()
     {
@@ -980,8 +980,8 @@ public function getTaxClassId()
      * Check store availability for customer
      *
      * @param int|Mage_Core_Model_Store $store
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isInStore($store)
     {
@@ -998,8 +998,8 @@ public function isInStore($store)
     /**
      * Retrieve store where customer was created
      *
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
@@ -1009,8 +1009,8 @@ public function getStore()
     /**
      * Retrieve shared store ids
      *
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getSharedStoreIds()
     {
@@ -1072,9 +1072,9 @@ public function setStore(Mage_Core_Model_Store $store)
      * For existing customer password + confirmation will be validated
      * only when password is set (i.e. its change is requested)
      *
-     * @return array|true
      * @throws Mage_Core_Exception
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validate()
     {
@@ -1137,8 +1137,8 @@ public function validate()
 
     /**
      * Validate customer password on reset
-     * @return array|true
      * @throws Zend_Validate_Exception
+     * @return array|true
      */
     public function validateResetPassword()
     {
@@ -1174,9 +1174,9 @@ public function validateResetPassword()
     /**
      * Import customer data from text array
      *
-     * @return null|$this
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return null|$this
      */
     public function importFromTextArray(array $row)
     {
@@ -1422,8 +1422,8 @@ public function resetErrors()
      *
      * @param null|string $error
      * @param string $line
-     * @return false|void
      * @throws Exception
+     * @return false|void
      */
     public function printError($error, $line = null)
     {
@@ -1593,8 +1593,8 @@ public function __clone()
     /**
      * Return Entity Type instance
      *
-     * @return Mage_Eav_Model_Entity_Type
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Type
      */
     public function getEntityType()
     {
@@ -1604,8 +1604,8 @@ public function getEntityType()
     /**
      * Return Entity Type ID
      *
-     * @return int
      * @throws Mage_Core_Exception
+     * @return int
      */
     public function getEntityTypeId()
     {
@@ -1622,8 +1622,8 @@ public function getEntityTypeId()
      * Get either first store ID from a set website or the provided as default
      *
      * @param null|int|string $defaultStoreId
-     * @return int
      * @throws Mage_Core_Exception
+     * @return int
      */
     protected function _getWebsiteStoreId($defaultStoreId = null)
     {
@@ -1642,8 +1642,8 @@ protected function _getWebsiteStoreId($defaultStoreId = null)
      * Stores new reset password link token
      *
      * @param string $newResetPasswordLinkToken
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function changeResetPasswordLinkToken($newResetPasswordLinkToken)
     {
@@ -1665,8 +1665,8 @@ public function changeResetPasswordLinkToken($newResetPasswordLinkToken)
      * Stores new reset password link customer Id
      *
      * @param string $newResetPasswordLinkCustomerId
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function changeResetPasswordLinkCustomerId($newResetPasswordLinkCustomerId)
     {
diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
index 3f991b60339..cb11c7178ee 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Attribute/Backend/Password.php
@@ -20,8 +20,8 @@ class Mage_Customer_Model_Customer_Attribute_Backend_Password extends Mage_Eav_M
      * b) transform temporary attribute 'password' into real attribute 'password_hash'
      *
      * @param Mage_Customer_Model_Customer $object
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function beforeSave($object)
     {
diff --git a/app/code/core/Mage/Customer/Model/Resource/Customer.php b/app/code/core/Mage/Customer/Model/Resource/Customer.php
index 2c93e35c7e2..22c3151d04c 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Customer.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Customer.php
@@ -42,8 +42,8 @@ protected function _getDefaultAttributes()
      * Check customer scope, email and confirmation key before saving
      *
      * @param Mage_Customer_Model_Customer $customer
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _beforeSave(Varien_Object $customer)
     {
@@ -183,10 +183,9 @@ protected function _getLoadRowSelect($object, $rowId)
     /**
      * Load customer by email
      *
-     * @throws Mage_Core_Exception
-     *
      * @param string $email
      * @param bool $testOnly
+     * @throws Mage_Core_Exception
      * @return $this
      */
     public function loadByEmail(Mage_Customer_Model_Customer $customer, $email, $testOnly = false)
@@ -334,8 +333,8 @@ public function changeResetPasswordLinkToken(Mage_Customer_Model_Customer $custo
      * Stores new reset password link customer Id
      *
      * @param string $newResetPasswordLinkCustomerId
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function changeResetPasswordLinkCustomerId(
         Mage_Customer_Model_Customer $customer,
diff --git a/app/code/core/Mage/Customer/controllers/AccountController.php b/app/code/core/Mage/Customer/controllers/AccountController.php
index 819949ba7a6..30ec58523a2 100644
--- a/app/code/core/Mage/Customer/controllers/AccountController.php
+++ b/app/code/core/Mage/Customer/controllers/AccountController.php
@@ -324,8 +324,8 @@ public function createPostAction()
     /**
      * Success Registration
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _successProcessRegistration(Mage_Customer_Model_Customer $customer)
     {
@@ -551,9 +551,9 @@ protected function _getFromRegistry($path)
      * Returns success URL
      *
      * @param bool $isJustConfirmed
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
      * @throws Mage_Core_Exception
+     * @return string
      */
     protected function _welcomeCustomer(Mage_Customer_Model_Customer $customer, $isJustConfirmed = false)
     {
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
index 4d2b6d00d7d..a8df0e31484 100644
--- a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Csv.php
@@ -19,8 +19,8 @@ class Mage_Dataflow_Model_Convert_Parser_Csv extends Mage_Dataflow_Model_Convert
     protected $_mapfields = [];
 
     /**
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function parse()
     {
diff --git a/app/code/core/Mage/Dataflow/Model/Profile.php b/app/code/core/Mage/Dataflow/Model/Profile.php
index 3395a030fc0..6185a5b5805 100644
--- a/app/code/core/Mage/Dataflow/Model/Profile.php
+++ b/app/code/core/Mage/Dataflow/Model/Profile.php
@@ -512,8 +512,8 @@ public function _parseGuiData()
      *
      * @param object $xmlObject
      * @param string $nodeName
-     * @return object
      * @throws Exception
+     * @return object
      */
     protected function getNode($xmlObject, $nodeName)
     {
diff --git a/app/code/core/Mage/Directory/Block/Data.php b/app/code/core/Mage/Directory/Block/Data.php
index 4a40fffe0eb..8a2c5fe6e1c 100644
--- a/app/code/core/Mage/Directory/Block/Data.php
+++ b/app/code/core/Mage/Directory/Block/Data.php
@@ -47,8 +47,8 @@ public function getCountryCollection()
      * @param string $name
      * @param string $id
      * @param string $title
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getCountryHtmlSelect($defValue = null, $name = 'country_id', $id = 'country', $title = 'Country')
     {
@@ -98,8 +98,8 @@ public function getRegionCollection()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getRegionHtmlSelect()
     {
diff --git a/app/code/core/Mage/Directory/Helper/Data.php b/app/code/core/Mage/Directory/Helper/Data.php
index aee762a828e..af954a6cbae 100644
--- a/app/code/core/Mage/Directory/Helper/Data.php
+++ b/app/code/core/Mage/Directory/Helper/Data.php
@@ -89,8 +89,8 @@ public function __construct(array $args = [])
     /**
      * Retrieve region collection
      * @param null|array|string $countryFilter If string, accepts iso2_code; if array, accepts iso2_code[].
-     * @return Mage_Directory_Model_Resource_Region_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Directory_Model_Resource_Region_Collection
      */
     public function getRegionCollection($countryFilter = null)
     {
@@ -106,8 +106,8 @@ public function getRegionCollection($countryFilter = null)
     /**
      * Retrieve country collection
      *
-     * @return Mage_Directory_Model_Resource_Country_Collection
      * @throws Mage_Core_Exception
+     * @return Mage_Directory_Model_Resource_Country_Collection
      */
     public function getCountryCollection()
     {
@@ -123,9 +123,9 @@ public function getCountryCollection()
      *
      * @deprecated after 1.7.0.2
      * @see Mage_Directory_Helper_Data::getRegionJsonByStore()
-     * @return string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getRegionJson()
     {
@@ -136,9 +136,9 @@ public function getRegionJson()
      * Retrieve regions data json
      *
      * @param null|int $storeId
-     * @return string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getRegionJsonByStore($storeId = null)
     {
@@ -171,8 +171,8 @@ public function getRegionJsonByStore($storeId = null)
     /**
      * Get Regions for specific Countries
      * @param null|int|string $storeId
-     * @return null|array
      * @throws Mage_Core_Exception
+     * @return null|array
      */
     protected function _getRegions($storeId)
     {
@@ -216,8 +216,8 @@ protected function _getRegions($storeId)
      * @param float $amount
      * @param string $from
      * @param string $to
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     public function currencyConvert($amount, $from, $to = null)
     {
diff --git a/app/code/core/Mage/Directory/Model/Country.php b/app/code/core/Mage/Directory/Model/Country.php
index 8b3b0e84235..35c68dc5976 100644
--- a/app/code/core/Mage/Directory/Model/Country.php
+++ b/app/code/core/Mage/Directory/Model/Country.php
@@ -34,8 +34,8 @@ protected function _construct()
 
     /**
      * @param string $code
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function loadByCode($code)
     {
diff --git a/app/code/core/Mage/Directory/Model/Currency.php b/app/code/core/Mage/Directory/Model/Currency.php
index 73538e043a5..106bb108924 100644
--- a/app/code/core/Mage/Directory/Model/Currency.php
+++ b/app/code/core/Mage/Directory/Model/Currency.php
@@ -112,8 +112,8 @@ public function load($id, $field = null)
      * Get currency rate (only base=>allowed)
      *
      * @param Mage_Directory_Model_Currency|string $toCurrency
-     * @return float|int
      * @throws Mage_Core_Exception
+     * @return float|int
      */
     public function getRate($toCurrency)
     {
@@ -138,8 +138,8 @@ public function getRate($toCurrency)
      * Get currency rate (base=>allowed or allowed=>base)
      *
      * @param Mage_Directory_Model_Currency|string $toCurrency
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getAnyRate($toCurrency)
     {
@@ -165,8 +165,8 @@ public function getAnyRate($toCurrency)
      *
      * @param float $price
      * @param null|Mage_Directory_Model_Currency|string $toCurrency
-     * @return float
      * @throws Exception
+     * @return float
      */
     public function convert($price, $toCurrency = null)
     {
diff --git a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
index 049d2da3105..5c39d7fc9f1 100644
--- a/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/core/Mage/Downloadable/Block/Catalog/Product/Links.php
@@ -54,8 +54,8 @@ public function getLinks()
 
     /**
      * @param Mage_Downloadable_Model_Link $link
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getFormattedLinkPrice($link)
     {
diff --git a/app/code/core/Mage/Downloadable/Helper/Download.php b/app/code/core/Mage/Downloadable/Helper/Download.php
index e56fa517cb6..dcc5ec96622 100644
--- a/app/code/core/Mage/Downloadable/Helper/Download.php
+++ b/app/code/core/Mage/Downloadable/Helper/Download.php
@@ -192,8 +192,8 @@ public function getFilesize()
     }
 
     /**
-     * @return array|string
      * @throws Exception
+     * @return array|string
      */
     public function getContentType()
     {
@@ -215,8 +215,8 @@ public function getContentType()
     }
 
     /**
-     * @return bool|mixed|string
      * @throws Exception
+     * @return bool|mixed|string
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
     public function getFilename()
diff --git a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php
index 3355c002825..b95246838dd 100644
--- a/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php
+++ b/app/code/core/Mage/Downloadable/Model/Link/Api/Uploader.php
@@ -29,8 +29,8 @@ class Mage_Downloadable_Model_Link_Api_Uploader extends Mage_Core_Model_File_Upl
     /**
      * Check if the uploaded file exists
      *
-     * @throws Exception
      * @param array $file
+     * @throws Exception
      */
     public function __construct($file)
     {
@@ -45,8 +45,8 @@ public function __construct($file)
     /**
      * Sets uploaded file info and decodes the file
      *
-     * @throws Exception
      * @param array $fileInfo
+     * @throws Exception
      */
     private function _setUploadFile($fileInfo)
     {
diff --git a/app/code/core/Mage/Downloadable/Model/Product/Type.php b/app/code/core/Mage/Downloadable/Model/Product/Type.php
index f559970f6d1..3d86c9479bf 100644
--- a/app/code/core/Mage/Downloadable/Model/Product/Type.php
+++ b/app/code/core/Mage/Downloadable/Model/Product/Type.php
@@ -335,8 +335,8 @@ protected function _prepareProduct(Varien_Object $buyRequest, $product, $process
      * Check if product can be bought
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return Mage_Downloadable_Model_Product_Type
      * @throws Mage_Core_Exception
+     * @return Mage_Downloadable_Model_Product_Type
      */
     public function checkProductBuyState($product = null)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
index 2b0a9b4e6f9..96443f556a4 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/File.php
@@ -178,8 +178,8 @@ public function validateValue($value)
      * Export attribute value to entity model
      *
      * @param array|string $value
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function compactValue($value)
     {
@@ -248,8 +248,8 @@ public function restoreValue($value)
      * Return formatted attribute value from entity model
      *
      * @param string $format
-     * @return array|string
      * @throws Mage_Core_Exception
+     * @return array|string
      */
     public function outputValue($format = Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php
index d817db5918c..eb99c8ade73 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiline.php
@@ -110,8 +110,8 @@ public function restoreValue($value)
      * Return formatted attribute value from entity model
      *
      * @param string $format
-     * @return array|string
      * @throws Mage_Core_Exception
+     * @return array|string
      */
     public function outputValue($format = Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php
index 4321f944b9f..662cfe3675e 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Multiselect.php
@@ -47,8 +47,8 @@ public function compactValue($value)
      * Return formatted attribute value from entity model
      *
      * @param string $format
-     * @return array|string
      * @throws Mage_Core_Exception
+     * @return array|string
      */
     public function outputValue($format = Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php
index 487f19d3bf7..6167bf9407c 100644
--- a/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php
+++ b/app/code/core/Mage/Eav/Model/Attribute/Data/Select.php
@@ -98,8 +98,8 @@ protected function _getOptionText($value)
      * Return formatted attribute value from entity model
      *
      * @param string $format
-     * @return array|string
      * @throws Mage_Core_Exception
+     * @return array|string
      */
     public function outputValue($format = Mage_Eav_Model_Attribute_Data::OUTPUT_FORMAT_TEXT)
     {
diff --git a/app/code/core/Mage/Eav/Model/Config.php b/app/code/core/Mage/Eav/Model/Config.php
index 50a983e3ce9..b21c0ecafa3 100644
--- a/app/code/core/Mage/Eav/Model/Config.php
+++ b/app/code/core/Mage/Eav/Model/Config.php
@@ -177,8 +177,8 @@ protected function _initializeStore($storeId = null)
     }
 
     /**
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _loadEntityTypes()
     {
@@ -212,8 +212,8 @@ protected function _loadEntityTypes()
     /**
      * @param Mage_Eav_Model_Entity_Type $entityType
      * @param int $storeId
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _loadEntityAttributes($entityType, $storeId)
     {
@@ -257,8 +257,8 @@ protected function _loadEntityAttributes($entityType, $storeId)
 
     /**
      * @param $storeId
-     * @return void
      * @throws Exception
+     * @return void
      */
     protected function _loadAttributeSetInfo()
     {
@@ -267,8 +267,8 @@ protected function _loadAttributeSetInfo()
 
     /**
      * @param int $storeId
-     * @return bool true if successfully loaded from cache, false otherwise
      * @throws Exception
+     * @return bool true if successfully loaded from cache, false otherwise
      */
     protected function _loadFromCache($storeId)
     {
@@ -357,8 +357,8 @@ protected function _isCacheEnabled()
      * Create model instance from array
      *
      * @param array $attributeData
-     * @return false|Mage_Eav_Model_Entity_Attribute_Abstract
      * @throws Mage_Core_Exception
+     * @return false|Mage_Eav_Model_Entity_Attribute_Abstract
      */
     protected function _hydrateAttribute($attributeData)
     {
@@ -396,9 +396,9 @@ protected function _hydrateAttribute($attributeData)
      *
      * @param int|Mage_Eav_Model_Entity_Type|string $code
      * @param null|string $field
-     * @return Mage_Eav_Model_Entity_Type
      * @throws Mage_Core_Exception
      * @throws Exception
+     * @return Mage_Eav_Model_Entity_Type
      */
     public function getEntityType($code, $field = null)
     {
@@ -478,9 +478,9 @@ protected function _getDefaultAttributeIfExists($entityType, $attributeCode, $st
      * @param mixed $entityType
      * @param mixed $code
      * @param null|int $storeId
-     * @return false|Mage_Eav_Model_Entity_Attribute_Abstract
      * @throws Mage_Core_Exception
      * @throws Exception
+     * @return false|Mage_Eav_Model_Entity_Attribute_Abstract
      */
     public function getAttribute($entityType, $code, $storeId = null)
     {
@@ -521,8 +521,8 @@ public function getAttribute($entityType, $code, $storeId = null)
 
     /**
      * @param mixed $entityType
-     * @return Mage_Eav_Model_Entity_Attribute_Abstract[]
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Attribute_Abstract[]
      */
     public function getAttributes($entityType)
     {
@@ -546,9 +546,9 @@ public function getAttributes($entityType)
      *
      * @param int|Mage_Eav_Model_Entity_Type|string $entityType
      * @param Varien_Object $object
-     * @return array
      * @throws Mage_Core_Exception
      * @throws Exception
+     * @return array
      */
     public function getEntityAttributeCodes($entityType, $object = null)
     {
@@ -634,8 +634,8 @@ public function getAttributeSetGroupInfo($attributeId, $attributeSetIds)
     /**
      * @param mixed $entityType
      * @param string $attribute
-     * @return  null|Mage_Eav_Model_Entity_Attribute_Abstract
      * @throws Mage_Core_Exception
+     * @return  null|Mage_Eav_Model_Entity_Attribute_Abstract
      * @deprecated Equivalent to getAttribute(...), use getAttribute(...) instead
      * Get attribute object for collection usage
      */
diff --git a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
index b81114b3e88..d4d5e6f6719 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Adapter/Entity.php
@@ -71,8 +71,8 @@ protected function _parseVars()
      * @param array $attrToDb
      * @param string $bind
      * @param string $joinType
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function setFilter($attrFilterArray, $attrToDb = null, $bind = null, $joinType = null)
     {
@@ -256,8 +256,8 @@ public function setJoinField($joinField)
     }
 
     /**
-     * @return $this
      * @throws Varien_Convert_Exception
+     * @return $this
      */
     public function load()
     {
@@ -337,8 +337,8 @@ protected function _getCollectionForLoad($entityType)
     }
 
     /**
-     * @return $this
      * @throws Varien_Convert_Exception
+     * @return $this
      */
     public function save()
     {
diff --git a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
index 28500688d7f..1975203edde 100644
--- a/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Convert/Parser/Abstract.php
@@ -47,8 +47,8 @@ public function getStoreIds($stores)
 
     /**
      * @param int $storeId
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getStoreCode($storeId)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 35615222260..87bd00d76c2 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -485,8 +485,8 @@ public function isPartialSave($flag = null)
      * Retrieve configuration for all attributes
      *
      * @param object $object
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function loadAllAttributes($object = null)
     {
@@ -588,8 +588,8 @@ protected function _isApplicableAttribute($object, $attribute)
      * for example: $this->walkAttributes('backend/validate');
      *
      * @param string $partMethod
-     * @return array
      * @throws Mage_Eav_Model_Entity_Attribute_Exception
+     * @return array
      */
     public function walkAttributes($partMethod, array $args = [])
     {
@@ -1579,8 +1579,8 @@ public function saveAttribute(Varien_Object $object, $attributeCode)
      * Delete entity using current object's data
      *
      * @param int|string|Varien_Object $object
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function delete($object)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute.php b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
index 4285e6a621e..754f97a8607 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute.php
@@ -204,8 +204,8 @@ protected function _afterSave()
     /**
      * Detect backend storage type using frontend input type
      *
-     * @return string backend_type field value
      * @param string $type frontend_input field value
+     * @return string backend_type field value
      */
     public function getBackendTypeByInput($type)
     {
@@ -224,8 +224,8 @@ public function getBackendTypeByInput($type)
     /**
      * Detect default value using frontend input type
      *
-     * @return string default_value field value
      * @param string $type frontend_input field name
+     * @return string default_value field value
      */
     public function getDefaultValueByInput($type)
     {
@@ -292,8 +292,8 @@ public function getStoreLabels()
      * Return store label of attribute
      *
      * @param int $storeId
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getStoreLabel($storeId = null)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
index 94756dea322..3ad0211b747 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Abstract.php
@@ -528,8 +528,8 @@ protected function _getDefaultSourceModel()
 
     /**
      * @param mixed $value
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isValueEmpty($value)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
index 37edacd2227..c7e8fc508c0 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Backend/Abstract.php
@@ -214,8 +214,8 @@ public function getDefaultValue()
      * Validate object
      *
      * @param Varien_Object $object
-     * @return $this|bool
      * @throws Mage_Core_Exception|Mage_Eav_Exception
+     * @return $this|bool
      */
     public function validate($object)
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
index cc801aaeaa3..91622a1ed03 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Attribute/Set.php
@@ -176,8 +176,8 @@ public function organizeData($data)
     /**
      * Validate attribute set name
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function validate()
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
index aa133e80cbf..e6d069ba21c 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Collection/Abstract.php
@@ -212,8 +212,8 @@ public function getEntity()
     /**
      * Get resource instance
      *
-     * @return Mage_Eav_Model_Entity_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Eav_Model_Entity_Abstract
      */
     public function getResource()
     {
@@ -601,9 +601,9 @@ public function groupByAttribute($attribute)
      * @param string $filter primary key for the joined entity (entity_id default)
      * @param string $joinType inner|left
      * @param int $storeId
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Eav_Exception
+     * @return $this
      * @todo connect between joined attributes of same entity
      */
     public function joinAttribute($alias, $attribute, $bind, $filter = null, $joinType = 'inner', $storeId = null)
@@ -862,9 +862,9 @@ public function setPage($pageNum, $pageSize)
      *
      * @param bool $printQuery
      * @param bool $logQuery
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Eav_Exception
+     * @return $this
      */
     public function load($printQuery = false, $logQuery = false)
     {
@@ -906,8 +906,8 @@ public function load($printQuery = false, $logQuery = false)
      *
      * @param int $limit
      * @param int $offset
-     * @return Varien_Db_Select
      * @throws Mage_Core_Exception
+     * @return Varien_Db_Select
      */
     protected function _getAllIdsSelect($limit = null, $offset = null)
     {
@@ -1053,8 +1053,8 @@ public function setRowIdFieldName($fieldName)
      *
      * @param bool $printQuery
      * @param bool $logQuery
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function _loadEntities($printQuery = false, $logQuery = false)
     {
@@ -1096,9 +1096,9 @@ public function _loadEntities($printQuery = false, $logQuery = false)
      *
      * @param bool $printQuery
      * @param bool $logQuery
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Eav_Exception
+     * @return $this
      */
     public function _loadAttributes($printQuery = false, $logQuery = false)
     {
@@ -1168,8 +1168,8 @@ public function _loadAttributes($printQuery = false, $logQuery = false)
      *
      * @param   string $table
      * @param array $attributeIds
-     * @return  Varien_Db_Select
      * @throws Mage_Core_Exception
+     * @return  Varien_Db_Select
      */
     protected function _getLoadAttributesSelect($table, $attributeIds = [])
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
index 2f0c564960a..12f6f41fc43 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Increment/Alphanum.php
@@ -21,8 +21,8 @@ public function getAllowedChars()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getNextId()
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Setup.php b/app/code/core/Mage/Eav/Model/Entity/Setup.php
index 4d464d17724..42872f819d5 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Setup.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Setup.php
@@ -311,9 +311,9 @@ public function getAttributeSet($entityTypeId, $id, $field = null)
     /**
      * Retrieve Attribute Set Id By Id or Name
      *
-     * @throws Mage_Eav_Exception
      * @param mixed $entityTypeId
      * @param mixed $setId
+     * @throws Mage_Eav_Exception
      * @return int
      */
     public function getAttributeSetId($entityTypeId, $setId)
@@ -347,9 +347,9 @@ public function removeAttributeSet($entityTypeId, $id)
      *
      * @param string $entityType
      * @param string $attributeSet
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Eav_Exception
+     * @return $this
      */
     public function setDefaultSetToEntityType($entityType, $attributeSet = 'Default')
     {
@@ -363,8 +363,8 @@ public function setDefaultSetToEntityType($entityType, $attributeSet = 'Default'
      * Get identifiers of all attribute sets
      *
      * @param int $entityTypeId
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getAllAttributeSetIds($entityTypeId = null)
     {
@@ -569,8 +569,8 @@ public function removeAttributeGroup($entityTypeId, $setId, $id)
      *
      * @param int|string $entityType
      * @param int|string $attributeSetId
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getDefaultAttributeGroupId($entityType, $attributeSetId = null)
     {
@@ -1257,9 +1257,9 @@ public function installEntities($entities = null)
      * - no-main
      * - no-default-types
      * - types
-     * @return Mage_Eav_Model_Entity_Setup
      * @throws Mage_Core_Exception
      * @throws Zend_Db_Exception
+     * @return Mage_Eav_Model_Entity_Setup
      */
     public function createEntityTables($baseTableName, array $options = [])
     {
diff --git a/app/code/core/Mage/Eav/Model/Entity/Type.php b/app/code/core/Mage/Eav/Model/Entity/Type.php
index 76774eb2633..933ad6232d6 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Type.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Type.php
@@ -161,8 +161,8 @@ public function getAttributeSetCollection()
      * Retrieve new incrementId
      *
      * @param int $storeId
-     * @return false|string
      * @throws Exception
+     * @return false|string
      */
     public function fetchNewIncrementId($storeId = null)
     {
diff --git a/app/code/core/Mage/Eav/Model/Observer.php b/app/code/core/Mage/Eav/Model/Observer.php
index 4946dca71b7..01b3fe7c5b8 100644
--- a/app/code/core/Mage/Eav/Model/Observer.php
+++ b/app/code/core/Mage/Eav/Model/Observer.php
@@ -16,8 +16,8 @@ class Mage_Eav_Model_Observer
 {
     /**
      * @param Varien_Event_Observer $event
-     * @return void
      * @throws Mage_Core_Model_Store_Exception
+     * @return void
      */
     public function onControllerActionPredispatch($event)
     {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index 5763b3a7767..a3341896562 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -43,8 +43,8 @@ public function setAttributeFilter($setId)
      *
      * @param int $storeId
      * @param bool $useDefaultValue
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function setStoreFilter($storeId = null, $useDefaultValue = true)
     {
diff --git a/app/code/core/Mage/GiftMessage/Block/Message/Form.php b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
index de426f2283d..1f429e4e0b5 100644
--- a/app/code/core/Mage/GiftMessage/Block/Message/Form.php
+++ b/app/code/core/Mage/GiftMessage/Block/Message/Form.php
@@ -25,8 +25,8 @@ public function __construct()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getSaveUrl()
     {
@@ -41,8 +41,8 @@ public function getSaveUrl()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getEditUrl()
     {
@@ -55,8 +55,8 @@ public function getEditUrl()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getButtonUrl()
     {
@@ -69,8 +69,8 @@ public function getButtonUrl()
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getRemoveUrl()
     {
@@ -84,8 +84,8 @@ public function getRemoveUrl()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _initMessage()
     {
@@ -96,8 +96,8 @@ protected function _initMessage()
     }
 
     /**
-     * @return Mage_GiftMessage_Model_Message
      * @throws Exception
+     * @return Mage_GiftMessage_Model_Message
      */
     public function getMessage()
     {
@@ -127,8 +127,8 @@ public function getEscapedForJs($value)
     }
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getUniqueId()
     {
diff --git a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
index 7abf7b1674b..88e0b4de12e 100644
--- a/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
+++ b/app/code/core/Mage/GoogleAnalytics/Block/Ga.php
@@ -115,8 +115,8 @@ protected function _getOrdersTrackingCode()
     /**
      * Render information about specified orders and their items
      *
-     * @return string
      * @throws JsonException
+     * @return string
      */
     protected function _getEnhancedEcommerceDataForAnalytics4()
     {
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
index 5f7da074ec8..c45783b7e72 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Uploader.php
@@ -65,8 +65,8 @@ public function init()
      * Proceed moving a file from TMP to destination folder
      *
      * @param string $fileName
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function move($fileName)
     {
diff --git a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php
index 52b78162911..437da37e7d9 100644
--- a/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php
+++ b/app/code/core/Mage/ImportExport/Model/Resource/Helper/Mysql4.php
@@ -45,8 +45,8 @@ public function getMaxDataSize()
      * Returns next autoincrement value for a table
      *
      * @param string $tableName
-     * @return int
      * @throws Mage_Core_Exception
+     * @return int
      */
     public function getNextAutoincrement($tableName)
     {
diff --git a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
index 2919bcd6244..94b94c87f44 100644
--- a/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
+++ b/app/code/core/Mage/Index/Block/Adminhtml/Process/Grid.php
@@ -43,8 +43,8 @@ public function __construct()
     /**
      * Prepare grid collection
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareCollection()
     {
@@ -58,8 +58,8 @@ protected function _prepareCollection()
     /**
      * Add name and description to collection elements
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _afterLoadCollection()
     {
@@ -84,8 +84,8 @@ protected function _afterLoadCollection()
     /**
      * Prepare grid columns
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     protected function _prepareColumns()
     {
diff --git a/app/code/core/Mage/Index/Model/Lock.php b/app/code/core/Mage/Index/Model/Lock.php
index 0b791c702eb..5067672bd3f 100644
--- a/app/code/core/Mage/Index/Model/Lock.php
+++ b/app/code/core/Mage/Index/Model/Lock.php
@@ -279,8 +279,8 @@ protected function _getLockStorage()
      * Get lock file resource
      *
      * @param string $lockName
-     * @return resource
      * @throws Exception
+     * @return resource
      */
     protected function _getLockFile($lockName)
     {
diff --git a/app/code/core/Mage/Index/Model/Observer.php b/app/code/core/Mage/Index/Model/Observer.php
index c39fb0ae232..9d4a5402378 100644
--- a/app/code/core/Mage/Index/Model/Observer.php
+++ b/app/code/core/Mage/Index/Model/Observer.php
@@ -136,8 +136,8 @@ public function processConfigDataSave(Varien_Event_Observer $observer)
     /**
      * Clean old index events for indexers in manual mode
      *
-     * @return void
      * @throws Exception
+     * @return void
      */
     public function cleanOutdatedEvents()
     {
diff --git a/app/code/core/Mage/Index/Model/Process.php b/app/code/core/Mage/Index/Model/Process.php
index 1da44757bae..a34aa26a0f0 100644
--- a/app/code/core/Mage/Index/Model/Process.php
+++ b/app/code/core/Mage/Index/Model/Process.php
@@ -226,8 +226,8 @@ public function reindexAll()
      * Reindex all data what this process responsible is
      * Check and using depends processes
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function reindexEverything()
     {
@@ -292,8 +292,8 @@ public function processEvent(Mage_Index_Model_Event $event)
     /**
      * Get Indexer strategy object
      *
-     * @return Mage_Index_Model_Indexer_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Index_Model_Indexer_Abstract
      */
     public function getIndexer()
     {
@@ -580,8 +580,8 @@ public function setAllowTableChanges($value = true)
     /**
      * Disable keys in index table
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function disableIndexerKeys()
     {
@@ -596,8 +596,8 @@ public function disableIndexerKeys()
     /**
      * Enable keys in index table
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function enableIndexerKeys()
     {
diff --git a/app/code/core/Mage/Install/Model/Installer/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Abstract.php
index bb15a9a91c8..f86d097d930 100644
--- a/app/code/core/Mage/Install/Model/Installer/Abstract.php
+++ b/app/code/core/Mage/Install/Model/Installer/Abstract.php
@@ -40,8 +40,8 @@ protected function _getInstaller()
      * If empty, will return 'files'
      *
      * @param string $value
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _checkSessionSave($value)
     {
@@ -61,8 +61,8 @@ protected function _checkSessionSave($value)
      * If empty, "admin" will be returned
      *
      * @param string $value
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _checkAdminFrontname($value)
     {
diff --git a/app/code/core/Mage/Install/Model/Installer/Config.php b/app/code/core/Mage/Install/Model/Installer/Config.php
index b901d2e0af4..4f2777b886b 100644
--- a/app/code/core/Mage/Install/Model/Installer/Config.php
+++ b/app/code/core/Mage/Install/Model/Installer/Config.php
@@ -120,9 +120,9 @@ public function getFormData()
 
     /**
      * @param array $data
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Zend_Http_Client_Exception
+     * @return $this
      */
     protected function _checkHostsInfo($data)
     {
@@ -139,9 +139,9 @@ protected function _checkHostsInfo($data)
     /**
      * @param string $url
      * @param bool $secure
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Zend_Http_Client_Exception
+     * @return $this
      */
     protected function _checkUrl($url, $secure = false)
     {
diff --git a/app/code/core/Mage/Install/Model/Installer/Db.php b/app/code/core/Mage/Install/Model/Installer/Db.php
index b8089cf3f66..5264b5d18db 100644
--- a/app/code/core/Mage/Install/Model/Installer/Db.php
+++ b/app/code/core/Mage/Install/Model/Installer/Db.php
@@ -137,8 +137,8 @@ protected function _getCheckedData($data)
      * Retrieve the database resource
      *
      * @param  string $model database type
-     * @return Mage_Install_Model_Installer_Db_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Install_Model_Installer_Db_Abstract
      */
     protected function _getDbResource($model)
     {
diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php
index ddae0715f36..a1b553619de 100644
--- a/app/code/core/Mage/Media/Model/File/Image.php
+++ b/app/code/core/Mage/Media/Model/File/Image.php
@@ -69,8 +69,8 @@ public function delete(Mage_Media_Model_Image $object)
     /**
      * Create image resource for operation from file
      *
-     * @return false|GdImage|resource
      * @throws Mage_Core_Exception
+     * @return false|GdImage|resource
      */
     public function getImage(Mage_Media_Model_Image $object)
     {
diff --git a/app/code/core/Mage/Oauth/Helper/Data.php b/app/code/core/Mage/Oauth/Helper/Data.php
index 2ecccf922ac..09fab925c58 100644
--- a/app/code/core/Mage/Oauth/Helper/Data.php
+++ b/app/code/core/Mage/Oauth/Helper/Data.php
@@ -179,8 +179,8 @@ public function getFullCallbackUrl(Mage_Oauth_Model_Token $token, $rejected = fa
      * Retrieve URL of specified endpoint.
      *
      * @param string $type Endpoint type (one of ENDPOINT_ constants)
-     * @return string
      * @throws Exception    Exception when endpoint not found
+     * @return string
      */
     public function getProtocolEndpointUrl($type)
     {
diff --git a/app/code/core/Mage/Oauth/Model/Server.php b/app/code/core/Mage/Oauth/Model/Server.php
index 44d3e3d3b3c..f7e60d8d330 100644
--- a/app/code/core/Mage/Oauth/Model/Server.php
+++ b/app/code/core/Mage/Oauth/Model/Server.php
@@ -389,8 +389,8 @@ protected function _isProtocolParameter($attrName)
      * Extract parameters from sources (GET, FormBody, Authorization header), decode them and validate
      *
      * @param string $requestType Request type - one of REQUEST_... class constant
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _processRequest($requestType)
     {
@@ -709,8 +709,8 @@ public function initiateToken()
      * Create response string for problem during request and set HTTP error code
      *
      * @param null|Zend_Controller_Response_Http $response OPTIONAL If NULL - will use internal getter
-     * @return string
      * @throws Zend_Controller_Response_Exception
+     * @return string
      */
     public function reportProblem(Exception $e, ?Zend_Controller_Response_Http $response = null)
     {
diff --git a/app/code/core/Mage/Oauth/Model/Token.php b/app/code/core/Mage/Oauth/Model/Token.php
index d702594a26c..8cab2d9f902 100644
--- a/app/code/core/Mage/Oauth/Model/Token.php
+++ b/app/code/core/Mage/Oauth/Model/Token.php
@@ -178,8 +178,8 @@ public function createRequestToken($consumerId, $callbackUrl)
     /**
      * Get OAuth user type
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getUserType()
     {
diff --git a/app/code/core/Mage/Page/Block/Html.php b/app/code/core/Mage/Page/Block/Html.php
index f756d329a81..aa489e57522 100644
--- a/app/code/core/Mage/Page/Block/Html.php
+++ b/app/code/core/Mage/Page/Block/Html.php
@@ -153,8 +153,8 @@ public function getLang()
 
     /**
      * @param string $theme
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setTheme($theme)
     {
diff --git a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
index 94d662e4888..fc23acf34b4 100644
--- a/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
+++ b/app/code/core/Mage/Page/Block/Html/Topmenu/Renderer.php
@@ -21,8 +21,8 @@ class Mage_Page_Block_Html_Topmenu_Renderer extends Mage_Page_Block_Html_Topmenu
 
     /**
      * Renders block html
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Page/Block/Switch.php b/app/code/core/Mage/Page/Block/Switch.php
index f97d97ec846..a46050a87b0 100644
--- a/app/code/core/Mage/Page/Block/Switch.php
+++ b/app/code/core/Mage/Page/Block/Switch.php
@@ -17,8 +17,8 @@ class Mage_Page_Block_Switch extends Mage_Core_Block_Template
     protected $_storeInUrl;
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCurrentWebsiteId()
     {
@@ -26,8 +26,8 @@ public function getCurrentWebsiteId()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCurrentGroupId()
     {
@@ -35,8 +35,8 @@ public function getCurrentGroupId()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCurrentStoreId()
     {
@@ -44,8 +44,8 @@ public function getCurrentStoreId()
     }
 
     /**
-     * @return Mage_Core_Model_Store_Group[]
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Store_Group[]
      */
     public function getRawGroups()
     {
@@ -64,8 +64,8 @@ public function getRawGroups()
     }
 
     /**
-     * @return Mage_Core_Model_Store[]
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Store[]
      */
     public function getRawStores()
     {
@@ -157,8 +157,8 @@ public function getStores()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getCurrentStoreCode()
     {
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
index 2130e0a4504..acc3a7360da 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -445,8 +445,8 @@ public function cancel(Varien_Object $payment)
      *
      * @param Mage_Sales_Model_Order_Payment $payment
      * @param float $requestedAmount
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function refund(Varien_Object $payment, $requestedAmount)
     {
@@ -532,8 +532,8 @@ public function cancelPartialAuthorization(Mage_Payment_Model_Info $payment)
      * @param Mage_Sales_Model_Order_Payment $payment
      * @param float $amount
      * @param self::REQUEST_TYPE_AUTH_* $requestType
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     protected function _place($payment, $amount, $requestType)
     {
diff --git a/app/code/core/Mage/Payment/Model/Info.php b/app/code/core/Mage/Payment/Model/Info.php
index dc9720d81bc..31567ee698c 100644
--- a/app/code/core/Mage/Payment/Model/Info.php
+++ b/app/code/core/Mage/Payment/Model/Info.php
@@ -79,8 +79,8 @@ public function getData($key = '', $index = null)
     /**
      * Retrieve payment method model object
      *
-     * @return Mage_Payment_Model_Method_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Payment_Model_Method_Abstract
      */
     public function getMethodInstance()
     {
@@ -137,8 +137,8 @@ public function decrypt($data)
      *
      * @param array|string $key
      * @param mixed $value
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setAdditionalInformation($key, $value = null)
     {
diff --git a/app/code/core/Mage/Payment/Model/Method/Abstract.php b/app/code/core/Mage/Payment/Model/Method/Abstract.php
index e85b867375f..f38de624114 100644
--- a/app/code/core/Mage/Payment/Model/Method/Abstract.php
+++ b/app/code/core/Mage/Payment/Model/Method/Abstract.php
@@ -581,8 +581,8 @@ public function canReviewPayment(Mage_Payment_Model_Info $payment)
     /**
      * Attempt to accept a payment that us under review
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function acceptPayment(Mage_Payment_Model_Info $payment)
     {
@@ -596,8 +596,8 @@ public function acceptPayment(Mage_Payment_Model_Info $payment)
     /**
      * Attempt to deny a payment that us under review
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function denyPayment(Mage_Payment_Model_Info $payment)
     {
diff --git a/app/code/core/Mage/Payment/Model/Method/Cc.php b/app/code/core/Mage/Payment/Model/Method/Cc.php
index b5583a11ca4..cb81cc02757 100644
--- a/app/code/core/Mage/Payment/Model/Method/Cc.php
+++ b/app/code/core/Mage/Payment/Model/Method/Cc.php
@@ -66,9 +66,9 @@ public function prepareSave()
     /**
      * Validate payment method information object
      *
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function validate()
     {
@@ -198,8 +198,8 @@ public function getVerificationRegEx()
     /**
      * @param string $expYear
      * @param string $expMonth
-     * @return bool
      * @throws Zend_Date_Exception
+     * @return bool
      */
     protected function _validateExpDate($expYear, $expMonth)
     {
diff --git a/app/code/core/Mage/Payment/Model/Recurring/Profile.php b/app/code/core/Mage/Payment/Model/Recurring/Profile.php
index 07ed969f97d..e2fd11ea349 100644
--- a/app/code/core/Mage/Payment/Model/Recurring/Profile.php
+++ b/app/code/core/Mage/Payment/Model/Recurring/Profile.php
@@ -179,8 +179,8 @@ public function isValid()
      *
      * @param bool $isGrouped
      * @param bool $asMessage
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function getValidationErrors($isGrouped = true, $asMessage = false)
     {
@@ -205,8 +205,8 @@ public function getValidationErrors($isGrouped = true, $asMessage = false)
     /**
      * Setter for payment method instance
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function setMethodInstance(Mage_Payment_Model_Method_Abstract $object)
     {
@@ -223,8 +223,8 @@ public function setMethodInstance(Mage_Payment_Model_Method_Abstract $object)
      * Collect needed information from buy request
      * Then filter data
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function importBuyRequest(Varien_Object $buyRequest)
     {
@@ -307,8 +307,8 @@ public function exportScheduleInfo()
     /**
      * Determine nearest possible profile start date
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function setNearestStartDatetime(?Zend_Date $minAllowed = null)
     {
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php
index 118bdb88776..90aa2e29529 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/Settlement/Details/Form.php
@@ -16,8 +16,8 @@ class Mage_Paypal_Block_Adminhtml_Settlement_Details_Form extends Mage_Adminhtml
 {
     /**
      * Prepare read-only data and group it by fieldsets
-     * @return $this
      * @throws Zend_Currency_Exception
+     * @return $this
      */
     protected function _prepareForm()
     {
diff --git a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php
index 8caa816a394..5c20f720386 100644
--- a/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php
+++ b/app/code/core/Mage/Paypal/Block/Adminhtml/System/Config/Field/Country.php
@@ -31,8 +31,8 @@ class Mage_Paypal_Block_Adminhtml_System_Config_Field_Country extends Mage_Admin
     /**
      * Render country field considering request parameter
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function render(Varien_Data_Form_Element_Abstract $element)
     {
diff --git a/app/code/core/Mage/Paypal/Block/Iframe.php b/app/code/core/Mage/Paypal/Block/Iframe.php
index abba8183c36..4d2976e774c 100644
--- a/app/code/core/Mage/Paypal/Block/Iframe.php
+++ b/app/code/core/Mage/Paypal/Block/Iframe.php
@@ -68,8 +68,8 @@ protected function _construct()
     /**
      * Get current block instance
      *
-     * @return Mage_Paypal_Block_Iframe
      * @throws Mage_Core_Exception
+     * @return Mage_Paypal_Block_Iframe
      */
     protected function _getBlock()
     {
@@ -137,8 +137,8 @@ protected function _beforeToHtml()
     /**
      * Render the block if needed
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
@@ -157,8 +157,8 @@ protected function _toHtml()
     /**
      * Check whether block is rendering after save payment
      *
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     protected function _isAfterPaymentSave()
     {
@@ -177,8 +177,8 @@ protected function _isAfterPaymentSave()
     /**
      * Get iframe action URL
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getFrameActionUrl()
     {
@@ -188,8 +188,8 @@ public function getFrameActionUrl()
     /**
      * Get secure token
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getSecureToken()
     {
@@ -199,8 +199,8 @@ public function getSecureToken()
     /**
      * Get secure token ID
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getSecureTokenId()
     {
@@ -210,8 +210,8 @@ public function getSecureTokenId()
     /**
      * Get payflow transaction URL
      *
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     public function getTransactionUrl()
     {
@@ -221,8 +221,8 @@ public function getTransactionUrl()
     /**
      * Check sandbox mode
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function isTestMode()
     {
diff --git a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
index 108648fd06e..753e406bd63 100644
--- a/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
+++ b/app/code/core/Mage/Paypal/Controller/Express/Abstract.php
@@ -444,8 +444,8 @@ protected function _redirectToCartAndShowError($errorMessage)
     /**
      * Instantiate quote and checkout
      *
-     * @return Mage_Paypal_Model_Express_Checkout
      * @throws Mage_Core_Exception
+     * @return Mage_Paypal_Model_Express_Checkout
      */
     protected function _initCheckout()
     {
diff --git a/app/code/core/Mage/Paypal/Model/Api/Nvp.php b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
index 92998198cd6..ba26e3c3a14 100644
--- a/app/code/core/Mage/Paypal/Model/Api/Nvp.php
+++ b/app/code/core/Mage/Paypal/Model/Api/Nvp.php
@@ -942,8 +942,8 @@ protected function _addMethodToRequest($methodName, $request)
      * Do the API call
      *
      * @param string $methodName
-     * @return array
      * @throws Mage_Core_Exception
+     * @return array
      */
     public function call($methodName, array $request)
     {
diff --git a/app/code/core/Mage/Paypal/Model/Express.php b/app/code/core/Mage/Paypal/Model/Express.php
index f61f64b0b11..7b37a3617fa 100644
--- a/app/code/core/Mage/Paypal/Model/Express.php
+++ b/app/code/core/Mage/Paypal/Model/Express.php
@@ -675,8 +675,8 @@ public function canCapture()
      * @param int $amount
      * @param Varien_Object $payment
      * @param string $parentTransactionId
-     * @return Mage_Paypal_Model_Api_Abstract
      * @throws Mage_Paypal_Model_Api_ProcessableException
+     * @return Mage_Paypal_Model_Api_Abstract
      */
     protected function _callDoAuthorize($amount, $payment, $parentTransactionId)
     {
diff --git a/app/code/core/Mage/Paypal/Model/Ipn.php b/app/code/core/Mage/Paypal/Model/Ipn.php
index 29568da0cee..c12b2c5389d 100644
--- a/app/code/core/Mage/Paypal/Model/Ipn.php
+++ b/app/code/core/Mage/Paypal/Model/Ipn.php
@@ -165,8 +165,8 @@ protected function _postBack(Zend_Http_Client_Adapter_Interface $httpAdapter)
     /**
      * Load and validate order, instantiate proper configuration
      *
-     * @return Mage_Sales_Model_Order
      * @throws Exception
+     * @return Mage_Sales_Model_Order
      * @SuppressWarnings("PHPMD.ExitExpression")
      */
     protected function _getOrder()
@@ -200,8 +200,8 @@ protected function _getOrder()
     /**
      * Load recurring profile
      *
-     * @return Mage_Sales_Model_Recurring_Profile
      * @throws Exception
+     * @return Mage_Sales_Model_Recurring_Profile
      */
     protected function _getRecurringProfile()
     {
diff --git a/app/code/core/Mage/Paypal/Model/Payflowlink.php b/app/code/core/Mage/Paypal/Model/Payflowlink.php
index ce369c08758..acf96c07ba3 100644
--- a/app/code/core/Mage/Paypal/Model/Payflowlink.php
+++ b/app/code/core/Mage/Paypal/Model/Payflowlink.php
@@ -324,8 +324,8 @@ protected function _getFraudMessage()
     /**
      * Check response from Payflow gateway.
      *
-     * @return false|Mage_Sales_Model_Order in case of validation passed
      * @throws Mage_Core_Exception in other cases
+     * @return false|Mage_Sales_Model_Order in case of validation passed
      */
     protected function _getOrderFromResponse()
     {
diff --git a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
index 57475f83bd5..2bc0a5e820a 100644
--- a/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
+++ b/app/code/core/Mage/Paypal/Model/Payment/Transaction.php
@@ -115,8 +115,8 @@ protected function _afterLoadByTxnId()
      *
      * @param string $key
      * @param mixed $value
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setAdditionalInformation($key, $value)
     {
diff --git a/app/code/core/Mage/Persistent/Model/Persistent/Config.php b/app/code/core/Mage/Persistent/Model/Persistent/Config.php
index 8d7a78d5718..aae38cf1165 100644
--- a/app/code/core/Mage/Persistent/Model/Persistent/Config.php
+++ b/app/code/core/Mage/Persistent/Model/Persistent/Config.php
@@ -43,8 +43,8 @@ public function setConfigFilePath($path)
     /**
      * Load persistent XML config
      *
-     * @return Varien_Simplexml_Element
      * @throws Mage_Core_Exception
+     * @return Varien_Simplexml_Element
      */
     public function getXmlConfig()
     {
@@ -103,8 +103,8 @@ public function fire()
      *
      * @param array $info
      * @param false|Mage_Core_Block_Abstract $instance
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function fireOne($info, $instance = false)
     {
diff --git a/app/code/core/Mage/ProductAlert/Helper/Data.php b/app/code/core/Mage/ProductAlert/Helper/Data.php
index 976f609a378..9da48110bfc 100644
--- a/app/code/core/Mage/ProductAlert/Helper/Data.php
+++ b/app/code/core/Mage/ProductAlert/Helper/Data.php
@@ -58,8 +58,8 @@ public function getCustomer()
     }
 
     /**
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
@@ -80,8 +80,8 @@ public function getSaveUrl($type)
 
     /**
      * @param string $block
-     * @return Mage_ProductAlert_Block_Email_Price|Mage_ProductAlert_Block_Email_Stock
      * @throws Mage_Core_Exception
+     * @return Mage_ProductAlert_Block_Email_Price|Mage_ProductAlert_Block_Email_Stock
      */
     public function createBlock($block)
     {
diff --git a/app/code/core/Mage/Rating/Block/Entity/Detailed.php b/app/code/core/Mage/Rating/Block/Entity/Detailed.php
index 4057f33e209..f3ea48c600e 100644
--- a/app/code/core/Mage/Rating/Block/Entity/Detailed.php
+++ b/app/code/core/Mage/Rating/Block/Entity/Detailed.php
@@ -23,8 +23,8 @@ public function __construct()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rating/Model/Rating/Option.php b/app/code/core/Mage/Rating/Model/Rating/Option.php
index d91c1727d4c..ac0bdb2e215 100644
--- a/app/code/core/Mage/Rating/Model/Rating/Option.php
+++ b/app/code/core/Mage/Rating/Model/Rating/Option.php
@@ -41,8 +41,8 @@ protected function _construct()
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addVote()
     {
diff --git a/app/code/core/Mage/Reports/Helper/Data.php b/app/code/core/Mage/Reports/Helper/Data.php
index 003fb17e6e5..06219b24e69 100644
--- a/app/code/core/Mage/Reports/Helper/Data.php
+++ b/app/code/core/Mage/Reports/Helper/Data.php
@@ -55,8 +55,8 @@ public function isReportsEnabled()
      * @param string $from
      * @param string $to
      * @param self::REPORT_PERIOD_TYPE_* $period
-     * @return array
      * @throws Zend_Date_Exception
+     * @return array
      */
     public function getIntervals($from, $to, $period = self::REPORT_PERIOD_TYPE_DAY)
     {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event.php b/app/code/core/Mage/Reports/Model/Resource/Event.php
index 4bf68a5678b..b535cef92b5 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event.php
@@ -101,8 +101,8 @@ public function applyLogToCollection(
     /**
      * Obtain all current store ids, depending on configuration
      *
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getCurrentStoreIds(?array $predefinedStoreIds = null)
     {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php
index 38039a8e878..28ac7d03d91 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Index/Abstract.php
@@ -103,8 +103,8 @@ public function purgeVisitorByCustomer(Mage_Reports_Model_Product_Index_Abstract
     /**
      * Save Product Index data (forced save)
      *
-     * @return Mage_Reports_Model_Resource_Product_Index_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Reports_Model_Resource_Product_Index_Abstract
      */
     public function save(Mage_Core_Model_Abstract  $object)
     {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
index 821aa62f7bb..8ba949fd95f 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -120,8 +120,8 @@ protected function _getInventoryItemField($field)
      * Join catalog inventory stock item table for further stock_item values filters
      *
      * @param array|string $fields
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function joinInventoryItem($fields = [])
     {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
index cc57fc45c43..9804af53fee 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
@@ -95,8 +95,8 @@ public function setInterval($from, $to)
     /**
      * Get intervals
      *
-     * @return array
      * @throws Zend_Date_Exception
+     * @return array
      */
     public function getIntervals()
     {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
index 11459b8bf14..27938bb9de7 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Product/Viewed.php
@@ -30,9 +30,9 @@ protected function _construct()
      *
      * @param mixed $from
      * @param mixed $to
-     * @return Mage_Reports_Model_Resource_Report_Product_Viewed
      * @throws Mage_Core_Exception
      * @throws Zend_Db_Select_Exception
+     * @return Mage_Reports_Model_Resource_Report_Product_Viewed
      */
     public function aggregate($from = null, $to = null)
     {
diff --git a/app/code/core/Mage/Review/Block/Customer/View.php b/app/code/core/Mage/Review/Block/Customer/View.php
index c77ecc863fc..ee738bef601 100644
--- a/app/code/core/Mage/Review/Block/Customer/View.php
+++ b/app/code/core/Mage/Review/Block/Customer/View.php
@@ -36,8 +36,8 @@ public function __construct()
     }
 
     /**
-     * @return Mage_Catalog_Model_Product
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Catalog_Model_Product
      */
     public function getProductData()
     {
@@ -72,8 +72,8 @@ public function getBackUrl()
     }
 
     /**
-     * @return Mage_Rating_Model_Resource_Rating_Option_Vote_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Rating_Model_Resource_Rating_Option_Vote_Collection
      */
     public function getRating()
     {
@@ -104,8 +104,8 @@ public function getRatingSummary()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getTotalReviews()
     {
diff --git a/app/code/core/Mage/Review/Block/Form.php b/app/code/core/Mage/Review/Block/Form.php
index f629b374cb9..8e9bd2dcd1b 100644
--- a/app/code/core/Mage/Review/Block/Form.php
+++ b/app/code/core/Mage/Review/Block/Form.php
@@ -57,8 +57,8 @@ public function __construct()
     }
 
     /**
-     * @return false|Mage_Catalog_Model_Product|Mage_Core_Model_Abstract
      * @throws Exception
+     * @return false|Mage_Catalog_Model_Product|Mage_Core_Model_Abstract
      */
     public function getProductInfo()
     {
@@ -81,8 +81,8 @@ public function getAction()
     }
 
     /**
-     * @return Mage_Rating_Model_Resource_Rating_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Rating_Model_Resource_Rating_Collection
      */
     public function getRatings()
     {
diff --git a/app/code/core/Mage/Review/Block/Helper.php b/app/code/core/Mage/Review/Block/Helper.php
index 1d226c112d7..1b94e410604 100644
--- a/app/code/core/Mage/Review/Block/Helper.php
+++ b/app/code/core/Mage/Review/Block/Helper.php
@@ -27,8 +27,8 @@ class Mage_Review_Block_Helper extends Mage_Core_Block_Template
      * @param Mage_Catalog_Model_Product $product
      * @param string $templateType
      * @param bool $displayIfNoReviews
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getSummaryHtml($product, $templateType, $displayIfNoReviews)
     {
diff --git a/app/code/core/Mage/Review/Block/Product/View.php b/app/code/core/Mage/Review/Block/Product/View.php
index f8b168a62ec..046ed113f03 100644
--- a/app/code/core/Mage/Review/Block/Product/View.php
+++ b/app/code/core/Mage/Review/Block/Product/View.php
@@ -35,8 +35,8 @@ protected function _toHtml()
      *
      * @param false|string $templateType
      * @param bool $displayIfNoReviews
-     * @return string
      * @throws Mage_Core_Exception|Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getReviewsSummaryHtml(Mage_Catalog_Model_Product $product, $templateType = false, $displayIfNoReviews = false)
     {
@@ -54,8 +54,8 @@ public function getReviewsSummaryHtml(Mage_Catalog_Model_Product $product, $temp
     }
 
     /**
-     * @return Mage_Review_Model_Resource_Review_Collection
      * @throws Mage_Core_Exception|Mage_Core_Model_Store_Exception
+     * @return Mage_Review_Model_Resource_Review_Collection
      */
     public function getReviewsCollection()
     {
diff --git a/app/code/core/Mage/Review/Block/Product/View/List.php b/app/code/core/Mage/Review/Block/Product/View/List.php
index 14de8a0a0b8..e057dec4a59 100644
--- a/app/code/core/Mage/Review/Block/Product/View/List.php
+++ b/app/code/core/Mage/Review/Block/Product/View/List.php
@@ -25,8 +25,8 @@ public function getProductId()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _prepareLayout()
     {
diff --git a/app/code/core/Mage/Review/Model/Resource/Review.php b/app/code/core/Mage/Review/Model/Resource/Review.php
index 03bd5afb76a..8821f94c9c4 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review.php
@@ -121,8 +121,8 @@ protected function _beforeSave(Mage_Core_Model_Abstract $object)
     /**
      * Perform actions after object save
      *
-     * @return $this
      * @throws Zend_Db_Adapter_Exception
+     * @return $this
      */
     protected function _afterSave(Mage_Core_Model_Abstract $object)
     {
@@ -185,8 +185,8 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
     /**
      * Perform actions after object load
      *
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _afterLoad(Mage_Core_Model_Abstract $object)
     {
diff --git a/app/code/core/Mage/Review/Model/Review.php b/app/code/core/Mage/Review/Model/Review.php
index 37dfffe6086..de33ff6d25e 100644
--- a/app/code/core/Mage/Review/Model/Review.php
+++ b/app/code/core/Mage/Review/Model/Review.php
@@ -131,8 +131,8 @@ public function getReviewUrl()
     }
 
     /**
-     * @return array|bool
      * @throws Zend_Validate_Exception
+     * @return array|bool
      */
     public function validate()
     {
@@ -201,8 +201,8 @@ public function appendSummary($collection)
     }
 
     /**
-     * @return Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Abstract
      */
     protected function _beforeDelete()
     {
diff --git a/app/code/core/Mage/Rss/Block/Abstract.php b/app/code/core/Mage/Rss/Block/Abstract.php
index 7abed848663..1cfbe9083db 100644
--- a/app/code/core/Mage/Rss/Block/Abstract.php
+++ b/app/code/core/Mage/Rss/Block/Abstract.php
@@ -17,8 +17,8 @@
 class Mage_Rss_Block_Abstract extends Mage_Core_Block_Template
 {
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     protected function _getStoreId()
     {
@@ -32,8 +32,8 @@ protected function _getStoreId()
     }
 
     /**
-     * @return int
      * @throws Exception
+     * @return int
      */
     protected function _getCustomerGroupId()
     {
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Category.php b/app/code/core/Mage/Rss/Block/Catalog/Category.php
index 5d824de8427..db265b6cbd6 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Category.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Category.php
@@ -32,10 +32,10 @@ protected function _construct()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/Block/Catalog/New.php b/app/code/core/Mage/Rss/Block/Catalog/New.php
index a107e5e803e..1e121fe530c 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/New.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/New.php
@@ -17,10 +17,10 @@ class Mage_Rss_Block_Catalog_New extends Mage_Rss_Block_Catalog_Abstract
     protected function _construct() {}
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
      * @throws Zend_Date_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Special.php b/app/code/core/Mage/Rss/Block/Catalog/Special.php
index cb392f304ec..d12d9958856 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Special.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Special.php
@@ -35,9 +35,9 @@ protected function _construct()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/Block/Catalog/Tag.php b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
index 82aef2ae12e..5e622877483 100644
--- a/app/code/core/Mage/Rss/Block/Catalog/Tag.php
+++ b/app/code/core/Mage/Rss/Block/Catalog/Tag.php
@@ -28,8 +28,8 @@ protected function _construct()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/Block/List.php b/app/code/core/Mage/Rss/Block/List.php
index 12e7bbe5867..d77f92a999c 100644
--- a/app/code/core/Mage/Rss/Block/List.php
+++ b/app/code/core/Mage/Rss/Block/List.php
@@ -21,8 +21,8 @@ class Mage_Rss_Block_List extends Mage_Core_Block_Template
     /**
      * Add Link elements to head
      *
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _prepareLayout()
     {
@@ -55,8 +55,8 @@ public function getRssFeeds()
      * @param string $label
      * @param array $param
      * @param bool $customerGroup
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function addRssFeed($url, $label, $param = [], $customerGroup = false)
     {
@@ -80,8 +80,8 @@ public function resetRssFeed()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCurrentStoreId()
     {
@@ -111,8 +111,8 @@ public function getRssCatalogFeeds()
     }
 
     /**
-     * @return array|false
      * @throws Mage_Core_Model_Store_Exception
+     * @return array|false
      */
     public function getRssMiscFeeds()
     {
diff --git a/app/code/core/Mage/Rss/Block/Order/New.php b/app/code/core/Mage/Rss/Block/Order/New.php
index 5399753c173..1b6d5957acf 100644
--- a/app/code/core/Mage/Rss/Block/Order/New.php
+++ b/app/code/core/Mage/Rss/Block/Order/New.php
@@ -32,8 +32,8 @@ protected function _construct()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/Block/Wishlist.php b/app/code/core/Mage/Rss/Block/Wishlist.php
index b6d0ef37163..1e3717ad0c6 100644
--- a/app/code/core/Mage/Rss/Block/Wishlist.php
+++ b/app/code/core/Mage/Rss/Block/Wishlist.php
@@ -31,8 +31,8 @@ class Mage_Rss_Block_Wishlist extends Mage_Wishlist_Block_Abstract
     /**
      * Retrieve Wishlist model
      *
-     * @return Mage_Wishlist_Model_Wishlist
      * @throws Exception
+     * @return Mage_Wishlist_Model_Wishlist
      */
     protected function _getWishlist()
     {
@@ -55,8 +55,8 @@ protected function _getWishlist()
     /**
      * Retrieve Customer instance
      *
-     * @return Mage_Customer_Model_Customer
      * @throws Exception
+     * @return Mage_Customer_Model_Customer
      */
     protected function _getCustomer()
     {
@@ -77,8 +77,8 @@ protected function _getCustomer()
     /**
      * Build wishlist rss feed title
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function _getTitle()
     {
@@ -88,9 +88,9 @@ protected function _getTitle()
     /**
      * Render block HTML
      *
-     * @return string
      * @throws Mage_Core_Exception
      * @throws Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Rss/controllers/OrderController.php b/app/code/core/Mage/Rss/controllers/OrderController.php
index 9fbdb9540c5..bb6d7ebf87d 100644
--- a/app/code/core/Mage/Rss/controllers/OrderController.php
+++ b/app/code/core/Mage/Rss/controllers/OrderController.php
@@ -23,8 +23,8 @@ public function newAction()
     }
 
     /**
-     * @return $this|void
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this|void
      */
     public function customerAction()
     {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php
index 460ce406224..6ef2eb44cc4 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Attribute/Backend/Shipping.php
@@ -30,8 +30,8 @@ public function beforeSave($object)
 
     /**
      * @param Varien_Object $object
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function afterSave($object)
     {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
index 0c5ac9773f9..ec8855bdbd9 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
@@ -20,8 +20,8 @@ protected function _construct()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addItemCountExpr()
     {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote.php b/app/code/core/Mage/Sales/Model/Entity/Quote.php
index 0e48948ea8d..62be7601cf7 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote.php
@@ -100,8 +100,8 @@ public function loadByIdWithoutStore($quote, $quoteId)
 
     /**
      * @param Mage_Sales_Model_Quote $quote
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getReservedOrderId($quote)
     {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
index 69e46d207a6..5554d171a75 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Item/Collection.php
@@ -102,8 +102,8 @@ protected function _afterLoad()
     }
 
     /**
-     * @return false|Mage_Catalog_Model_Resource_Product_Collection
      * @throws Mage_Core_Exception
+     * @return false|Mage_Catalog_Model_Resource_Product_Collection
      */
     protected function _getProductCollection()
     {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php
index 74632b693d1..e34ebeac3c4 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Sale/Collection.php
@@ -60,8 +60,8 @@ public function setCustomerFilter(Mage_Customer_Model_Customer $customer)
     /**
      * @param bool $printQuery
      * @param bool $logQuery
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function load($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/core/Mage/Sales/Model/Observer.php b/app/code/core/Mage/Sales/Model/Observer.php
index a25e6cfc430..c74ad7257f9 100644
--- a/app/code/core/Mage/Sales/Model/Observer.php
+++ b/app/code/core/Mage/Sales/Model/Observer.php
@@ -24,8 +24,8 @@ class Mage_Sales_Model_Observer
     /**
      * Clean expired quotes (cron process)
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function cleanExpiredQuotes()
     {
@@ -173,8 +173,8 @@ public function aggregateSalesReportOrderData()
     /**
      * Refresh sales shipment report statistics for last day
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function aggregateSalesReportShipmentData()
     {
@@ -189,8 +189,8 @@ public function aggregateSalesReportShipmentData()
     /**
      * Refresh sales invoiced report statistics for last day
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function aggregateSalesReportInvoicedData()
     {
@@ -205,8 +205,8 @@ public function aggregateSalesReportInvoicedData()
     /**
      * Refresh sales refunded report statistics for last day
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function aggregateSalesReportRefundedData()
     {
@@ -221,8 +221,8 @@ public function aggregateSalesReportRefundedData()
     /**
      * Refresh bestsellers report statistics for last day
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function aggregateSalesReportBestsellersData()
     {
diff --git a/app/code/core/Mage/Sales/Model/Order.php b/app/code/core/Mage/Sales/Model/Order.php
index 5d8d7f44881..bdf70ac5931 100644
--- a/app/code/core/Mage/Sales/Model/Order.php
+++ b/app/code/core/Mage/Sales/Model/Order.php
@@ -1248,8 +1248,8 @@ public function place()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function hold()
     {
@@ -1266,8 +1266,8 @@ public function hold()
     /**
      * Attempt to unhold the order
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function unhold()
     {
@@ -1301,8 +1301,8 @@ public function cancel($comment = '')
      * Prepare order totals to cancellation
      * @param string $comment
      * @param bool $graceful
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function registerCancellation($comment = '', $graceful = true)
     {
@@ -1439,8 +1439,8 @@ public function getCurrentCustomerEmail()
      *
      * @param bool $forceMode if true then email will be sent regardless of the fact that it was already sent previously
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function queueNewOrderEmail($forceMode = false)
     {
@@ -1695,8 +1695,8 @@ public function getAddressById($addressId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addAddress(Mage_Sales_Model_Order_Address $address)
     {
@@ -1856,8 +1856,8 @@ public function getItemByQuoteItemId($quoteItemId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addItem(Mage_Sales_Model_Order_Item $item)
     {
@@ -1937,8 +1937,8 @@ public function getPaymentById($paymentId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addPayment(Mage_Sales_Model_Order_Payment $payment)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
index c2872cd45ab..efe25b57481 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo.php
@@ -357,8 +357,8 @@ public function getItemByOrderId($orderId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addItem(Mage_Sales_Model_Order_Creditmemo_Item $item)
     {
@@ -443,9 +443,9 @@ public function canVoid()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function refund()
     {
@@ -951,8 +951,8 @@ protected function _getEmails($configPath)
     }
 
     /**
-     * @return Mage_Sales_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Abstract
      */
     protected function _beforeDelete()
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
index b073d6ca654..f7bcc955fd4 100644
--- a/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/core/Mage/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -15,9 +15,9 @@
 class Mage_Sales_Model_Order_Creditmemo_Total_Shipping extends Mage_Sales_Model_Order_Creditmemo_Total_Abstract
 {
     /**
-     * @return $this
      * @throws Mage_Core_Exception
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function collect(Mage_Sales_Model_Order_Creditmemo $creditmemo)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice.php b/app/code/core/Mage/Sales/Model/Order/Invoice.php
index 44ac3de76cd..da34ebd7c9f 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice.php
@@ -598,8 +598,8 @@ public function getItemById($itemId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addItem(Mage_Sales_Model_Order_Invoice_Item $item)
     {
@@ -987,8 +987,8 @@ protected function _getEmails($configPath)
     }
 
     /**
-     * @return Mage_Sales_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Abstract
      */
     protected function _beforeDelete()
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
index ef606468080..78ade49eefe 100644
--- a/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Invoice/Api.php
@@ -66,8 +66,8 @@ public function items($filters = null)
      * Retrieve invoice information
      *
      * @param string $invoiceIncrementId
-     * @return array
      * @throws Mage_Api_Exception
+     * @return array
      */
     public function info($invoiceIncrementId)
     {
@@ -226,8 +226,8 @@ public function capture($invoiceIncrementId)
      * Void invoice
      *
      * @param int $invoiceIncrementId
-     * @return bool
      * @throws Mage_Api_Exception
+     * @return bool
      */
     public function void($invoiceIncrementId)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment.php b/app/code/core/Mage/Sales/Model/Order/Payment.php
index 11a35165952..64872d497fa 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment.php
@@ -431,8 +431,8 @@ public function place()
      * TODO: eliminate logic duplication with registerCaptureNotification()
      *
      * @param null|Mage_Sales_Model_Order_Invoice $invoice
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function capture($invoice)
     {
@@ -656,8 +656,8 @@ protected function _invoice()
     /**
      * Check order payment void availability
      *
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     public function canVoid(Varien_Object $document)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
index d37a5d2ee56..f144285a394 100644
--- a/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
+++ b/app/code/core/Mage/Sales/Model/Order/Payment/Transaction.php
@@ -157,8 +157,8 @@ public function setTxnId($txnId)
      * Can set the transaction id as well
      * @param string $parentTxnId
      * @param string $txnId
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setParentTxnId($parentTxnId, $txnId = null)
     {
@@ -291,8 +291,8 @@ public function getChildTransactions($types = null, $txnId = null, $recursive =
      *
      * @param bool $shouldSave
      * @param bool $dryRun
-     * @return $this|false
      * @throws Exception
+     * @return $this|false
      */
     public function closeAuthorization($shouldSave = true, $dryRun = false)
     {
@@ -448,8 +448,8 @@ protected function _afterLoadByTxnId()
      *
      * @param string $key
      * @param mixed $value
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setAdditionalInformation($key, $value)
     {
@@ -507,8 +507,8 @@ public function unsAdditionalInformation($key = null)
     /**
      * Close this transaction
      * @param bool $shouldSave
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function close($shouldSave = true)
     {
@@ -792,8 +792,8 @@ protected function _verifyTxnType($txnType = null)
      * Check whether the payment object is set and it has order object or there is an order_id is set
      * $dryRun allows to not throw exception
      * @param bool $dryRun
-     * @return null|false|Mage_Sales_Model_Order_Payment
      * @throws Mage_Core_Exception
+     * @return null|false|Mage_Sales_Model_Order_Payment
      */
     protected function _verifyPaymentObject($dryRun = false)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment.php b/app/code/core/Mage/Sales/Model/Order/Shipment.php
index 81aa934d40c..ecbd745485a 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment.php
@@ -205,8 +205,8 @@ public function getShippingAddress()
      *
      * Apply to order, order items etc.
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function register()
     {
@@ -283,8 +283,8 @@ public function getItemById($itemId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addItem(Mage_Sales_Model_Order_Shipment_Item $item)
     {
@@ -348,8 +348,8 @@ public function getTrackById($trackId)
     }
 
     /**
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addTrack(Mage_Sales_Model_Order_Shipment_Track $track)
     {
@@ -378,8 +378,8 @@ public function addTrack(Mage_Sales_Model_Order_Shipment_Track $track)
      * @param bool $notify
      * @param bool $visibleOnFront
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function addComment($comment, $notify = false, $visibleOnFront = false)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php
index b6fa73cac97..20059dd495f 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Api.php
@@ -62,8 +62,8 @@ public function items($filters = null)
      * Retrieve shipment information
      *
      * @param string $shipmentIncrementId
-     * @return array
      * @throws Mage_Api_Exception
+     * @return array
      */
     public function info($shipmentIncrementId)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php
index 12f0a5aa9b9..fe70e94f433 100644
--- a/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/core/Mage/Sales/Model/Order/Shipment/Item.php
@@ -112,8 +112,8 @@ public function getOrderItem()
      * Declare qty
      *
      * @param float $qty
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function setQty($qty)
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Status/History.php b/app/code/core/Mage/Sales/Model/Order/Status/History.php
index 9ed930ab03f..f9c6c79f437 100644
--- a/app/code/core/Mage/Sales/Model/Order/Status/History.php
+++ b/app/code/core/Mage/Sales/Model/Order/Status/History.php
@@ -120,8 +120,8 @@ public function getStatusLabel()
     /**
      * Get store object
      *
-     * @return Mage_Core_Model_Store
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Core_Model_Store
      */
     public function getStore()
     {
diff --git a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
index 53e0020f64e..3f0e77dd1df 100644
--- a/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
+++ b/app/code/core/Mage/Sales/Model/Order/Total/Config/Base.php
@@ -41,8 +41,8 @@ class Mage_Sales_Model_Order_Total_Config_Base extends Mage_Sales_Model_Config_O
      * @param string $class
      * @param string $totalCode
      * @param array $totalConfig
-     * @return Mage_Sales_Model_Order_Total_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Order_Total_Abstract
      */
     protected function _initModelInstance($class, $totalCode, $totalConfig)
     {
diff --git a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php
index d709a633ac5..ee0cda48f4d 100644
--- a/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php
+++ b/app/code/core/Mage/Sales/Model/Payment/Method/Billing/AgreementAbstract.php
@@ -62,8 +62,8 @@ public function isAvailable($quote = null)
      * Assign data to info model instance
      *
      * @param mixed $data
-     * @return Mage_Payment_Model_Method_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Payment_Model_Method_Abstract
      */
     public function assignData($data)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote.php b/app/code/core/Mage/Sales/Model/Quote.php
index 0f217354c8f..c3b28494c40 100644
--- a/app/code/core/Mage/Sales/Model/Quote.php
+++ b/app/code/core/Mage/Sales/Model/Quote.php
@@ -448,8 +448,8 @@ public function assignCustomer(Mage_Customer_Model_Customer $customer)
     /**
      * Assign customer model to quote with billing and shipping address change
      *
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function assignCustomerWithAddressChange(
         Mage_Customer_Model_Customer    $customer,
@@ -746,8 +746,8 @@ public function removeAllAddresses()
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addAddress(Mage_Sales_Model_Quote_Address $address)
     {
@@ -1145,8 +1145,8 @@ public function addProduct(Mage_Catalog_Model_Product $product, $request = null)
      * Adding catalog product object data to quote
      *
      * @param int $qty
-     * @return  Mage_Sales_Model_Quote_Item
      * @throws Mage_Core_Model_Store_Exception
+     * @return  Mage_Sales_Model_Quote_Item
      */
     protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty = 1)
     {
@@ -1392,8 +1392,8 @@ public function getPaymentById($paymentId)
     }
 
     /**
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addPayment(Mage_Sales_Model_Quote_Payment $payment)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php
index b3f86a61f54..c237b16d742 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Collector.php
@@ -91,8 +91,8 @@ public function getRetrievers()
      * @param string $class
      * @param string $totalCode
      * @param array $totalConfig
-     * @return false|Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return false|Mage_Core_Model_Abstract
      */
     protected function _initModelInstance($class, $totalCode, $totalConfig)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php
index 1c312253444..e0970f8779a 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Address/Total/Discount.php
@@ -15,8 +15,8 @@
 class Mage_Sales_Model_Quote_Address_Total_Discount extends Mage_Sales_Model_Quote_Address_Total_Abstract
 {
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     public function collect(Mage_Sales_Model_Quote_Address $address)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item.php b/app/code/core/Mage/Sales/Model/Quote/Item.php
index d1d0baba12f..c334d8783a8 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item.php
@@ -636,8 +636,8 @@ public function getOptionsByCode()
      * Add option to item
      *
      * @param array|Mage_Sales_Model_Quote_Item_Option|Varien_Object $option
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addOption($option)
     {
diff --git a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
index 8ac5ed978a8..e68ee647c7d 100644
--- a/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
+++ b/app/code/core/Mage/Sales/Model/Quote/Item/Abstract.php
@@ -833,8 +833,8 @@ public function getBaseTaxAmount()
      *
      * @param float $value
      * @param bool $saveTaxes
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      * @deprecated
      */
     protected function _calculatePrice($value, $saveTaxes = true)
diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
index 2b08258782a..db3baba7844 100644
--- a/app/code/core/Mage/Sales/Model/Recurring/Profile.php
+++ b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
@@ -353,8 +353,8 @@ public function isValid()
     /**
      * Import quote information to the profile
      *
-     * @return $this
      * @throws Exception
+     * @return $this
      */
     public function importQuote(Mage_Sales_Model_Quote $quote)
     {
@@ -573,8 +573,8 @@ protected function _initWorkflow()
      *
      * @param string $againstState
      * @param bool $soft
-     * @return bool
      * @throws Mage_Core_Exception
+     * @return bool
      */
     protected function _checkWorkflow($againstState, $soft = true)
     {
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
index 43daa27028f..552fac60022 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
@@ -34,10 +34,10 @@ public function aggregate($from = null, $to = null)
     /**
      * Aggregate Orders data by custom field
      *
-     * @throws Exception
      * @param string $aggregationField
      * @param mixed $from
      * @param mixed $to
+     * @throws Exception
      * @return $this
      */
     protected function _aggregateByField($aggregationField, $from, $to)
diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
index 8401e4dfcfc..c7f46f1fc80 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
@@ -141,8 +141,8 @@ protected function _beforeLoad()
      *
      * @param bool $printQuery
      * @param bool $logQuery
-     * @return  Varien_Data_Collection_Db
      * @throws Mage_Core_Model_Store_Exception
+     * @return  Varien_Data_Collection_Db
      */
     public function load($printQuery = false, $logQuery = false)
     {
diff --git a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php
index ae0c1ea8b84..ea10f337502 100644
--- a/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php
+++ b/app/code/core/Mage/Sales/controllers/Recurring/ProfileController.php
@@ -22,8 +22,8 @@ class Mage_Sales_Recurring_ProfileController extends Mage_Core_Controller_Front_
     /**
      * Make sure customer is logged in and put it into registry
      *
-     * @return $this|void
      * @throws Mage_Core_Exception
+     * @return $this|void
      */
     public function preDispatch()
     {
@@ -162,8 +162,8 @@ protected function _viewAction()
     /**
      * Instantiate current profile and put it into registry
      *
-     * @return Mage_Sales_Model_Recurring_Profile
      * @throws Mage_Core_Exception
+     * @return Mage_Sales_Model_Recurring_Profile
      */
     protected function _initProfile()
     {
diff --git a/app/code/core/Mage/SalesRule/Model/Observer.php b/app/code/core/Mage/SalesRule/Model/Observer.php
index 7f0a8a180a7..bfa51b5f655 100644
--- a/app/code/core/Mage/SalesRule/Model/Observer.php
+++ b/app/code/core/Mage/SalesRule/Model/Observer.php
@@ -56,8 +56,8 @@ public function sales_quote_address_discount_item($observer)
      * Registered callback: called after an order is placed
      *
      * @param Varien_Event_Observer $observer
-     * @return $this
      * @throws Throwable
+     * @return $this
      * @SuppressWarnings("PHPMD.CamelCaseMethodName")
      */
     // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
index 66d5344e597..c1713ecabdc 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Report/Rule/Createdat.php
@@ -37,10 +37,10 @@ public function aggregate($from = null, $to = null)
     /**
      * Aggregate coupons reports by orders
      *
-     * @throws Exception
      * @param string $aggregationField
      * @param mixed $from
      * @param mixed $to
+     * @throws Exception
      * @return $this
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
index f2326ba83a7..e0bdf1582a6 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Rule.php
@@ -57,8 +57,8 @@ protected function _afterLoad(Mage_Core_Model_Abstract $object)
     /**
      * Prepare sales rule's discount quantity
      *
-     * @return $this
      * @throws Zend_Date_Exception
+     * @return $this
      */
     public function _beforeSave(Mage_Core_Model_Abstract $object)
     {
diff --git a/app/code/core/Mage/SalesRule/Model/Validator.php b/app/code/core/Mage/SalesRule/Model/Validator.php
index 12d2666997b..8589ae096ab 100644
--- a/app/code/core/Mage/SalesRule/Model/Validator.php
+++ b/app/code/core/Mage/SalesRule/Model/Validator.php
@@ -292,8 +292,8 @@ public function reset(Mage_Sales_Model_Quote_Address $address)
     /**
      * Quote item discount calculation process
      *
-     * @return Mage_SalesRule_Model_Validator
      * @throws Mage_Core_Exception
+     * @return Mage_SalesRule_Model_Validator
      */
     public function process(Mage_Sales_Model_Quote_Item_Abstract $item)
     {
@@ -997,8 +997,8 @@ protected function _getItemPrice($item)
      * Return item original price
      *
      * @param Mage_Sales_Model_Quote_Item_Abstract $item
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     protected function _getItemOriginalPrice($item)
     {
@@ -1021,8 +1021,8 @@ protected function _getItemBasePrice($item)
      * Return item base original price
      *
      * @param Mage_Sales_Model_Quote_Item_Abstract $item
-     * @return float
      * @throws Mage_Core_Model_Store_Exception
+     * @return float
      */
     protected function _getItemBaseOriginalPrice($item)
     {
diff --git a/app/code/core/Mage/Sitemap/Model/Sitemap.php b/app/code/core/Mage/Sitemap/Model/Sitemap.php
index fdfc52dc2e1..0ceabc08a91 100644
--- a/app/code/core/Mage/Sitemap/Model/Sitemap.php
+++ b/app/code/core/Mage/Sitemap/Model/Sitemap.php
@@ -116,8 +116,8 @@ public function getPreparedFilename()
     /**
      * Generate XML file
      *
-     * @return $this
      * @throws Throwable
+     * @return $this
      */
     public function generateXml()
     {
diff --git a/app/code/core/Mage/Tag/Block/All.php b/app/code/core/Mage/Tag/Block/All.php
index bbbfcee9e8f..2e06efe50d4 100644
--- a/app/code/core/Mage/Tag/Block/All.php
+++ b/app/code/core/Mage/Tag/Block/All.php
@@ -21,8 +21,8 @@ class Mage_Tag_Block_All extends Mage_Core_Block_Template
     protected $_maxPopularity;
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _loadTags()
     {
@@ -55,8 +55,8 @@ protected function _loadTags()
     }
 
     /**
-     * @return Mage_Tag_Model_Tag[]
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Tag_Model_Tag[]
      */
     public function getTags()
     {
diff --git a/app/code/core/Mage/Tag/Block/Popular.php b/app/code/core/Mage/Tag/Block/Popular.php
index 8a484b70001..e84177e1bc1 100644
--- a/app/code/core/Mage/Tag/Block/Popular.php
+++ b/app/code/core/Mage/Tag/Block/Popular.php
@@ -21,8 +21,8 @@ class Mage_Tag_Block_Popular extends Mage_Core_Block_Template
     protected $_maxPopularity;
 
     /**
-     * @return $this
      * @throws Mage_Core_Model_Store_Exception
+     * @return $this
      */
     protected function _loadTags()
     {
@@ -57,8 +57,8 @@ protected function _loadTags()
     }
 
     /**
-     * @return Mage_Tag_Model_Tag[]
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Tag_Model_Tag[]
      */
     public function getTags()
     {
@@ -83,8 +83,8 @@ public function getMinPopularity()
     }
 
     /**
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     protected function _toHtml()
     {
diff --git a/app/code/core/Mage/Tag/Block/Product/List.php b/app/code/core/Mage/Tag/Block/Product/List.php
index 24ba091708f..6b2e84f9a36 100644
--- a/app/code/core/Mage/Tag/Block/Product/List.php
+++ b/app/code/core/Mage/Tag/Block/Product/List.php
@@ -22,8 +22,8 @@ class Mage_Tag_Block_Product_List extends Mage_Core_Block_Template
     protected $_uniqueHtmlId = null;
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getCount()
     {
@@ -31,8 +31,8 @@ public function getCount()
     }
 
     /**
-     * @return mixed
      * @throws Mage_Core_Model_Store_Exception
+     * @return mixed
      */
     public function getTags()
     {
@@ -52,8 +52,8 @@ public function getProductId()
     }
 
     /**
-     * @return mixed
      * @throws Mage_Core_Model_Store_Exception
+     * @return mixed
      */
     protected function _getCollection()
     {
@@ -101,8 +101,8 @@ public function getFormAction()
      *
      * @param string $pattern
      * @param string $glue
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function renderTags($pattern, $glue = ' ')
     {
diff --git a/app/code/core/Mage/Tag/Block/Product/Result.php b/app/code/core/Mage/Tag/Block/Product/Result.php
index 3751844e67b..3de96b43445 100644
--- a/app/code/core/Mage/Tag/Block/Product/Result.php
+++ b/app/code/core/Mage/Tag/Block/Product/Result.php
@@ -74,8 +74,8 @@ public function getProductListHtml()
     }
 
     /**
-     * @return Mage_Tag_Model_Resource_Product_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Tag_Model_Resource_Product_Collection
      */
     protected function _getProductCollection()
     {
@@ -100,8 +100,8 @@ protected function _getProductCollection()
     }
 
     /**
-     * @return int
      * @throws Mage_Core_Model_Store_Exception
+     * @return int
      */
     public function getResultCount()
     {
diff --git a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php
index 00e2de6461c..c2c5910b0b6 100644
--- a/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Entity/Customer/Collection.php
@@ -28,8 +28,8 @@ public function __construct()
 
     /**
      * @param int $tagId
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addTagFilter($tagId)
     {
@@ -40,8 +40,8 @@ public function addTagFilter($tagId)
 
     /**
      * @param int $productId
-     * @return $this
      * @throws Mage_Core_Exception
+     * @return $this
      */
     public function addProductFilter($productId)
     {
diff --git a/app/code/core/Mage/Tag/Model/Tag.php b/app/code/core/Mage/Tag/Model/Tag.php
index 53428987384..a1276ec8954 100644
--- a/app/code/core/Mage/Tag/Model/Tag.php
+++ b/app/code/core/Mage/Tag/Model/Tag.php
@@ -335,8 +335,8 @@ public function isAvailableInStore($storeId = null)
     }
 
     /**
-     * @return Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Abstract
      */
     protected function _beforeDelete()
     {
diff --git a/app/code/core/Mage/Tag/controllers/CustomerController.php b/app/code/core/Mage/Tag/controllers/CustomerController.php
index 97fc35b67d5..6dccdb2af1e 100644
--- a/app/code/core/Mage/Tag/controllers/CustomerController.php
+++ b/app/code/core/Mage/Tag/controllers/CustomerController.php
@@ -15,8 +15,8 @@
 class Mage_Tag_CustomerController extends Mage_Core_Controller_Front_Action
 {
     /**
-     * @return false|int
      * @throws Mage_Core_Exception
+     * @return false|int
      */
     protected function _getTagId()
     {
diff --git a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php
index 22aca32768f..9036a3a5671 100644
--- a/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php
+++ b/app/code/core/Mage/Tax/Block/Adminhtml/Notifications.php
@@ -161,8 +161,8 @@ public function getIgnoreTaxNotificationUrl($section)
     /**
      * Get tax management url
      *
-     * @return string
      * @throws Mage_Core_Model_Store_Exception
+     * @return string
      */
     public function getInfoUrl()
     {
diff --git a/app/code/core/Mage/Tax/Helper/Data.php b/app/code/core/Mage/Tax/Helper/Data.php
index d04c9d6b8cd..ba9df8fa6b0 100644
--- a/app/code/core/Mage/Tax/Helper/Data.php
+++ b/app/code/core/Mage/Tax/Helper/Data.php
@@ -471,8 +471,8 @@ protected function _getAllRatesByProductClass($store = null)
      * @param null|Mage_Core_Model_Store $store
      * @param bool $priceIncludesTax flag what price parameter contain tax
      * @param bool $roundPrice
-     * @return  float
      * @throws Mage_Core_Model_Store_Exception
+     * @return  float
      */
     public function getPrice(
         $product,
@@ -1129,8 +1129,8 @@ public function getShippingTax($source)
      * Get all FPTs
      *
      * @param null|mixed $source
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getAllWeee($source = null)
     {
@@ -1213,9 +1213,9 @@ public function isCrossBorderTradeEnabled($store = null)
      * Use flag to store ignore setting rather than config to avoid config re-init/save
      * Read config value for backwards compatibility.
      *
-     * @return bool
      * @throws Mage_Core_Model_Store_Exception
      * @throws Throwable
+     * @return bool
      */
     protected function _isIgnored(string $key)
     {
@@ -1234,8 +1234,8 @@ protected function _isIgnored(string $key)
     }
 
     /**
-     * @return void
      * @throws Throwable
+     * @return void
      */
     public function setIsIgnored(string $key, bool $value)
     {
diff --git a/app/code/core/Mage/Tax/Model/Calculation/Rate.php b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
index 36f90f3a8b2..089dd719382 100644
--- a/app/code/core/Mage/Tax/Model/Calculation/Rate.php
+++ b/app/code/core/Mage/Tax/Model/Calculation/Rate.php
@@ -136,8 +136,8 @@ protected function _afterSave()
     /**
      * Processing object before delete data
      *
-     * @return Mage_Core_Model_Abstract
      * @throws Mage_Core_Exception
+     * @return Mage_Core_Model_Abstract
      */
     protected function _beforeDelete()
     {
diff --git a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
index ccbb8d471af..40e2490dd95 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Report/Tax/Createdat.php
@@ -34,10 +34,10 @@ public function aggregate($from = null, $to = null)
     /**
      * Aggregate Tax data by orders
      *
-     * @throws Exception
      * @param string $aggregationField
      * @param mixed $from
      * @param mixed $to
+     * @throws Exception
      * @return $this
      */
     protected function _aggregateByOrder($aggregationField, $from, $to)
diff --git a/app/code/core/Mage/Uploader/Model/Config/Abstract.php b/app/code/core/Mage/Uploader/Model/Config/Abstract.php
index fe7051c9883..02b49a22ea7 100644
--- a/app/code/core/Mage/Uploader/Model/Config/Abstract.php
+++ b/app/code/core/Mage/Uploader/Model/Config/Abstract.php
@@ -30,8 +30,8 @@ protected function _getHelper()
      *
      * @param string $method
      * @param array $args
-     * @return bool|mixed|Varien_Object
      * @throws Varien_Exception
+     * @return bool|mixed|Varien_Object
      * @SuppressWarnings("PHPMD.DevelopmentCodeFragment")
      */
     public function __call($method, $args)
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
index cb703937ebc..3782a7718d3 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Dhl/Label/Pdf/PageBuilder.php
@@ -147,8 +147,8 @@ public function addBorder()
      * Add Product Name
      *
      * @param string $name
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addProductName($name)
     {
@@ -167,8 +167,8 @@ public function addProductName($name)
      * Add Product Content Code
      *
      * @param string $code
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addProductContentCode($code)
     {
@@ -238,8 +238,8 @@ public function addReferenceData($data)
     /**
      * Add Sender Info
      *
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addSenderInfo(SimpleXMLElement $sender)
     {
@@ -317,8 +317,8 @@ protected function _drawSenderAddress(SimpleXMLElement $addressLines, $phoneNumb
      * Add Origin Info
      *
      * @param string $serviceAreaCode
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addOriginInfo($serviceAreaCode)
     {
@@ -387,8 +387,8 @@ public function addReceiveInfo(SimpleXMLElement $consignee)
      * @param string $countryCode
      * @param string $serviceAreaCode
      * @param string $facilityCode
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addDestinationFacilityCode($countryCode, $serviceAreaCode, $facilityCode)
     {
@@ -455,8 +455,8 @@ public function addDeliveryDateCode()
      * Add Shipment Information
      *
      * @param Mage_Sales_Model_Order_Shipment $data
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addShipmentInformation($data)
     {
@@ -499,8 +499,8 @@ public function addDateInfo($date)
      *
      * @param string $weight
      * @param string $unit
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addWeightInfo($weight, $unit)
     {
@@ -526,8 +526,8 @@ public function addWeightInfo($weight, $unit)
      * Add Content: Shipment Description
      *
      * @param array $package
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addContentInfo($package)
     {
@@ -558,8 +558,8 @@ public function addContentInfo($package)
      *
      * @param string $number
      * @param string $barCode
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addWaybillBarcode($number, $barCode)
     {
@@ -587,8 +587,8 @@ public function addWaybillBarcode($number, $barCode)
      * @param string $routingCode
      * @param string $id
      * @param string $barCode
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addRoutingBarcode($routingCode, $id, $barCode)
     {
@@ -616,8 +616,8 @@ public function addRoutingBarcode($routingCode, $id, $barCode)
      * @param string $dataIdentifier
      * @param string $licensePlate
      * @param string $barCode
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addPieceIdBarcode($dataIdentifier, $licensePlate, $barCode)
     {
@@ -650,8 +650,8 @@ public function addPieceIdBarcode($dataIdentifier, $licensePlate, $barCode)
      *
      * @param int $pieceNumber
      * @param int $piecesTotal
-     * @return $this
      * @throws InvalidArgumentException
+     * @return $this
      */
     public function addPieceNumber($pieceNumber, $piecesTotal)
     {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
index af3291fc740..2ea9e123651 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -2522,8 +2522,8 @@ private function processShippingRestRateForItem(
     /**
      * To receive access token
      *
-     * @return string
      * @throws Exception
+     * @return string
      */
     protected function setAPIAccessRequest()
     {
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
index 6982efa9a8e..6bd95ea67a7 100644
--- a/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
+++ b/app/code/core/Mage/Usa/Model/Shipping/Carrier/UpsAuth.php
@@ -20,8 +20,8 @@ class Mage_Usa_Model_Shipping_Carrier_UpsAuth extends Mage_Usa_Model_Shipping_Ca
     public const CACHE_KEY_PREFIX = 'ups_api_token_';
 
     /**
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getAccessToken(string $clientId, string $clientSecret, string $clientUrl)
     {
diff --git a/app/code/core/Mage/Weee/Helper/Data.php b/app/code/core/Mage/Weee/Helper/Data.php
index e8341a0934c..e24ea7a2cfe 100644
--- a/app/code/core/Mage/Weee/Helper/Data.php
+++ b/app/code/core/Mage/Weee/Helper/Data.php
@@ -447,8 +447,8 @@ public function setStore($store)
     /**
      * Returns all summed weee taxes with all local taxes applied
      *
-     * @throws Mage_Core_Exception
      * @param array $attributes Array of Varien_Object, result from getProductWeeeAttributes()
+     * @throws Mage_Core_Exception
      * @return float
      */
     public function getAmountInclTaxes($attributes)
diff --git a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
index b6056736b64..27f26ee895c 100644
--- a/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
+++ b/app/code/core/Mage/Widget/controllers/Adminhtml/Widget/InstanceController.php
@@ -53,8 +53,8 @@ protected function _initAction()
     /**
      * Init widget instance object and set it to registry
      *
-     * @return bool|Mage_Widget_Model_Widget_Instance
      * @throws Mage_Core_Exception
+     * @return bool|Mage_Widget_Model_Widget_Instance
      */
     protected function _initWidgetInstance()
     {
diff --git a/app/code/core/Mage/Wishlist/Block/Links.php b/app/code/core/Mage/Wishlist/Block/Links.php
index 393e4c69022..ef7be1797d5 100644
--- a/app/code/core/Mage/Wishlist/Block/Links.php
+++ b/app/code/core/Mage/Wishlist/Block/Links.php
@@ -96,8 +96,8 @@ public function addWishlistLink()
     /**
      * Retrieve block cache tags
      *
-     * @return array
      * @throws Mage_Core_Model_Store_Exception
+     * @return array
      */
     public function getCacheTags()
     {
diff --git a/app/code/core/Mage/Wishlist/Model/Item.php b/app/code/core/Mage/Wishlist/Model/Item.php
index c3e9d8625eb..826c8b056ab 100644
--- a/app/code/core/Mage/Wishlist/Model/Item.php
+++ b/app/code/core/Mage/Wishlist/Model/Item.php
@@ -339,8 +339,8 @@ public function getProduct()
      * Return true if product was successful added or exception with code
      * Return false for disabled or unvisible products
      *
-     * @throws Mage_Core_Exception
      * @param bool $delete  delete the item after successful add to cart
+     * @throws Mage_Core_Exception
      * @return bool
      */
     public function addToCart(Mage_Checkout_Model_Cart $cart, $delete = false)
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index 5a8dba1cbd3..81483ecd20f 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -222,8 +222,8 @@ protected function _addCatalogProduct(Mage_Catalog_Model_Product $product, $qty
     /**
      * Retrieve wishlist item collection
      *
-     * @return Mage_Wishlist_Model_Resource_Item_Collection
      * @throws Mage_Core_Model_Store_Exception
+     * @return Mage_Wishlist_Model_Resource_Item_Collection
      */
     public function getItemCollection()
     {
diff --git a/app/code/core/Mage/Wishlist/controllers/IndexController.php b/app/code/core/Mage/Wishlist/controllers/IndexController.php
index 2a635a34624..e930de8efbc 100644
--- a/app/code/core/Mage/Wishlist/controllers/IndexController.php
+++ b/app/code/core/Mage/Wishlist/controllers/IndexController.php
@@ -171,8 +171,8 @@ public function addAction()
     /**
      * Add the item to wish list
      *
-     * @return void
      * @throws Throwable
+     * @return void
      */
     protected function _addItemToWishList()
     {
diff --git a/lib/Mage/Archive/Abstract.php b/lib/Mage/Archive/Abstract.php
index 76e89d08ee8..8e4dc9f19c7 100644
--- a/lib/Mage/Archive/Abstract.php
+++ b/lib/Mage/Archive/Abstract.php
@@ -19,8 +19,8 @@ class Mage_Archive_Abstract
      *
      * @param string $destination
      * @param string $data
-     * @return bool
      * @throws Mage_Exception
+     * @return bool
      */
     protected function _writeFile($destination, $data)
     {
@@ -36,8 +36,8 @@ protected function _writeFile($destination, $data)
      * Read data from file. If file can't be opened, throw to exception.
      *
      * @param string $source
-     * @return string
      * @throws Mage_Exception
+     * @return string
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
diff --git a/lib/Mage/Archive/Helper/File/Bz.php b/lib/Mage/Archive/Helper/File/Bz.php
index 008ab25546f..4e73e8a27b4 100644
--- a/lib/Mage/Archive/Helper/File/Bz.php
+++ b/lib/Mage/Archive/Helper/File/Bz.php
@@ -18,8 +18,8 @@ class Mage_Archive_Helper_File_Bz extends Mage_Archive_Helper_File
     /**
      * Open bz archive file
      *
-     * @throws Mage_Exception
      * @param string $mode
+     * @throws Mage_Exception
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
@@ -35,8 +35,8 @@ protected function _open($mode)
     /**
      * Write data to bz archive
      *
-     * @throws Mage_Exception
      * @param $data
+     * @throws Mage_Exception
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
@@ -52,8 +52,8 @@ protected function _write($data)
     /**
      * Read data from bz archive
      *
-     * @throws Mage_Exception
      * @param int $length
+     * @throws Mage_Exception
      * @return string
      */
     protected function _read($length)
diff --git a/lib/Mage/Archive/Tar.php b/lib/Mage/Archive/Tar.php
index 6406564a6d2..7d55b6f43e1 100644
--- a/lib/Mage/Archive/Tar.php
+++ b/lib/Mage/Archive/Tar.php
@@ -402,8 +402,8 @@ protected function _composeHeader($long = false)
      * in the string.
      *
      * @param string $destination path to file is unpacked
-     * @return array list of files
      * @throws Mage_Exception
+     * @return array list of files
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
diff --git a/lib/Magento/Db/Sql/Trigger.php b/lib/Magento/Db/Sql/Trigger.php
index 37ef1705e28..ff12bfea043 100644
--- a/lib/Magento/Db/Sql/Trigger.php
+++ b/lib/Magento/Db/Sql/Trigger.php
@@ -94,8 +94,8 @@ public function __construct()
     /**
      * Validate where all trigger parts set?
      *
-     * @return Magento_Db_Sql_Trigger
      * @throws Exception
+     * @return Magento_Db_Sql_Trigger
      */
     protected function _validateIsComplete()
     {
@@ -113,8 +113,8 @@ protected function _validateIsComplete()
      *
      * @param $part
      * @param $value
-     * @return Magento_Db_Sql_Trigger
      * @throws InvalidArgumentException
+     * @return Magento_Db_Sql_Trigger
      */
     protected function _setPart($part, $value)
     {
@@ -131,8 +131,8 @@ protected function _setPart($part, $value)
      * Set trigger part
      *
      * @param $part
-     * @return array|string
      * @throws Exception
+     * @return array|string
      */
     protected function _getPart($part)
     {
@@ -148,8 +148,8 @@ protected function _getPart($part)
      *
      * @param $part
      * @param $value
-     * @return Magento_Db_Sql_Trigger
      * @throws InvalidArgumentException
+     * @return Magento_Db_Sql_Trigger
      */
     public function setBodyPart($part, $value)
     {
@@ -166,8 +166,8 @@ public function setBodyPart($part, $value)
      * Set body part to trigger
      *
      * @param string $part
-     * @return string
      * @throws Exception
+     * @return string
      */
     public function getBodyPart($part)
     {
@@ -193,8 +193,8 @@ protected function _generateTriggerName()
     /**
      * Set trigger time {BEFORE/AFTER}
      * @param $time
-     * @return Magento_Db_Sql_Trigger
      * @throws InvalidArgumentException
+     * @return Magento_Db_Sql_Trigger
      */
     public function setTime($time)
     {
@@ -211,8 +211,8 @@ public function setTime($time)
      * Set trigger event {INSERT/UPDATE/DELETE}
      *
      * @param $event
-     * @return Magento_Db_Sql_Trigger
      * @throws InvalidArgumentException
+     * @return Magento_Db_Sql_Trigger
      */
     public function setEvent($event)
     {
diff --git a/lib/Magento/Profiler.php b/lib/Magento/Profiler.php
index 69327f9a901..0b906f5c5ca 100644
--- a/lib/Magento/Profiler.php
+++ b/lib/Magento/Profiler.php
@@ -217,8 +217,8 @@ public static function stop($timerName = null)
      *
      * @param  string $timerId
      * @param  string $key Information to return
-     * @return float|int
      * @throws Varien_Exception
+     * @return float|int
      */
     public static function fetch($timerId, $key = self::FETCH_TIME)
     {
diff --git a/lib/Unserialize/Parser.php b/lib/Unserialize/Parser.php
index 02ab93673da..681d781388f 100644
--- a/lib/Unserialize/Parser.php
+++ b/lib/Unserialize/Parser.php
@@ -32,8 +32,8 @@ class Unserialize_Parser
 
     /**
      * @param $str
-     * @return null|array
      * @throws Exception
+     * @return null|array
      */
     public function unserialize($str)
     {
diff --git a/lib/Unserialize/Reader/Arr.php b/lib/Unserialize/Reader/Arr.php
index b3ae0b4c33b..8cdbffb4983 100644
--- a/lib/Unserialize/Reader/Arr.php
+++ b/lib/Unserialize/Reader/Arr.php
@@ -45,8 +45,8 @@ class Unserialize_Reader_Arr
     /**
      * @param $char
      * @param $prevChar
-     * @return null|array
      * @throws Exception
+     * @return null|array
      */
     public function read($char, $prevChar)
     {
diff --git a/lib/Unserialize/Reader/ArrKey.php b/lib/Unserialize/Reader/ArrKey.php
index 76f2482571e..cefe2cbdbb1 100644
--- a/lib/Unserialize/Reader/ArrKey.php
+++ b/lib/Unserialize/Reader/ArrKey.php
@@ -37,8 +37,8 @@ public function __construct()
     /**
      * @param string $char
      * @param string $prevChar
-     * @return null|mixed
      * @throws Exception
+     * @return null|mixed
      */
     public function read($char, $prevChar)
     {
diff --git a/lib/Unserialize/Reader/ArrValue.php b/lib/Unserialize/Reader/ArrValue.php
index 4f60f789cd4..cb1d1eb2e81 100644
--- a/lib/Unserialize/Reader/ArrValue.php
+++ b/lib/Unserialize/Reader/ArrValue.php
@@ -40,8 +40,8 @@ public function __construct($key)
     /**
      * @param string $char
      * @param string $prevChar
-     * @return null|mixed
      * @throws Exception
+     * @return null|mixed
      */
     public function read($char, $prevChar)
     {
diff --git a/lib/Varien/Cache/Backend/Memcached.php b/lib/Varien/Cache/Backend/Memcached.php
index 3a591e1fce9..9f977f95ae2 100644
--- a/lib/Varien/Cache/Backend/Memcached.php
+++ b/lib/Varien/Cache/Backend/Memcached.php
@@ -27,8 +27,8 @@ class Varien_Cache_Backend_Memcached extends Zend_Cache_Backend_Memcached implem
     /**
      * Constructor
      *
-     * @throws Varien_Exception
      * @param array $options @see Zend_Cache_Backend_Memcached::__construct()
+     * @throws Varien_Exception
      */
     public function __construct(array $options = [])
     {
diff --git a/lib/Varien/Cache/Core.php b/lib/Varien/Cache/Core.php
index c07e888e613..7ea4e5ab052 100644
--- a/lib/Varien/Cache/Core.php
+++ b/lib/Varien/Cache/Core.php
@@ -24,8 +24,8 @@ class Varien_Cache_Core extends Zend_Cache_Core
     /**
      * Constructor
      *
-     * @throws Varien_Exception
      * @param array|Zend_Config $options Associative array of options or Zend_Config instance
+     * @throws Varien_Exception
      */
     public function __construct($options = [])
     {
diff --git a/lib/Varien/Data/Form.php b/lib/Varien/Data/Form.php
index 121edcce006..eb386433507 100644
--- a/lib/Varien/Data/Form.php
+++ b/lib/Varien/Data/Form.php
@@ -102,8 +102,8 @@ public function getHtmlAttributes()
      * Add form element
      *
      * @param false|string $after
-     * @return Varien_Data_Form
      * @throws Exception
+     * @return Varien_Data_Form
      */
     public function addElement(Varien_Data_Form_Element_Abstract $element, $after = false)
     {
@@ -137,8 +137,8 @@ public function addElementToCollection($element)
 
     /**
      * @param string $elementId
-     * @return bool
      * @throws Exception
+     * @return bool
      */
     public function checkElementId($elementId)
     {
diff --git a/lib/Varien/Data/Tree/Db.php b/lib/Varien/Data/Tree/Db.php
index be8e01596bd..4573bb82182 100644
--- a/lib/Varien/Data/Tree/Db.php
+++ b/lib/Varien/Data/Tree/Db.php
@@ -174,8 +174,8 @@ public function loadNode($nodeId)
      * @param array $data
      * @param Varien_Data_Tree_Node $parentNode
      * @param null|Varien_Data_Tree_Node $prevNode
-     * @return Varien_Data_Tree_Node
      * @throws Zend_Db_Adapter_Exception
+     * @return Varien_Data_Tree_Node
      */
     public function appendChild($data, $parentNode, $prevNode = null)
     {
@@ -249,8 +249,8 @@ public function moveNodeTo($node, $parentNode, $prevNode = null)
     /**
      * @param int $parentId
      * @param int $parentLevel
-     * @return $this
      * @throws Zend_Db_Adapter_Exception
+     * @return $this
      */
     protected function _updateChildLevels($parentId, $parentLevel)
     {
@@ -295,8 +295,8 @@ protected function _loadFullTree()
 
     /**
      * @param Varien_Data_Tree_Node $node
-     * @return $this|Varien_Data_Tree
      * @throws Exception
+     * @return $this|Varien_Data_Tree
      */
     public function removeNode($node)
     {
diff --git a/lib/Varien/Db/Adapter/Interface.php b/lib/Varien/Db/Adapter/Interface.php
index b324cf7d007..ce1d11f25e2 100644
--- a/lib/Varien/Db/Adapter/Interface.php
+++ b/lib/Varien/Db/Adapter/Interface.php
@@ -216,8 +216,8 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null);
      *
      * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
      *
-     * @return bool
      * @throws Zend_Db_Exception
+     * @return bool
      */
     public function renameTablesBatch(array $tablePairs);
 
diff --git a/lib/Varien/Db/Adapter/Mysqli.php b/lib/Varien/Db/Adapter/Mysqli.php
index 9c5ba4a8471..3dbf9bf79f9 100644
--- a/lib/Varien/Db/Adapter/Mysqli.php
+++ b/lib/Varien/Db/Adapter/Mysqli.php
@@ -16,8 +16,8 @@ class Varien_Db_Adapter_Mysqli extends Zend_Db_Adapter_Mysqli
     /**
      * Creates a real connection to the database with multi-query capability.
      *
-     * @return void
      * @throws Zend_Db_Adapter_Mysqli_Exception
+     * @return void
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
diff --git a/lib/Varien/Db/Adapter/Pdo/Mysql.php b/lib/Varien/Db/Adapter/Pdo/Mysql.php
index 7f3367283ab..0137493ee57 100644
--- a/lib/Varien/Db/Adapter/Pdo/Mysql.php
+++ b/lib/Varien/Db/Adapter/Pdo/Mysql.php
@@ -404,8 +404,8 @@ protected function _connect()
      * Run RAW Query
      *
      * @param string $sql
-     * @return Zend_Db_Statement_Interface
      * @throws PDOException
+     * @return Zend_Db_Statement_Interface
      */
     // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps
     public function raw_query($sql)
@@ -489,8 +489,8 @@ protected function _checkDdlTransaction($sql)
      *
      * @param string|Zend_Db_Select $sql The SQL statement with placeholders.
      * @param mixed $bind An array of data or data itself to bind to the placeholders.
-     * @return Zend_Db_Statement_Pdo
      * @throws Zend_Db_Adapter_Exception To re-throw PDOException.
+     * @return Zend_Db_Statement_Pdo
      */
     public function query($sql, $bind = [])
     {
@@ -936,8 +936,8 @@ public function tableColumnExists($tableName, $columnName, $schemaName = null)
      * @param   string $columnName
      * @param   array|string $definition  string specific or universal array DB Server definition
      * @param   string $schemaName
-     * @return  bool|int|Zend_Db_Statement_Interface
      * @throws  Zend_Db_Exception
+     * @return  bool|int|Zend_Db_Statement_Interface
      */
     public function addColumn($tableName, $columnName, $definition, $schemaName = null)
     {
@@ -1021,8 +1021,8 @@ public function dropColumn($tableName, $columnName, $schemaName = null)
      * @param array $definition
      * @param bool $flushData        flush table statistic
      * @param string $schemaName
-     * @return Zend_Db_Statement_Interface|Zend_Db_Statement_Pdo
      * @throws Zend_Db_Exception
+     * @return Zend_Db_Statement_Interface|Zend_Db_Statement_Pdo
      */
     public function changeColumn(
         $tableName,
@@ -1071,8 +1071,8 @@ public function changeColumn(
      * @param array|string $definition
      * @param bool $flushData
      * @param string $schemaName
-     * @return $this
      * @throws Zend_Db_Exception
+     * @return $this
      */
     public function modifyColumn($tableName, $columnName, $definition, $flushData = false, $schemaName = null)
     {
@@ -2068,8 +2068,8 @@ public function insertForce($table, array $bind)
      * @param mixed $table The table to insert data into.
      * @param array $data Column-value pairs or array of column-value pairs.
      * @param array $fields update fields pairs or values
-     * @return int The number of affected rows.
      * @throws Zend_Db_Exception
+     * @return int The number of affected rows.
      */
     public function insertOnDuplicate($table, array $data, array $fields = [])
     {
@@ -2140,8 +2140,8 @@ public function insertOnDuplicate($table, array $data, array $fields = [])
      *
      * @param mixed $table The table to insert data into.
      * @param array $data Column-value pairs or array of Column-value pairs.
-     * @return int The number of affected rows.
      * @throws Zend_Db_Exception
+     * @return int The number of affected rows.
      */
     public function insertMultiple($table, array $data)
     {
@@ -2176,8 +2176,8 @@ public function insertMultiple($table, array $data)
      * Insert array to table based on columns definition
      *
      * @param   string $table
-     * @return  int
      * @throws  Zend_Db_Exception
+     * @return  int
      */
     public function insertArray($table, array $columns, array $data)
     {
@@ -2205,8 +2205,8 @@ public function insertArray($table, array $columns, array $data)
      *
      * @param mixed $table The table to insert data into.
      * @param array $bind Column-value pairs.
-     * @return int The number of affected rows.
      * @throws Zend_Db_Adapter_Exception
+     * @return int The number of affected rows.
      */
     public function insertIgnore($table, array $bind)
     {
@@ -2341,8 +2341,8 @@ public function createTemporaryTable(Varien_Db_Ddl_Table $table)
     /**
      * Retrieve columns and primary keys definition array for create table
      *
-     * @return array
      * @throws Zend_Db_Exception
+     * @return array
      */
     protected function _getColumnsDefinition(Varien_Db_Ddl_Table $table)
     {
@@ -2457,8 +2457,8 @@ protected function _getForeignKeysDefinition(Varien_Db_Ddl_Table $table)
     /**
      * Retrieve table options definition array for create table
      *
-     * @return array
      * @throws Zend_Db_Exception
+     * @return array
      */
     protected function _getOptionsDefinition(Varien_Db_Ddl_Table $table)
     {
@@ -2515,8 +2515,8 @@ public function getColumnDefinitionFromDescribe($options, $ddlType = null)
      * @param array $options
      * @param string $ddlType Table DDL Column type constant
      * @throws Varien_Exception
-     * @return string
      * @throws Zend_Db_Exception
+     * @return string
      */
     protected function _getColumnDefinition($options, $ddlType = null)
     {
@@ -2691,8 +2691,8 @@ public function dropTemporaryTable($tableName, $schemaName = null)
      *
      * @param string $tableName
      * @param string $schemaName
-     * @return $this
      * @throws Zend_Db_Exception
+     * @return $this
      */
     public function truncateTable($tableName, $schemaName = null)
     {
@@ -2740,8 +2740,8 @@ public function isTableExists($tableName, $schemaName = null)
      * @param string $oldTableName
      * @param string $newTableName
      * @param string $schemaName
-     * @return bool
      * @throws Zend_Db_Exception
+     * @return bool
      */
     public function renameTable($oldTableName, $newTableName, $schemaName = null)
     {
@@ -2769,8 +2769,8 @@ public function renameTable($oldTableName, $newTableName, $schemaName = null)
      *
      * @param array $tablePairs array('oldName' => 'Name1', 'newName' => 'Name2')
      *
-     * @return bool
      * @throws Zend_Db_Exception
+     * @return bool
      */
     public function renameTablesBatch(array $tablePairs)
     {
@@ -2807,8 +2807,8 @@ public function renameTablesBatch(array $tablePairs)
      * @param array|string $fields  the table column name or array of ones
      * @param string $indexType     the index type
      * @param string $schemaName
-     * @return Zend_Db_Statement_Interface
      * @throws Exception|Zend_Db_Exception
+     * @return Zend_Db_Statement_Interface
      */
     public function addIndex(
         $tableName,
@@ -3347,8 +3347,8 @@ public function getGreatestSql(array $data)
      *
      * @param int $interval
      * @param string $unit
-     * @return string
      * @throws Zend_Db_Exception
+     * @return string
      */
     protected function _getIntervalUnitSql($interval, $unit)
     {
@@ -3459,8 +3459,8 @@ public function getStandardDeviationSql($expressionField)
      *
      * @param string|Zend_Db_Expr $date   quoted field name or SQL statement
      * @param string $unit
-     * @return Zend_Db_Expr
      * @throws Zend_Db_Exception
+     * @return Zend_Db_Expr
      */
     public function getDateExtractSql($date, $unit)
     {
@@ -3696,8 +3696,8 @@ public function insertFromSelect(Varien_Db_Select $select, $table, array $fields
      *
      * @param string $rangeField
      * @param int $stepCount
-     * @return array
      * @throws Varien_Db_Exception
+     * @return array
      */
     public function selectsByRange($rangeField, Varien_Db_Select $select, $stepCount = 100)
     {
diff --git a/lib/Varien/Db/Select.php b/lib/Varien/Db/Select.php
index 6ecc1e4f794..beabf764666 100644
--- a/lib/Varien/Db/Select.php
+++ b/lib/Varien/Db/Select.php
@@ -258,8 +258,8 @@ protected function _findTableInCond($table, $cond)
      * @param  string $cond Join on this condition
      * @param  array|string $cols The columns to select from the joined table
      * @param  string $schema The database name to specify, if any.
-     * @return Zend_Db_Select This Zend_Db_Select object
      * @throws Zend_Db_Select_Exception
+     * @return Zend_Db_Select This Zend_Db_Select object
      */
     protected function _join($type, $name, $cond, $cols, $schema = null)
     {
@@ -348,8 +348,8 @@ public function deleteFromSelect($table)
      *
      * @param string $part
      * @param mixed $value
-     * @return $this
      * @throws Zend_Db_Select_Exception
+     * @return $this
      */
     public function setPart($part, $value)
     {
diff --git a/lib/Varien/Db/Statement/Pdo/Mysql.php b/lib/Varien/Db/Statement/Pdo/Mysql.php
index 7668e550d70..e1c3f4c98f8 100644
--- a/lib/Varien/Db/Statement/Pdo/Mysql.php
+++ b/lib/Varien/Db/Statement/Pdo/Mysql.php
@@ -19,8 +19,8 @@ class Varien_Db_Statement_Pdo_Mysql extends Zend_Db_Statement_Pdo
      * Allows transferring specific options to DB driver.
      *
      * @param array $params Array of values to bind to parameter placeholders.
-     * @return bool
      * @throws Zend_Db_Statement_Exception
+     * @return bool
      */
     public function _executeWithBinding(array $params)
     {
@@ -70,8 +70,8 @@ public function _executeWithBinding(array $params)
      * Executes a prepared statement.
      *
      * @param array $params OPTIONAL Values to bind to parameter placeholders.
-     * @return bool
      * @throws Zend_Db_Statement_Exception
+     * @return bool
      */
     public function _execute(?array $params = null)
     {
diff --git a/lib/Varien/Filter/Object.php b/lib/Varien/Filter/Object.php
index 0126f7851ae..5c296db2932 100644
--- a/lib/Varien/Filter/Object.php
+++ b/lib/Varien/Filter/Object.php
@@ -35,8 +35,8 @@ public function addFilter(Zend_Filter_Interface $filter, $column = '')
 
     /**
      * @param Varien_Object $object
-     * @return mixed
      * @throws Exception
+     * @return mixed
      */
     public function filter($object)
     {
diff --git a/lib/Varien/Filter/Object/Grid.php b/lib/Varien/Filter/Object/Grid.php
index 02b280a9661..993f01c9e8b 100644
--- a/lib/Varien/Filter/Object/Grid.php
+++ b/lib/Varien/Filter/Object/Grid.php
@@ -11,8 +11,8 @@ class Varien_Filter_Object_Grid extends Varien_Filter_Object
 {
     /**
      * @param array|Varien_Object $grid
-     * @return array
      * @throws Exception
+     * @return array
      */
     public function filter($grid)
     {
diff --git a/lib/Varien/Image/Adapter/Gd2.php b/lib/Varien/Image/Adapter/Gd2.php
index 26f28296cbf..94a6158b1e7 100644
--- a/lib/Varien/Image/Adapter/Gd2.php
+++ b/lib/Varien/Image/Adapter/Gd2.php
@@ -217,8 +217,8 @@ public function display()
      *
      * @param string $callbackType
      * @param int $fileType
-     * @return string
      * @throws Exception
+     * @return string
      */
     private function _getCallback($callbackType, $fileType = null, $unsupportedText = 'Unsupported image format.')
     {
diff --git a/lib/Varien/Io/File.php b/lib/Varien/Io/File.php
index d78be86f44f..960b999f577 100644
--- a/lib/Varien/Io/File.php
+++ b/lib/Varien/Io/File.php
@@ -441,8 +441,8 @@ public function pwd()
      * Change current working directory
      *
      * @param string $dir
-     * @return bool
      * @throws Exception
+     * @return bool
      *
      * @SuppressWarnings("PHPMD.ErrorControlOperator")
      */
@@ -492,8 +492,8 @@ public function read($filename, $dest = null)
      * @param resource|string $src
      * @param int $mode
      *
-     * @return bool|int
      * @throws Exception
+     * @return bool|int
      */
     public function write($filename, $src, $mode = null)
     {