PHPStan fixes

.php-cs-fixer.dist.php

@@ -1,9 +1,7 @@
 <?php
-/*
-* This document has been generated with
-* https://mlocati.github.io/php-cs-fixer-configurator/#version:3.4.0|configurator
-* you can change this configuration by importing this file.
-*/
+
+declare(strict_types=1);
+
 $config = new PhpCsFixer\Config();
 return $config
     ->setRiskyAllowed(true)
@@ -35,5 +33,5 @@
             ])
             ->name('*.php')
             ->ignoreDotFiles(true)
-            ->ignoreVCS(true)
+            ->ignoreVCS(true),
     );

.phpstan.dist.baseline.neon

@@ -210,12 +210,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics/Grid.php
 
-		-
-			message: '#^Parameter \#2 \$filter of method Mage_Reports_Model_Resource_Quote_Collection\:\:prepareForAbandonedReport\(\) expects string\|null, array\<int\|string, array\<mixed\>\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Adminhtml/Block/Report/Shopcart/Abandoned/Grid.php
-
 		-
 			message: '#^Parameter \#1 \$statusCode of method Mage_Tag_Model_Resource_Popular_Collection\:\:addStatusFilter\(\) expects string, int given\.$#'
 			identifier: argument.type
@@ -1254,12 +1248,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Api2/Model/Route/ApiType.php
 
-		-
-			message: '#^Method Mage_Api2_Model_Server\:\:_setAuthUser\(\) has Exception in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: app/code/core/Mage/Api2/Model/Server.php
-
 		-
 			message: '#^Call to an undefined method Varien_Object\:\:encrypt\(\)\.$#'
 			identifier: method.notFound
@@ -1626,12 +1614,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Catalog/Helper/Product/Compare.php
 
-		-
-			message: '#^Parameter \#3 \$subject of function str_replace expects array\<string\>\|string, float given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Catalog/Helper/Product/Type/Composite.php
-
 		-
 			message: '#^Call to an undefined method Mage_Core_Model_Resource_Db_Collection_Abstract\:\:setStoreId\(\)\.$#'
 			identifier: method.notFound
@@ -2670,6 +2652,18 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Centinel/Helper/Data.php
 
+		-
+			message: '#^Method Mage_Centinel_Model_Api\:\:callLookup\(\) should return \$this\(Mage_Centinel_Model_Api\) but returns Varien_Object\.$#'
+			identifier: return.type
+			count: 1
+			path: app/code/core/Mage/Centinel/Model/Api.php
+
+		-
+			message: '#^Property Mage_Centinel_Model_Api\:\:\$_clientInstance \(Mage_Centinel_Model_Api_Client\) in empty\(\) is not falsy\.$#'
+			identifier: empty.property
+			count: 1
+			path: app/code/core/Mage/Centinel/Model/Api.php
+
 		-
 			message: '#^Cannot call method setItem\(\) on array\.$#'
 			identifier: method.nonObject
@@ -3252,6 +3246,18 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Locale.php
 
+		-
+			message: '#^Method Mage_Core_Model_Mysql4_Design_Theme_Collection\:\:setData\(\) invoked with 2 parameters, 1 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+
+		-
+			message: '#^Parameter \#1 \$value of method Mage_Core_Model_Mysql4_Design_Theme_Collection\:\:setData\(\) expects array, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
+
 		-
 			message: '#^Call to an undefined method Mage_Core_Model_Resource_Type_Abstract\:\:getConnection\(\)\.$#'
 			identifier: method.notFound
@@ -4422,12 +4428,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/GiftMessage/controllers/IndexController.php
 
