From c56b9d76226766962a8ada52b350fb6843c55af6 Mon Sep 17 00:00:00 2001 From: Oliver Bartsch <bo@cedev.de> Date: Thu, 10 Mar 2022 17:56:21 +0100 Subject: [PATCH] [TASK] Update to PHPStan 1.4.9 This update gets rid of a false positive: https://github.com/phpstan/phpstan-phpunit/issues/120 Resolves: #97163 Releases: main, 11.5 Change-Id: I6f7ecd909a127b5940b928d81c94ab7b3404cd49 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/73896 Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de> Reviewed-by: Oliver Bartsch <bo@cedev.de> Tested-by: core-ci <typo3@b13.com> Tested-by: Oliver Bartsch <bo@cedev.de> --- Build/phpstan/phpstan-baseline.neon | 5 ----- composer.json | 2 +- composer.lock | 16 ++++++++-------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon index 66d539e24d10..8b70f74277c4 100644 --- a/Build/phpstan/phpstan-baseline.neon +++ b/Build/phpstan/phpstan-baseline.neon @@ -2710,11 +2710,6 @@ parameters: count: 1 path: ../../typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php - - - message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNotSame\\(\\) with object and object will always evaluate to false\\.$#" - count: 2 - path: ../../typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php - - message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with string will always evaluate to false\\.$#" count: 1 diff --git a/composer.json b/composer.json index b0be852da770..6fa0d6cdfae9 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,7 @@ "php-webdriver/webdriver": "^1.12.0", "phpspec/prophecy": "^1.14.0", "phpspec/prophecy-phpunit": "^2.0", - "phpstan/phpstan": "^1.4.8", + "phpstan/phpstan": "^1.4.9", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.5.10", "typo3/cms-styleguide": "~11.5.4", diff --git a/composer.lock b/composer.lock index ec1cb29d48fe..ab1bdb9075f6 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": "e7e9c0414caf6cf8ccbfae3557b28b3c", + "content-hash": "0e1b78352513d51d86c975531309caef", "packages": [ { "name": "bacon/bacon-qr-code", @@ -7034,16 +7034,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.4.8", + "version": "1.4.9", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15" + "reference": "1a45f44d319cf000a8c960af6b7435741e944771" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2a6d6704b17c4db6190cc3104056c0aad740cb15", - "reference": "2a6d6704b17c4db6190cc3104056c0aad740cb15", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1a45f44d319cf000a8c960af6b7435741e944771", + "reference": "1a45f44d319cf000a8c960af6b7435741e944771", "shasum": "" }, "require": { @@ -7074,7 +7074,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.4.8" + "source": "https://github.com/phpstan/phpstan/tree/1.4.9" }, "funding": [ { @@ -7094,7 +7094,7 @@ "type": "tidelift" } ], - "time": "2022-03-04T13:03:56+00:00" + "time": "2022-03-10T08:52:08+00:00" }, { "name": "phpstan/phpstan-phpunit", @@ -9101,5 +9101,5 @@ "platform-overrides": { "php": "7.4.1" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" } -- GitLab