OpenMage · sreichel · Nov 2, 2025 · Nov 2, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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()
     {