-		-
-			message: '#^Method Mage_GoogleAnalytics_Block_Ga\:\:_getOrdersTrackingCode\(\) has Mage_Core_Model_Store_Exception in PHPDoc @throws tag but it''s not thrown\.$#'
-			identifier: throws.unusedType
-			count: 1
-			path: app/code/core/Mage/GoogleAnalytics/Block/Ga.php
-
 		-
 			message: '#^Return type \(void\) of method Mage_GoogleCheckout_Model_Payment\:\:authorize\(\) should be compatible with return type \(\$this\(Mage_Payment_Model_Method_Abstract\)\) of method Mage_Payment_Model_Method_Abstract\:\:authorize\(\)$#'
 			identifier: method.childReturnType
@@ -5004,6 +5004,12 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Paypal/Model/Pro.php
 
+		-
+			message: '#^Variable \$line in empty\(\) always exists and is not falsy\.$#'
+			identifier: empty.variable
+			count: 1
+			path: app/code/core/Mage/Paypal/Model/Report/Settlement.php
+
 		-
 			message: '#^Method Varien_Data_Collection\:\:toOptionArray\(\) invoked with 1 parameter, 0 required\.$#'
 			identifier: arguments.count
@@ -5190,18 +5196,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Reports/Model/Resource/Product/Sold/Collection.php
 
-		-
-			message: '#^Parameter \#1 \$filter of method Mage_Reports_Model_Resource_Quote_Collection\:\:addCustomerData\(\) expects array\|null, string\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php
-
-		-
-			message: '#^Parameter \#2 \$filter of method Mage_Reports_Model_Resource_Quote_Collection\:\:addSubtotal\(\) expects array\|null, string\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Reports/Model/Resource/Quote/Collection.php
-
 		-
 			message: '#^Parameter \#3 \$cols of method Zend_Db_Select\:\:joinInner\(\) expects array\|string, null given\.$#'
 			identifier: argument.type
@@ -5682,12 +5676,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Sales/Model/Quote.php
 
-		-
-			message: '#^Parameter \#2 \$array of function implode expects array\<string\>, list\<array\|string\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Quote.php
-
 		-
 			message: '#^Property Mage_Sales_Model_Quote\:\:\$_addresses \(Mage_Sales_Model_Resource_Order_Address_Collection\|null\) does not accept Mage_Sales_Model_Resource_Quote_Address_Collection\.$#'
 			identifier: assign.propertyType
@@ -5784,18 +5772,6 @@ parameters:
 			count: 3
 			path: app/code/core/Mage/Sales/Model/Recurring/Profile.php
 
-		-
-			message: '#^Parameter \#2 \$attribute of method Mage_Sales_Model_Resource_Order_Abstract\:\:_afterSaveAttribute\(\) expects string, array\<mixed, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
-
-		-
-			message: '#^Parameter \#2 \$attribute of method Mage_Sales_Model_Resource_Order_Abstract\:\:_beforeSaveAttribute\(\) expects string, array\<mixed, mixed\> given\.$#'
-			identifier: argument.type
-			count: 1
-			path: app/code/core/Mage/Sales/Model/Resource/Order/Abstract.php
-
 		-
 			message: '#^Cannot call method updateOnRelatedRecordChanged\(\) on Mage_Core_Model_Resource_Db_Collection_Abstract\|false\.$#'
 			identifier: method.nonObject
@@ -8364,6 +8340,30 @@ parameters:
 			count: 1
 			path: lib/Varien/Db/Statement/Pdo/Mysql.php
 
+		-
+			message: '#^Binary operation "\.\=" between array and non\-falsy\-string results in an error\.$#'
+			identifier: assignOp.invalid
+			count: 1
+			path: lib/Varien/File/Object.php
+
+		-
+			message: '#^Method Varien_Directory_Collection\:\:lastDir\(\) invoked with 1 parameter, 0 required\.$#'
+			identifier: arguments.count
+			count: 1
+			path: lib/Varien/File/Object.php
+
+		-
+			message: '#^Parameter &\$files by\-ref type of method Varien_File_Object\:\:getFilesName\(\) expects array, array\|null given\.$#'
+			identifier: parameterByRef.type
+			count: 1
+			path: lib/Varien/File/Object.php
+
+		-
+			message: '#^Static call to instance method Varien_Directory_Collection\:\:lastDir\(\)\.$#'
+			identifier: method.staticCall
+			count: 1
+			path: lib/Varien/File/Object.php
+
 		-
 			message: '#^Right side of && is always false\.$#'
 			identifier: booleanAnd.rightAlwaysFalse

