From b9e1be5f25ea8be669f46fd93d76bb8b6c9c6cdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 16:38:05 +0800
Subject: [PATCH] Bump phpstan/phpstan from 1.11.7 to 1.12.0 (#4177)

* Bump phpstan/phpstan from 1.11.7 to 1.12.0

Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.11.7 to 1.12.0.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.12.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.11.7...1.12.0)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Phpstan: update for v1.12 (#4179)

* patch 1.11

* patch 1.12

* patch 1.12 - ignore errors

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sven Reichel <github-sr@hotmail.com>
---
 composer.lock              | 10 +++++-----
 phpstan.dist.baseline.neon |  5 -----
 phpstan.dist.neon          |  8 ++++----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/composer.lock b/composer.lock
index 4be079586ce..7416609aac5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3486,16 +3486,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.7",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d"
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/52d2bbfdcae7f895915629e4694e9497d0f8e28d",
-                "reference": "52d2bbfdcae7f895915629e4694e9497d0f8e28d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1",
                 "shasum": ""
             },
             "require": {
@@ -3540,7 +3540,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-06T11:17:41+00:00"
+            "time": "2024-08-27T09:18:05+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
index aff5acc1f79..b417687de7d 100644
--- 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
index d82c837f678..c95f0f64594 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -50,9 +50,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
 
@@ -70,6 +67,9 @@ parameters:
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true
     treatPhpDocTypesAsCertain: false
-
+    # For v1.12+ with "bleeding edge"
+    ignoreErrors:
+        -
+            identifier: missingType.iterableValue
 #    universalObjectCratesClasses:
 #        - Varien_Object