From 94d442cd647beb6f8940ecda7215a86574088447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 01:56:16 +0000
Subject: [PATCH 1/2] Bump phpstan/phpstan from 1.12.2 to 1.12.3

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

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8d87065a11d..ef0d6d0dc70 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3486,16 +3486,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.2",
+            "version": "1.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1"
+                "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
-                "reference": "0ca1c7bb55fca8fe6448f16fff0f311ccec960a1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009",
+                "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009",
                 "shasum": ""
             },
             "require": {
@@ -3540,7 +3540,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-05T16:09:28+00:00"
+            "time": "2024-09-09T08:10:35+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

From ff866ceae5a7429f130abb5609402f28f4041a5d Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 18 Sep 2024 05:19:43 +0200
Subject: [PATCH 2/2] Update for phpstan 1.12.3 (#4206)

* phpstan fix

* updated composer.lock
---
 .phpstan.dist.baseline.neon   | 5 -----
 .phpstan.dist.neon            | 4 ----
 lib/Mage/HTTP/Client/Curl.php | 2 +-
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
index 18291848aca..8e50e08bf4f 100644
--- a/.phpstan.dist.baseline.neon
+++ b/.phpstan.dist.baseline.neon
@@ -4860,11 +4860,6 @@ parameters:
 			count: 1
 			path: lib/Mage/DB/Mysqli.php
 
-		-
-			message: "#^Property Mage_HTTP_Client_Curl\\:\\:\\$_ch \\(object\\) does not accept resource\\.$#"
-			count: 1
-			path: lib/Mage/HTTP/Client/Curl.php
-
 		-
 			message: "#^Property Mage_HTTP_Client_Socket\\:\\:\\$_postFields is never read, only written\\.$#"
 			count: 1
diff --git a/.phpstan.dist.neon b/.phpstan.dist.neon
index 77ead18bbde..d56b4f77325 100644
--- a/.phpstan.dist.neon
+++ b/.phpstan.dist.neon
@@ -69,9 +69,5 @@ parameters:
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true
     treatPhpDocTypesAsCertain: false
-    # For v1.12+ with "bleeding edge"
-    ignoreErrors:
-        -
-            identifier: missingType.iterableValue
 #    universalObjectCratesClasses:
 #        - Varien_Object
diff --git a/lib/Mage/HTTP/Client/Curl.php b/lib/Mage/HTTP/Client/Curl.php
index 6ec2afba3ea..4fab8a3ac51 100644
--- a/lib/Mage/HTTP/Client/Curl.php
+++ b/lib/Mage/HTTP/Client/Curl.php
@@ -89,7 +89,7 @@ class Mage_HTTP_Client_Curl implements Mage_HTTP_IClient
 
     /**
      * Curl
-     * @var object
+     * @var false|resource
      */
     protected $_ch;