PhpStan: some fixes (OpenMage#4363)

* phpstan

* No new/modified lines in baseline

* add "methods"

---------

Co-authored-by: Ng Kiat Siong <[email protected]>

Author: sreichel

.phpstan.dist.baseline.neon

@@ -75,7 +75,10 @@ public function getValidateButton()
             $optionsVarName = $this->getJsVariablePrefix() . 'VatParameters';
             $beforeHtml = '<script type="text/javascript">var ' . $optionsVarName . ' = ' . $vatValidateOptions
                 . ';</script>';
-            $this->_validateButton = $this->getLayout()->createBlock('adminhtml/widget_button')->setData([
+
+            /** @var Mage_Adminhtml_Block_Widget_Button $block */
+            $block = $this->getLayout()->createBlock('adminhtml/widget_button');
+            $this->_validateButton = $block->setData([
                 'label'       => Mage::helper('customer')->__('Validate VAT Number'),
                 'before_html' => $beforeHtml,
                 'onclick'     => 'order.validateVat(' . $optionsVarName . ')'

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

@@ -112,7 +112,7 @@ public function getAddressId()
     /**
      * Return 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/Shipping/Address.php

@@ -183,7 +183,7 @@ protected function _getExtraJs($element, $tooltipsExist = false)
      * Collapsed or expanded fieldset when page loaded?
      *
      * @param Varien_Data_Form_Element_Abstract $element
-     * @return int|bool
+     * @return int|false
      */
     protected function _getCollapseState($element)
     {

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

@@ -46,7 +46,7 @@ class Mage_Adminhtml_Block_Widget_Grid extends Mage_Adminhtml_Block_Widget
     /**
      * Collection object
      *
-     * @var Mage_Core_Model_Resource_Db_Collection_Abstract|Varien_Data_Collection_Db|null
+     * @var Varien_Data_Collection_Db|null
      */
     protected $_collection = null;
 

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

@@ -67,6 +67,7 @@ public function authorize(Varien_Object $payment, $amount)
     /**
      * Send capture request to gateway
      *
+     * @param Mage_Sales_Model_Order_Payment $payment
      * @param float $amount
      * @return $this
      * @throws Mage_Core_Exception
@@ -221,6 +222,7 @@ public function refund(Varien_Object $payment, $amount)
     /**
      * refund the amount with transaction id
      *
+     * @param Mage_Sales_Model_Order_Payment $payment
      * @param string $amount
      * @return $this
      * @throws Mage_Core_Exception
@@ -324,7 +326,7 @@ public function initialize($paymentAction, $stateObject)
         switch ($paymentAction) {
             case self::ACTION_AUTHORIZE:
             case self::ACTION_AUTHORIZE_CAPTURE:
-                /** @var Mage_Authorizenet_Model_Directpost $payment */
+                /** @var Mage_Sales_Model_Order_Payment|Mage_Sales_Model_Quote_Payment $payment */
                 $payment = $this->getInfoInstance();
                 $order = $payment->getOrder();
                 $order->setCanSendNewEmailFlag(false);
@@ -639,7 +641,7 @@ protected function _captureOrder(Mage_Sales_Model_Order $order)
     /**
      * Return additional information`s transaction_id value of parent transaction model
      *
-     * @param Mage_Sales_Model_Order_Payment $payment
+     * @param Mage_Sales_Model_Order_Payment|Varien_Object $payment
      * @return string
      */
     protected function _getRealParentTransactionId($payment)

app/code/core/Mage/Authorizenet/Model/Directpost.php

@@ -163,7 +163,7 @@ public function setDataFromOrder(Mage_Sales_Model_Order $order, Mage_Authorizene
      */
     public function signRequestData()
     {
-        $fpTimestamp = time();
+        $fpTimestamp = (string) time();
         $signatureKey = $this->_getSignatureKey();
         if (!empty($signatureKey)) {
             $hash = $this->_generateSha2RequestSign(

app/code/core/Mage/Authorizenet/Model/Directpost/Request.php

@@ -230,7 +230,7 @@ public function getOrderItem()
     /**
      * Retrieve Value HTML
      *
-     * @param Mage_Sales_Model_Order_Item $item
+     * @param Mage_Sales_Model_Order_Invoice_Item $item
      * @return string
      */
     public function getValueHtml($item)
@@ -254,13 +254,13 @@ public function getValueHtml($item)
     /**
      * Can show price info for item
      *
-     * @param Mage_Sales_Model_Order_Item $item
+     * @param Mage_Sales_Model_Order_Invoice_Item $item
      * @return bool
      */
     public function canShowPriceInfo($item)
     {
         if (($item->getOrderItem()->getParentItem() && $this->isChildCalculated())
-                || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())
+            || (!$item->getOrderItem()->getParentItem() && !$this->isChildCalculated())
         ) {
             return true;
         }

app/code/core/Mage/Bundle/Model/Sales/Order/Pdf/Items/Abstract.php

@@ -32,7 +32,7 @@ class Mage_Catalog_Block_Navigation extends Mage_Core_Block_Template
     /**
      * Current category key
      *
-     * @var string
+     * @var int|string
      */
     protected $_currentCategoryKey;
 
@@ -94,7 +94,7 @@ public function getCacheKeyInfo()
     /**
      * Get current category key
      *
-     * @return mixed
+     * @return int|string
      */
     public function getCurrenCategoryKey()
     {

app/code/core/Mage/Catalog/Block/Navigation.php

@@ -167,7 +167,7 @@ public function getAddToCompareUrl($product)
      * Gets minimal sales quantity
      *
      * @param Mage_Catalog_Model_Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {
@@ -317,7 +317,9 @@ protected function _initReviewsHelperBlock()
                 return false;
             }
 
-            $this->_reviewsHelperBlock = $this->getLayout()->createBlock('review/helper');
+            /** @var Mage_Review_Block_Helper $block */
+            $block = $this->getLayout()->createBlock('review/helper');
+            $this->_reviewsHelperBlock = $block;
         }
 
         return true;