diff --git a/composer.lock b/composer.lock index 85cd5a552c4..a98ddce77ef 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 2352a2b5c00..aebf5928543 100644 --- 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