phpstan fixes (#4273)

Author: sreichel

.phpstan.dist.baseline.neon

@@ -130,6 +130,6 @@ public function getChooseFromStoreHtml($storeTo)
             }
             $this->_storeFromHtml .= '</select>';
         }
-        return str_replace('__store_identifier__', $storeTo->getId(), $this->_storeFromHtml);
+        return str_replace('__store_identifier__', (string)$storeTo->getId(), $this->_storeFromHtml);
     }
 }

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php

@@ -442,7 +442,7 @@ public function deleteStorePostAction()
      *
      * @param string $failPath redirect path if backup failed
      * @param array $arguments
-     * @return $this
+     * @return $this|void
      */
     protected function _backupDatabase($failPath, $arguments = [])
     {
@@ -468,11 +468,11 @@ protected function _backupDatabase($failPath, $arguments = [])
         } catch (Mage_Core_Exception $e) {
             $this->_getSession()->addError($e->getMessage());
             $this->_redirect($failPath, $arguments);
-            return ;
+            return;
         } catch (Exception $e) {
             $this->_getSession()->addException($e, Mage::helper('backup')->__('Unable to create backup. Please, try again later.'));
             $this->_redirect($failPath, $arguments);
-            return ;
+            return;
         }
         return $this;
     }

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

@@ -621,6 +621,7 @@ protected function _critical($message, $code = null)
             }
             $code = $errors[$message];
         }
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         throw new Mage_Api2_Exception($message, $code);
     }
 
@@ -657,6 +658,7 @@ protected function _getCriticalErrors()
      */
     protected function _error($message, $code)
     {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->getResponse()->setException(new Mage_Api2_Exception($message, $code));
         return $this;
     }
@@ -789,7 +791,7 @@ protected function _multicall($resourceInstanceId)
      *
      * @param string $resourceId Resource identifier
      * @param array $requestParams Parameters to be set to request
-     * @return $this
+     * @return Mage_Api2_Model_Resource
      */
     protected function _getSubModel($resourceId, array $requestParams)
     {

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

@@ -76,7 +76,7 @@ public function registerJsPrice($price)
      * @param float $price
      * @param bool $round
      * @param null|int $storeId
-     * @return float
+     * @return int|float
      */
     public function convertPrice($price, $round = false, $storeId = null)
     {

app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php

@@ -138,6 +138,7 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract
      *
      * @var array
      */
+    // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private $_designAttributes  = [
         'custom_design',
         'custom_design_from',
@@ -629,6 +630,7 @@ public function getDesignAttributes()
      * @param string $attributeCode
      * @return Mage_Eav_Model_Entity_Attribute_Abstract
      */
+    // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private function _getAttribute($attributeCode)
     {
         if (!$this->_useFlatResource) {
@@ -875,7 +877,7 @@ public function getChildrenCategoriesWithInactive()
     /**
      * Return parent category of current category with own custom design settings
      *
-     * @return $this
+     * @return Mage_Catalog_Model_Category
      */
     public function getParentDesignCategory()
     {

app/code/core/Mage/Catalog/Model/Category.php

@@ -660,6 +660,7 @@ public function getStoreIds()
      * @param bool $skipSuper Not used
      * @return array
      */
+    // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassAfterLastUsed
     public function getAttributes($groupId = null, $skipSuper = false)
     {
         /** @var Mage_Catalog_Model_Resource_Eav_Attribute[] $productAttributes */
@@ -1305,7 +1306,7 @@ public function getMediaConfig()
     /**
      * Create duplicate
      *
-     * @return $this
+     * @return Mage_Catalog_Model_Product
      */
     public function duplicate()
     {

app/code/core/Mage/Catalog/Model/Product.php

@@ -417,7 +417,7 @@ public function getSortedChildren()
      *
      * Wrapper for method "setData"
      *
-     * @param   string $name
+     * @param   array|string $name
      * @param   mixed $value
      * @return  $this
      */
@@ -1086,7 +1086,7 @@ public function setMessagesBlock(Mage_Core_Block_Messages $block)
      * Return block helper
      *
      * @param string $type
-     * @return $this
+     * @return Mage_Core_Block_Abstract
      */
     public function getHelper($type)
     {

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

@@ -59,7 +59,8 @@ protected function _toHtml()
         }
         $out .= '</table>';
         $out .= '<pre>';
-        $out .= print_r(Varien_Profiler::getSqlProfiler(Mage::getSingleton('core/resource')->getConnection('core_write')), 1);
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
+        $out .= print_r(Varien_Profiler::getSqlProfiler(Mage::getSingleton('core/resource')->getConnection('core_write')), true);
         $out .= '</pre>';
         $out .= '</div>';
 

app/code/core/Mage/Core/Block/Profiler.php

@@ -31,10 +31,11 @@ protected function _construct()
 
     /**
      * @param mixed $value
-     * @return Mage_Core_Block_Text_Tag_Debug
+     * @return $this
      */
     public function setValue($value)
     {
-        return $this->setContents(print_r($value, 1));
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
+        return $this->setContents(print_r($value, true));
     }
 }