Merge branch 'main' into unit-tests

OpenMage · Sep 3, 2024 · 0f0626b · 0f0626b
2 parents cda06c7 + b9e1be5
commit 0f0626b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -3490,11 +3490,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Payment/Model/Method/Abstract.php
 
-		-
-			message: "#^Loose comparison using \\!\\= between ''\\|'OT' and 'SS' will always evaluate to true\\.$#"
-			count: 1
-			path: app/code/core/Mage/Payment/Model/Method/Cc.php
-
 		-
 			message: "#^Method Mage_Payment_Model_Recurring_Profile\\:\\:exportStartDatetime\\(\\) should return string\\|Zend_Date but empty return statement found\\.$#"
 			count: 1

diff --git a/phpstan.dist.neon b/phpstan.dist.neon
@@ -51,9 +51,6 @@ parameters:
         - app/code/core/Mage/Paypal/Model/Report/Settlement.php
         - lib/Varien/Io/Sftp.php
 
-        # Class backup/db was not found while trying to analyse it
-        - app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
-
         # Dataflow/Model/Convert/Iterator.php
         - app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
 
@@ -71,6 +68,9 @@ parameters:
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true
     treatPhpDocTypesAsCertain: false
-
+    # For v1.12+ with "bleeding edge"
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue
 #    universalObjectCratesClasses:
 #        - Varien_Object