diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon index cde80013fea..f1663f0ea35 100644 --- a/.phpstan.dist.baseline.neon +++ b/.phpstan.dist.baseline.neon @@ -4950,6 +4950,12 @@ 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\.$#' + identifier: notEqual.alwaysTrue + 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\.$#' identifier: return.empty @@ -5148,6 +5154,12 @@ parameters: count: 1 path: app/code/core/Mage/Paypal/Model/Payflowlink.php + - + message: '#^Loose comparison using \!\= between float and \(float\|false\) will always evaluate to false\.$#' + identifier: notEqual.alwaysFalse + count: 1 + path: app/code/core/Mage/Paypal/Model/Payflowpro.php + - message: '#^Parameter \#1 \$payment of method Mage_Paypal_Model_Payflowpro\:\:_buildBasicRequest\(\) expects Mage_Sales_Model_Order_Payment, Mage_Payment_Model_Info given\.$#' identifier: argument.type diff --git a/composer.json b/composer.json index 33253e5a743..cb784a9d0c8 100644 --- a/composer.json +++ b/composer.json @@ -49,16 +49,16 @@ "ext-xmlreader": "*", "composer/composer": "^2.7", "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0", - "friendsofphp/php-cs-fixer": "^3.4", - "macopedia/phpstan-magento1": "^1.0.5", + "friendsofphp/php-cs-fixer": "^3.6", + "macopedia/phpstan-magento1": "^1.1", "magento-ecg/coding-standard": "^4.5", "openmage/dev-meta-package": "^1.0.5", "perftools/php-profiler": "^1.1", "phpcompatibility/php-compatibility": "^9.3", "phpmd/phpmd": "^2.13", - "phpstan/phpstan": "^2.0.4", - "phpunit/phpunit": "^9.5", - "rector/rector": "^2.0", + "phpstan/phpstan": "^2.1", + "phpunit/phpunit": "^9.6", + "rector/rector": "^2.0.5", "squizlabs/php_codesniffer": "^3.7", "symplify/vendor-patches": "^11.1" }, diff --git a/composer.lock b/composer.lock index f961a50423d..c7fd66306d3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5da1c89ce6454593b0b955d80babbc0e", + "content-hash": "8ab5b0a7d21ed992d661f401b45576d2", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -4485,16 +4485,16 @@ }, { "name": "phpstan/phpstan", - "version": "2.0.4", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "50d276fc3bf1430ec315f2f109bbde2769821524" + "reference": "2392d360fdf54ea253aa6c68cad1d4ba2e54e927" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d276fc3bf1430ec315f2f109bbde2769821524", - "reference": "50d276fc3bf1430ec315f2f109bbde2769821524", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2392d360fdf54ea253aa6c68cad1d4ba2e54e927", + "reference": "2392d360fdf54ea253aa6c68cad1d4ba2e54e927", "shasum": "" }, "require": { @@ -4539,7 +4539,7 @@ "type": "github" } ], - "time": "2024-12-17T17:14:01+00:00" + "time": "2024-12-31T07:30:03+00:00" }, { "name": "phpunit/php-code-coverage", @@ -5595,21 +5595,21 @@ }, { "name": "rector/rector", - "version": "2.0.3", + "version": "2.0.5", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "3f27091368bd935dbbaa8387099792fb20f65f68" + "reference": "f3354fbbdbeb090a53f5260fa5841d373540a831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/3f27091368bd935dbbaa8387099792fb20f65f68", - "reference": "3f27091368bd935dbbaa8387099792fb20f65f68", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/f3354fbbdbeb090a53f5260fa5841d373540a831", + "reference": "f3354fbbdbeb090a53f5260fa5841d373540a831", "shasum": "" }, "require": { "php": "^7.4|^8.0", - "phpstan/phpstan": "^2.0.1" + "phpstan/phpstan": "^2.1.0" }, "conflict": { "rector/rector-doctrine": "*", @@ -5642,7 +5642,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.0.3" + "source": "https://github.com/rectorphp/rector/tree/2.0.5" }, "funding": [ { @@ -5650,7 +5650,7 @@ "type": "github" } ], - "time": "2024-12-12T15:22:19+00:00" + "time": "2024-12-31T13:11:55+00:00" }, { "name": "sebastian/cli-parser", @@ -7489,7 +7489,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": {