PhpStan: some fixes

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

@@ -82,7 +82,7 @@ public function getAddressId()
     /**
      * Return billing address object
      *
-     * @return Mage_Customer_Model_Address
+     * @return Mage_Sales_Model_Quote_Address
      */
     public function getAddress()
     {

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

@@ -1805,7 +1805,7 @@ public function getRowspan($item, $column)
 
     /**
      * @param string|object $column
-     * @param string $value
+     * @param string|bool $value
      * @return bool|$this
      */
     public function isColumnGrouped($column, $value = null)

app/code/core/Mage/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php

@@ -38,7 +38,7 @@ class Mage_Adminhtml_Customer_Wishlist_Product_Composite_WishlistController exte
     /**
      * Wishlist item we're working with
      *
-     * @var Mage_Wishlist_Model_Wishlist
+     * @var Mage_Wishlist_Model_Item
      */
     protected $_wishlistItem = null;
 

app/code/core/Mage/Api2/Model/Request.php

@@ -73,7 +73,9 @@ public function __construct($uri = null)
     protected function _getInterpreter()
     {
         if ($this->_interpreter === null) {
-            $this->_interpreter = Mage_Api2_Model_Request_Interpreter::factory($this->getContentType());
+            /** @var Mage_Api2_Model_Request_Interpreter_Interface $factory */
+            $factory = Mage_Api2_Model_Request_Interpreter::factory($this->getContentType());
+            $this->_interpreter = $factory;
         }
         return $this->_interpreter;
     }

app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php

@@ -95,15 +95,19 @@ public function __construct($options)
         if (empty($validationConfig[$userType]['entity_model'])) {
             throw new Exception("Config parameter 'entity' is wrong.");
         }
-        $this->_entity = Mage::getModel($validationConfig[$userType]['entity_model']);
-        if (empty($this->_entity) || !$this->_entity instanceof Mage_Core_Model_Abstract) {
+
+        $entityModel = Mage::getModel($validationConfig[$userType]['entity_model']);
+        if (empty($entityModel) || !$entityModel instanceof Mage_Core_Model_Abstract) {
             throw new Exception('Entity is not model.');
         }
+        $this->_entity = $entityModel;
 
-        $this->_eavForm = Mage::getModel($this->_formPath);
-        if (empty($this->_eavForm) || !$this->_eavForm instanceof Mage_Eav_Model_Form) {
-            throw new Exception("Eav form '{$this->_formPath}' is not found.");
+        $formModel = Mage::getModel($this->_formPath);
+        if (empty($formModel) || !$formModel instanceof Mage_Eav_Model_Form) {
+            throw new Exception("Eav form '{$formModel}' is not found.");
         }
+        $this->_eavForm = $formModel;
+
         $this->_eavForm->setEntity($this->_entity)
             ->setFormCode($this->_formCode)
             ->ignoreInvisible(false);

app/code/core/Mage/Catalog/Block/Product/List/Crosssell.php

@@ -32,7 +32,7 @@ class Mage_Catalog_Block_Product_List_Crosssell extends Mage_Catalog_Block_Produ
     /**
      * Crosssell item collection
      *
-     * @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection
+     * @var Mage_Catalog_Model_Resource_Product_Link_Product_Collection
      */
     protected $_itemCollection;
 
@@ -77,7 +77,7 @@ protected function _beforeToHtml()
     /**
      * Retrieve crosssell items collection
      *
-     * @return Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Link_Product_Collection
+     * @return Mage_Catalog_Model_Resource_Product_Link_Product_Collection
      */
     public function getItems()
     {

app/code/core/Mage/Catalog/Block/Product/Widget/New.php

@@ -176,9 +176,11 @@ public function getPagerHtml()
     {
         if ($this->showPager()) {
             if (!$this->_pager) {
-                $this->_pager = $this->getLayout()
+                /** @var Mage_Catalog_Block_Product_Widget_Html_Pager $block */
+                $block = $this->getLayout()
                     ->createBlock('catalog/product_widget_html_pager', 'widget.new.product.list.pager');
 
+                $this->_pager = $block;
                 $this->_pager->setUseContainer(true)
                     ->setShowAmounts(true)
                     ->setShowPerPage(false)

app/code/core/Mage/Catalog/Helper/Data.php

@@ -268,12 +268,14 @@ public function isUrlDirectivesParsingAllowed()
     /**
      * Retrieve template processor for catalog content
      *
-     * @return false|Mage_Core_Model_Abstract
+     * @return Varien_Filter_Template
      */
     public function getPageTemplateProcessor()
     {
         $model = (string) Mage::getConfig()->getNode(self::XML_PATH_CONTENT_TEMPLATE_FILTER);
-        return Mage::getModel($model);
+        /** @var Varien_Filter_Template $model */
+        $model = Mage::getModel($model);
+        return $model;
     }
 
     /**

app/code/core/Mage/Catalog/Helper/Product/Compare.php

@@ -27,7 +27,7 @@ class Mage_Catalog_Helper_Product_Compare extends Mage_Core_Helper_Url
     /**
      * Product Compare Items Collection
      *
-     * @var Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Compare_Item_Collection
+     * @var Mage_Catalog_Model_Resource_Product_Compare_Item_Collection
      */
     protected $_itemCollection;
 

app/code/core/Mage/CatalogInventory/Block/Adminhtml/Form/Field/Minsaleqty.php

@@ -35,11 +35,13 @@ class Mage_CatalogInventory_Block_Adminhtml_Form_Field_Minsaleqty extends Mage_A
     protected function _getGroupRenderer()
     {
         if (!$this->_groupRenderer) {
-            $this->_groupRenderer = $this->getLayout()->createBlock(
+            /** @var Mage_CatalogInventory_Block_Adminhtml_Form_Field_Customergroup $block */
+            $block = $this->getLayout()->createBlock(
                 'cataloginventory/adminhtml_form_field_customergroup',
                 '',
                 ['is_render_to_js_template' => true],
             );
+            $this->_groupRenderer = $block;
             $this->_groupRenderer->setClass('customer_group_select');
             $this->_groupRenderer->setExtraParams('style="width:120px"');
         }

app/code/core/Mage/Checkout/Block/Cart/Shipping.php

@@ -35,7 +35,7 @@ class Mage_Checkout_Block_Cart_Shipping extends Mage_Checkout_Block_Cart_Abstrac
     /**
      * Address Model
      *
-     * @var array
+     * @var Mage_Sales_Model_Quote_Address|array
      */
     protected $_address = [];
 

app/code/core/Mage/Checkout/Block/Onepage/Billing.php

@@ -178,7 +178,9 @@ public function getSaveUrl() {}
     protected function _getTaxvat()
     {
         if (!$this->_taxvat) {
-            $this->_taxvat = $this->getLayout()->createBlock('customer/widget_taxvat');
+            /** @var Mage_Customer_Block_Widget_Taxvat $block */
+            $block = $this->getLayout()->createBlock('customer/widget_taxvat');
+            $this->_taxvat = $block;
         }
 
         return $this->_taxvat;

app/code/core/Mage/Checkout/Helper/Data.php

@@ -101,7 +101,7 @@ public function canOnepageCheckout()
      * Get sales item (quote item, order item etc) price including tax based on row total and tax amount
      * excluding weee tax
      *
-     * @param   Mage_Core_Model_Abstract $item
+     * @param   Mage_Core_Model_Abstract|Varien_Object $item
      * @return  float
      */
     public function getPriceInclTax($item)
@@ -118,7 +118,7 @@ public function getPriceInclTax($item)
     /**
      * Get sales item (quote item, order item etc) row total price including tax
      *
-     * @param   Mage_Core_Model_Abstract $item
+     * @param   Mage_Core_Model_Abstract|Varien_Object $item
      * @return  float
      */
     public function getSubtotalInclTax($item)
@@ -146,7 +146,7 @@ protected function _getWeeeHelper()
     /**
      * Get the base price of the item including tax , excluding weee
      *
-     * @param Mage_Core_Model_Abstract $item
+     * @param Mage_Core_Model_Abstract|Varien_Object $item
      * @return float
      */
     public function getBasePriceInclTax($item)
@@ -159,7 +159,7 @@ public function getBasePriceInclTax($item)
     /**
      * Get sales item (quote item, order item etc) row total price including tax excluding wee
      *
-     * @param Mage_Core_Model_Abstract $item
+     * @param Mage_Core_Model_Abstract|Varien_Object $item
      * @return float
      */
     public function getBaseSubtotalInclTax($item)

app/code/core/Mage/Core/Controller/Varien/Front.php

@@ -206,9 +206,11 @@ public function dispatch()
     protected function _getRequestRewriteController()
     {
         $className = (string) Mage::getConfig()->getNode('global/request_rewrite/model');
-        return Mage::getSingleton('core/factory')->getModel($className, [
+        /** @var Mage_Core_Model_Url_Rewrite_Request $model */
+        $model = Mage::getSingleton('core/factory')->getModel($className, [
             'routers' => $this->getRouters(),
         ]);
+        return $model;
     }
 
     /**

app/code/core/Mage/Core/Helper/Abstract.php

@@ -32,7 +32,7 @@ abstract class Mage_Core_Helper_Abstract
     /**
      * Request object
      *
-     * @var Zend_Controller_Request_Http
+     * @var Mage_Core_Controller_Request_Http
      */
     protected $_request;
 

app/code/core/Mage/Core/Model/App.php

@@ -197,7 +197,7 @@ class Mage_Core_Model_App
     /**
      * Response object
      *
-     * @var Zend_Controller_Response_Http
+     * @var Mage_Core_Controller_Response_Http
      */
     protected $_response;
 

app/code/core/Mage/Core/Model/Config.php

@@ -443,7 +443,7 @@ public function loadEnv(): Mage_Core_Model_Config
     /**
      * Reinitialize configuration
      *
-     * @param   array $options
+     * @param   Mage_Core_Model_Config_Options|array $options
      * @return  $this
      */
     public function reinit($options = [])

app/code/core/Mage/Core/Model/Cookie.php

@@ -40,7 +40,7 @@ class Mage_Core_Model_Cookie
     /**
      * Set Store object
      *
-     * @param mixed $store
+     * @param bool|int|Mage_Core_Model_Store|null|string $store
      * @return $this
      */
     public function setStore($store)
@@ -199,7 +199,7 @@ public function isSecure()
      *
      * @param string $name The cookie name
      * @param string $value The cookie value
-     * @param int $period Lifetime period
+     * @param int|bool $period Lifetime period
      * @param string $path
      * @param string $domain
      * @param int|bool $secure

app/code/core/Mage/Core/Model/Factory.php

@@ -105,7 +105,9 @@ public function getConfig()
      */
     public function getUrlRewriteInstance()
     {
-        return $this->getModel($this->getUrlRewriteClassAlias());
+        /** @var Mage_Core_Model_Url_Rewrite $model */
+        $model = $this->getModel($this->getUrlRewriteClassAlias());
+        return $model;
     }
 
     /**

app/code/core/Mage/Eav/Model/Config.php

@@ -387,7 +387,7 @@ protected function _hydrateAttribute($attributeData)
     /**
      * Get entity type object by entity type code/identifier
      *
-     * @param mixed $code
+     * @param Mage_Eav_Model_Entity_Type|string|int $code
      * @param string|null $field
      * @return Mage_Eav_Model_Entity_Type
      * @throws Mage_Core_Exception
@@ -537,7 +537,7 @@ public function getAttributes($entityType)
     /**
      * Get codes of all entity type attributes
      *
-     * @param Mage_Eav_Model_Entity_Type $entityType
+     * @param Mage_Eav_Model_Entity_Type|string|int $entityType
      * @param Varien_Object $object
      * @return array
      * @throws Mage_Core_Exception

app/code/core/Mage/Index/Model/Lock.php

@@ -267,7 +267,9 @@ protected function _getLockStorage()
     {
         if (!$this->_storage instanceof Mage_Index_Model_Lock_Storage_Interface) {
             $config = Mage::getConfig()->getNode(self::STORAGE_CONFIG_PATH);
-            $this->_storage = Mage::getModel($config->model);
+            /** @var Mage_Index_Model_Lock_Storage_Interface $model */
+            $model = Mage::getModel($config->model);
+            $this->_storage = $model;
         }
         return $this->_storage;
     }

app/code/core/Mage/Install/Model/Installer/Db.php

@@ -23,7 +23,7 @@
 class Mage_Install_Model_Installer_Db extends Mage_Install_Model_Installer_Abstract
 {
     /**
-     * @var resource database
+     * @var Mage_Install_Model_Installer_Db_Abstract|null database
      */
     protected $_dbResource;
 
@@ -141,10 +141,12 @@ protected function _getCheckedData($data)
      *
      * @param  string $model database type
      * @return Mage_Install_Model_Installer_Db_Abstract
+     * @throws Mage_Core_Exception
      */
     protected function _getDbResource($model)
     {
         if (!isset($this->_dbResource)) {
+            /** @var Mage_Install_Model_Installer_Db_Abstract $resource */
             $resource =  Mage::getSingleton(sprintf('install/installer_db_%s', $model));
             if (!$resource) {
                 Mage::throwException(

app/code/core/Mage/Paypal/Model/Direct.php

@@ -60,10 +60,12 @@ class Mage_Paypal_Model_Direct extends Mage_Payment_Model_Method_Cc
     public function __construct($params = [])
     {
         $proInstance = array_shift($params);
-        if ($proInstance && ($proInstance instanceof Mage_Paypal_Model_Pro)) {
+        if ($proInstance instanceof Mage_Paypal_Model_Pro) {
             $this->_pro = $proInstance;
         } else {
-            $this->_pro = Mage::getModel($this->_proType);
+            /** @var Mage_Paypal_Model_Pro $model */
+            $model = Mage::getModel($this->_proType);
+            $this->_pro = $model;
         }
         $this->_pro->setMethod($this->_code);
     }

app/code/core/Mage/Paypal/Model/Express.php

@@ -71,10 +71,12 @@ class Mage_Paypal_Model_Express extends Mage_Payment_Model_Method_Abstract imple
     public function __construct($params = [])
     {
         $proInstance = array_shift($params);
-        if ($proInstance && ($proInstance instanceof Mage_Paypal_Model_Pro)) {
+        if ($proInstance instanceof Mage_Paypal_Model_Pro) {
             $this->_pro = $proInstance;
         } else {
-            $this->_pro = Mage::getModel($this->_proType);
+            /** @var Mage_Paypal_Model_Pro $model */
+            $model = Mage::getModel($this->_proType);
+            $this->_pro = $model;
         }
         $this->_pro->setMethod($this->_code);
         $this->_setApiProcessableErrors();

app/code/core/Mage/Paypal/Model/Pro.php

@@ -80,7 +80,10 @@ public function setMethod($code, $storeId = null)
             if ($storeId !== null) {
                 $params[] = $storeId;
             }
-            $this->_config = Mage::getModel($this->_configType, $params);
+
+            /** @var Mage_Paypal_Model_Config $model */
+            $model = Mage::getModel($this->_configType, $params);
+            $this->_config = $model;
         } else {
             $this->_config->setMethod($code);
             if ($storeId !== null) {

app/code/core/Mage/Tax/Model/Resource/Class/Collection.php

@@ -32,7 +32,7 @@ public function _construct()
     /**
      * Add class type filter to result
      *
-     * @param int $classTypeId
+     * @param string $classTypeId
      * @return $this
      */
     public function setClassTypeFilter($classTypeId)

app/code/core/Mage/Weee/Helper/Data.php

@@ -239,7 +239,7 @@ public function getProductWeeeAttributes(
     /**
      * Returns applied weee taxes
      *
-     * @param Mage_Sales_Model_Quote_Item_Abstract $item
+     * @param Mage_Sales_Model_Quote_Item_Abstract|Varien_Object $item
      * @return array
      */
     public function getApplied($item)
@@ -608,7 +608,7 @@ public function getBaseTotalTaxAppliedForWeeeTax($item)
     /**
      * Get the Total tax applied for Weee
      *
-     * @param Mage_Core_Model_Abstract $item
+     * @param Mage_Core_Model_Abstract|Varien_Object $item
      * @return float
      */
     public function getTotalRowTaxAppliedForWeeeTax($item)
@@ -625,7 +625,7 @@ public function getTotalRowTaxAppliedForWeeeTax($item)
     /**
      * Get the Total tax applied in base for Weee
      *
-     * @param Mage_Core_Model_Abstract $item
+     * @param Mage_Core_Model_Abstract|Varien_Object $item
      * @return float
      */
     public function getBaseTotalRowTaxAppliedForWeeeTax($item)