PhpStan: some fixes (#4705)

* - PhpStan: some fixes

* - #4705 (comment)

* updated docs

* updated docs

* updated docs

* phpstan baseline

* updated phpstan

- closes #4727

* some fixes

* identifier: return.type

* identifier: throws.unusedType

* identifier: assign.propertyType

* identifier: variable.undefined

* some updates

* fix

Author: sreichel

.phpstan.dist.baseline.neon

@@ -112,11 +112,6 @@ parameters:
                 - app/design/frontend/base/default/template/catalog/product/view/price.phtml
                 - app/design/frontend/base/default/template/catalog/product/widget/link/link_block.phtml
                 - app/design/frontend/base/default/template/catalog/product/widget/link/link_inline.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/new/column/new_default_list.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/new/column/new_images_list.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/new/column/new_names_list.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/new/content/new_grid.phtml
-                - app/design/frontend/base/default/template/catalog/product/widget/new/content/new_list.phtml
                 - app/design/frontend/base/default/template/checkout/cart/render/default.phtml
                 - app/design/frontend/base/default/template/checkout/cart/render/simple.phtml
                 - app/design/frontend/base/default/template/cms/widget/link/link_block.phtml
@@ -132,28 +127,20 @@ parameters:
                 - app/design/frontend/base/default/template/directory/currency/switch.phtml
                 - app/design/frontend/base/default/template/page/redirect.phtml
                 - app/design/frontend/base/default/template/paypal/hss/review/button.phtml
-                - app/design/frontend/base/default/template/reports/widget/compared/column/compared_default_list.phtml
-                - app/design/frontend/base/default/template/reports/widget/compared/column/compared_images_list.phtml
-                - app/design/frontend/base/default/template/reports/widget/compared/column/compared_names_list.phtml
-                - app/design/frontend/base/default/template/reports/widget/compared/content/compared_grid.phtml
-                - app/design/frontend/base/default/template/reports/widget/compared/content/compared_list.phtml
-                - app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_default_list.phtml
-                - app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_images_list.phtml
-                - app/design/frontend/rwd/default/template/catalog/product/widget/new/column/new_names_list.phtml
-                - app/design/frontend/rwd/default/template/catalog/product/widget/new/content/new_list.phtml
                 - app/design/frontend/rwd/default/template/checkout/cart/render/default.phtml
                 - app/design/frontend/rwd/default/template/checkout/cart/render/simple.phtml
                 - app/design/frontend/rwd/default/template/customer/form/address.phtml
                 - app/design/frontend/rwd/default/template/customer/form/changepassword.phtml
                 - app/design/frontend/rwd/default/template/paypal/express/review/address.phtml
-                - app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_default_list.phtml
-                - app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_images_list.phtml
-                - app/design/frontend/rwd/default/template/reports/widget/compared/column/compared_names_list.phtml
-                - app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_grid.phtml
-                - app/design/frontend/rwd/default/template/reports/widget/compared/content/compared_list.phtml
                 - app/design/install/default/default/template/page.phtml
         -
             identifier: phpunit.coversMethod
+        -
+            identifier: variable.undefined
+            paths:
+                - app/design/*/*/template/*
+                - errors/*
+                - lib/Varien/*
     tmpDir: .phpstan.cache
     level: 5
     checkFunctionNameCase: true

.phpstan.dist.neon

@@ -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/Sales/Order/Create/Billing/Address.php

@@ -25,7 +25,7 @@ class Mage_Adminhtml_Block_Sales_Order_Create_Giftmessage_Form extends Mage_Admi
     /**
      * Entity for editing of gift message
      *
-     * @var Mage_Eav_Model_Entity_Abstract
+     * @var Varien_Object
      */
     protected $_entity;
 

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

@@ -75,7 +75,7 @@ public function getWebsiteId()
     /**
      * Set current website
      *
-     * @param int $name
+     * @param string $name
      * @return $this
      */
     public function setConditionName($name)

app/code/core/Mage/Adminhtml/Block/Shipping/Carrier/Tablerate/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/Block/Widget/Grid.php

@@ -83,8 +83,8 @@ public function displayPrices($dataObject, $basePrice, $price, $strong = false,
     /**
      * Filter collection by removing not available product types
      *
-     * @param Mage_Core_Model_Resource_Db_Collection_Abstract $collection
-     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
+     * @param Mage_Catalog_Model_Resource_Product_Collection $collection
+     * @return Mage_Catalog_Model_Resource_Product_Collection
      */
     public function applySalableProductTypesFilter($collection)
     {

app/code/core/Mage/Adminhtml/Helper/Sales.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/Adminhtml/controllers/Customer/Wishlist/Product/Composite/WishlistController.php

@@ -32,7 +32,7 @@ class Mage_Api_Model_Server_Adapter_Soap extends Varien_Object implements Mage_A
     /**
      * Soap server
      *
-     * @var SoapServer
+     * @var Zend_Soap_Server
      */
     protected $_soap = null;
 

app/code/core/Mage/Api/Model/Server/Adapter/Soap.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;
     }