Phpdocs/phpstan update

.github/phpstan-baseline.neon

@@ -385,11 +385,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Block_Widget_Tabs\\:\\:addTabAfter\\(\\) should return Mage_Adminhtml_Block_Widget_Tabs but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
-
 		-
 			message: "#^PHPDoc tag @param references unknown parameter\\: \\$tabNId$#"
 			count: 1
@@ -450,11 +445,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Adminhtml/Model/System/Store.php
 
-		-
-			message: "#^Method Mage_Adminhtml_Model_Url\\:\\:renewSecretUrls\\(\\) should return \\$this\\(Mage_Adminhtml_Model_Url\\) but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Adminhtml/Model/Url.php
-
 		-
 			message: "#^Method Mage_Adminhtml_Controller_Action\\:\\:_setForcedFormKeyActions\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 1
@@ -700,11 +690,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Api2/Model/Route/ApiType.php
 
-		-
-			message: "#^Call to an undefined method Mage_Payment_Model_Info\\:\\:authorize\\(\\)\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php
-
 		-
 			message: "#^Call to an undefined method Varien_Object\\:\\:decrypt\\(\\)\\.$#"
 			count: 1
@@ -715,11 +700,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php
 
-		-
-			message: "#^Method Mage_Authorizenet_Model_Directpost\\:\\:authorize\\(\\) should return Mage_Paygate_Model_Authorizenet but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Authorizenet/Model/Directpost.php
-
 		-
 			message: "#^Method Mage_Authorizenet_Model_Directpost\\:\\:initialize\\(\\) should return \\$this\\(Mage_Authorizenet_Model_Directpost\\) but return statement is missing\\.$#"
 			count: 1
@@ -1820,11 +1800,6 @@ parameters:
 			count: 2
 			path: ../app/code/core/Mage/Dataflow/Model/Profile.php
 
-		-
-			message: "#^Binary operation \"\\*\" between float and non\\-falsy\\-string results in an error\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Directory/Model/Currency.php
-
 		-
 			message: "#^Variable \\$response might not be defined\\.$#"
 			count: 1
@@ -2370,11 +2345,6 @@ parameters:
 			count: 1
 			path: ../app/code/core/Mage/Paypal/Model/Ipn.php
 
-		-
-			message: "#^Method Mage_Paypal_Model_Observer\\:\\:fetchReports\\(\\) should return \\$this\\(Mage_Paypal_Model_Observer\\) but return statement is missing\\.$#"
-			count: 1
-			path: ../app/code/core/Mage/Paypal/Model/Observer.php
-
 		-
 			message: "#^Variable \\$order in empty\\(\\) always exists and is not falsy\\.$#"
 			count: 1

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

@@ -378,7 +378,7 @@ public function deleteFromRole(Mage_Core_Model_Abstract $user)
      * Check if role user exists
      *
      * @param Mage_Core_Model_Abstract|Mage_Admin_Model_User $user