.phpstan.dist.neon

@@ -17,59 +17,32 @@ parameters:
         - index.php
         - install.php
         - app/Mage.php
-        - app/code/core/Mage
+        - app/code/core/
         - app/design/
-        - errors
-        - lib/Mage
-        - lib/Magento
-        - lib/Varien
-        - shell
-        - tests/unit
+        - errors/
+        - lib/
+        - shell/
+        - tests/unit/
     excludePaths:
-        #incompatible interfaces
-        - app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php
-        - app/code/core/Mage/Admin/Model/Acl/Assert/Time.php
-        - app/code/core/Mage/Api/Model/Acl/Assert/Ip.php
-        - app/code/core/Mage/Api/Model/Acl/Assert/Time.php
-        - app/code/core/Mage/Core/Model/Mysql4/Design/Theme/Collection.php
-        - lib/Varien/Directory/Collection.php
-        - lib/Varien/Directory/Factory.php
-        - lib/Varien/File/Object.php
-
-        # deprecated _getHelper()
-        - app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php
-        - app/code/core/Mage/Adminhtml/controllers/Rss/OrderController.php
-        - app/code/core/Mage/Adminhtml/controllers/Rss/CatalogController.php
-
-        # contains 1 abstract method and must therefore be declared abstract or implement the remaining methods
-        - app/code/core/Mage/Dataflow/Model/Session/Adapter/Http.php
-        - app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php
-        - app/code/core/Mage/Dataflow/Model/Convert/Iterator/File/Csv.php
-        - lib/Varien/Convert/Validator/Column.php
-
-        # Cannot declare class Varien_Date, because the name is already in use
-        - app/code/core/Mage/Catalog/Model/Product/Option/Type/Date.php
+        # custom commands
+        - lib/_n98-magerun/ (?)
 
-        # Cannot declare class XMLParser, because the name is already in use
-        - app/code/core/Mage/Centinel/Model/Api.php
-        - app/code/core/Mage/Centinel/Model/Api/Client.php
-
-        # Class phpseclib\Net\SSH2 not found.
-        - app/code/core/Mage/Paypal/Model/Report/Settlement.php
-        - lib/Varien/Io/Sftp.php
+        # libraries
+        - lib/3Dsecure/
+        - lib/Unserialize/
 
-        # Dataflow/Model/Convert/Iterator.php
-        - app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
+        # others
+        - lib/Varien/Directory/Collection.php
 
         # Too much noise from "Variable $this might not be defined"
         - app/code/core/*/*/data/*
         - app/code/core/*/*/sql/*
 
-        # requires Mycrypt
-        - lib/Magento/Crypt.php
-        - lib/Varien/Crypt/Mcrypt.php
+        # Class Mage_Centinel_Model_Api_Client extends unknown class CentinelClient.
+        - app/code/core/Mage/Centinel/Model/Api/Client.php
 
-        # Instantiated class not found
+        # Instantiated class Varien_Image_Adapter_Gd not found.
+        # Instantiated class Varien_Image_Adapter_Imagemagic not found.
         - lib/Varien/Image/Adapter.php
     ignoreErrors:
         -

app/code/core/Mage/Adminhtml/Controller/Rss/Abstract.php

@@ -52,16 +52,4 @@ protected function checkFeedEnable($code)
             return false;
         }
     }
-
-    /**
-     * Retrieve helper instance
-     *
-     * @param string $name
-     * @return Mage_Core_Helper_Abstract
-     * @deprecated this method is incompatible with parent class. Use Mage::helper instead
-     */
-    protected function _getHelper($name)
-    {
-        return Mage::helper($name);
-    }
 }