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/composer.lock b/composer.lock index eceb2dcd253..fbcf00a91db 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", 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;