-     * @return array|false
+     * @return array
      */
     public function roleUserExists(Mage_Core_Model_Abstract $user)
     {

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

@@ -471,7 +471,7 @@ public function loadByUsername($username)
      * Check if user is assigned to any role
      *
      * @param int|Mage_Admin_Model_User $user
-     * @return null|bool|array
+     * @return array|null
      */
     public function hasAssigned2Role($user)
     {

app/code/core/Mage/Adminhtml/Block/Catalog/Product.php

@@ -37,9 +37,7 @@ public function __construct()
     }
 
     /**
-     * Prepare button and grid
-     *
-     * @return $this
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php

@@ -223,7 +223,7 @@ protected function isSingleStoreMode()
     /**
      * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
      *
-     * @return bool
+     * @return int
      */
     protected function getStoreId()
     {

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php

@@ -314,7 +314,7 @@ public function getDeleteUrl()
     /**
      * Retrieve Save As Flag
      *
-     * @return int
+     * @return string
      */
     public function getSaveAsFlag()
     {
@@ -334,7 +334,7 @@ protected function isSingleStoreMode()
     /**
      * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
      *
-     * @return bool
+     * @return int
      */
     protected function getStoreId()
     {

app/code/core/Mage/Adminhtml/Block/Page/Head.php

@@ -48,7 +48,7 @@ public function getFormKey()
     /**
      * Retrieve Timeout Delay from Config
      *
-     * @return string
+     * @return int
      */
     public function getLoadingTimeout()
     {

app/code/core/Mage/Adminhtml/Block/Permissions/Tab/Rolesedit.php

@@ -154,7 +154,7 @@ public function getResTreeJson()
      *
      * @param array $a
      * @param array $b
-     * @return bool
+     * @return int
      */
     protected function _sortTree($a, $b)
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Address/Form.php

@@ -47,7 +47,7 @@ protected function _getAddress()
     /**
      * Define form attributes (id, method, action)
      *
-     * @return Mage_Adminhtml_Block_Sales_Order_Create_Billing_Address
+     * @return $this
      */
     protected function _prepareForm()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Comments/View.php

@@ -40,9 +40,7 @@ protected function _beforeToHtml()
     }
 
     /**
-     * Prepare child blocks
-     *
-     * @return Mage_Adminhtml_Block_Sales_Order_Invoice_Create_Items
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php

@@ -304,7 +304,7 @@ public function getTierHtml($item)
      * Get Custom Options of item
      *
      * @param Mage_Sales_Model_Quote_Item $item
-     * @return array
+     * @return string
      */
     public function getCustomOptions(Mage_Sales_Model_Quote_Item $item)
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Sidebar/Reorder.php

@@ -69,7 +69,7 @@ public function getLastOrder()
     /**
      * Retrieve item collection
      *
-     * @return mixed
+     * @return array|false
      */
     public function getItemCollection()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Totals/Shipping.php

@@ -74,7 +74,7 @@ public function getShippingExcludeTax()
     /**
      * Get label for shipping include tax
      *
-     * @return float
+     * @return string
      */
     public function getIncludeTaxLabel()
     {
@@ -84,7 +84,7 @@ public function getIncludeTaxLabel()
     /**
      * Get label for shipping exclude tax
      *
-     * @return float
+     * @return string
      */
     public function getExcludeTaxLabel()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create/Form.php

@@ -40,7 +40,7 @@ public function getOrder()
     /**
      * Retrieve source
      *
-     * @return Mage_Sales_Model_Order_Invoice
+     * @return Mage_Sales_Model_Order_Creditmemo
      */
     public function getSource()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Form.php

@@ -40,7 +40,7 @@ public function getOrder()
     /**
      * Retrieve source
      *
-     * @return Mage_Sales_Model_Order_Invoice
+     * @return Mage_Sales_Model_Order_Shipment
      */
     public function getSource()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Create/Items.php

@@ -40,7 +40,7 @@ public function getOrder()
     /**
      * Retrieve source
      *
-     * @return Mage_Sales_Model_Order_Invoice
+     * @return Mage_Sales_Model_Order_Shipment
      */
     public function getSource()
     {

app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Items/Renderer/Default.php

@@ -179,8 +179,8 @@ public function getMessage()
     /**
      * Retrieve save url
      *
+     * @return string
      * @deprecated after 1.4.2.0
-     * @return array
      */
     public function getSaveUrl()
     {

app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/Grid.php

@@ -90,9 +90,7 @@ public function setConditionName($name)
     }
 
     /**
-     * Retrieve current website id
-     *
-     * @return int
+     * @return string
      */
     public function getConditionName()
     {

app/code/core/Mage/Adminhtml/Block/System/Config/Form.php

@@ -544,7 +544,7 @@ protected function _afterToHtml($html)
     /**
      * @param Varien_Simplexml_Element $a
      * @param Varien_Simplexml_Element $b
-     * @return bool
+     * @return int
      */
     protected function _sortForm($a, $b)
     {

app/code/core/Mage/Adminhtml/Block/System/Variable/Edit.php

@@ -43,10 +43,7 @@ public function getVariable()
     }
 
     /**
-     * Prepare layout.
-     * Adding save_and_continue button
-     *
-     * @return $this
+     * @inheritDoc
      */
     protected function _preparelayout()
     {

app/code/core/Mage/Adminhtml/Block/Tag/Tag/Edit.php

@@ -66,7 +66,7 @@ public function __construct()
     /**
      * Add to layout accordion block
      *
-     * @return Mage_Adminhtml_Block_Tag_Edit
+     * @return $this
      */
     protected function _prepareLayout()
     {

app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php

@@ -42,10 +42,7 @@ class Mage_Adminhtml_Block_Urlrewrite_Edit extends Mage_Adminhtml_Block_Widget_C
     protected $_buttonsHtml;
 
     /**
-     * Prepare page layout, basing on different registry and request variables
-     *
-     * Generates layout of: creation modes selector, products grid, categories tree, urlrewrite edit form
-     * @return $this
+     * @inheritDoc
      */
     protected function _prepareLayout()
     {

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

@@ -449,7 +449,7 @@ public function getLastColumnId()
     }
 
     /**
-     * @return int|void
+     * @return int
      */
     public function getColumnCount()
     {
@@ -1304,7 +1304,7 @@ protected function _exportExcelItem(Varien_Object $item, Varien_Io_File $adapter
      * Return array with keys type and value
      *
      * @param string $sheetName
-     * @return string
+     * @return array
      * @throws Exception
      */
     public function getExcelFile($sheetName = '')

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

@@ -92,7 +92,6 @@ public function setDestElementId($elementId)
      * @param   string $tabId new tab Id
      * @param   string|array|Varien_Object $tab
      * @param   string $afterTabId
-     * @return  Mage_Adminhtml_Block_Widget_Tabs
      */
     public function addTabAfter($tabId, $tab, $afterTabId)
     {

app/code/core/Mage/Adminhtml/Controller/Sales/Creditmemo.php

@@ -45,7 +45,7 @@ protected function _construct()
     /**
      * Init layout, menu and breadcrumb
      *
-     * @return Mage_Adminhtml_Sales_CreditmemoController
+     * @return $this
      */
     protected function _initAction()
     {

app/code/core/Mage/Adminhtml/Model/System/Config/Backend/Admin/Custompath.php

@@ -30,7 +30,7 @@ class Mage_Adminhtml_Model_System_Config_Backend_Admin_Custompath extends Mage_C
     /**
      * Check whether redirect should be set
      *
-     * @return Mage_Adminhtml_Model_System_Config_Backend_Admin_Custom
+     * @return $this
      */
     protected function _beforeSave()
     {

app/code/core/Mage/Adminhtml/Model/System/Store.php

@@ -315,7 +315,7 @@ public function getStoreGroupOptionHash($attribute = 'name')
      * Retrieve Website name by Id
      *
      * @param int $websiteId
-     * @return string
+     * @return string|null
      */
     public function getWebsiteName($websiteId)
     {
@@ -331,7 +331,7 @@ public function getWebsiteName($websiteId)
      * Retrieve Group name by Id
      *
      * @param int $groupId
-     * @return string
+     * @return string|null
      */
     public function getGroupName($groupId)
     {
@@ -347,7 +347,7 @@ public function getGroupName($groupId)
      * Retrieve Store name by Id
      *
      * @param int $storeId
-     * @return string
+     * @return string|null
      */
     public function getStoreName($storeId)
     {

app/code/core/Mage/Adminhtml/Model/Url.php

@@ -161,8 +161,6 @@ public function turnOffSecretKey()
 
     /**
      * Refresh admin menu cache etc.
-     *
-     * @return $this
      */
     public function renewSecretUrls()
     {

app/code/core/Mage/Adminhtml/controllers/System/StoreController.php

@@ -47,7 +47,7 @@ public function preDispatch()
     /**
      * Init actions
      *
-     * @return Mage_Adminhtml_Cms_PageController
+     * @return $this
      */
     protected function _initAction()
     {