From 7a6d1ecbdecc4bf6d69e1c4c59e997e5b78717cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Wed, 5 Apr 2023 04:41:53 +0200
Subject: [PATCH] [TASK] Raise 'phpstan/phpstan' and regenerate baseline file
PHPStan recenently released a new patchlevel version,
fixing the one or other bug and changing the reported
issue message texts.
This change raises the phpstan dependency along with
one extending package. The baseline file was regenerated to
update to new message texts of some reported messages
to mitigate issue flipping between composer locked and
composer max testing.
Used command(s):
> composer require --dev \
"phpstan/phpstan":"^1.10.11" \
"phpstan/phpstan-phpunit":"^1.3.11"
> ./Build/Scripts/runTests.sh -s phpstanGenerateBaseline
Resolves: #100452
Releases: main, 11.5
Change-Id: I307089d4b655e92eff2561c4e6d92cf79c20ea82
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78467
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
---
Build/phpstan/phpstan-baseline.neon | 6 +++---
composer.json | 4 ++--
composer.lock | 29 ++++++++++++++++-------------
3 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 76375907c52c..370993b29b32 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -126,7 +126,7 @@ parameters:
path: ../../typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
-
- message: "#^Strict comparison using \\=\\=\\= between non\\-empty\\-array\\<int, array\\{label\\: string, attributes\\: non\\-empty\\-array\\<'class'\\|'disabled'\\|'title'\\|'value', mixed\\>\\}\\> and array\\{\\} will always evaluate to false\\.$#"
+ message: "#^Strict comparison using \\=\\=\\= between non\\-empty\\-array\\<int\\<0, max\\>, array\\{label\\: string, attributes\\: non\\-empty\\-array\\<'class'\\|'disabled'\\|'title'\\|'value', mixed\\>\\}\\> and array\\{\\} will always evaluate to false\\.$#"
count: 1
path: ../../typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
@@ -156,7 +156,7 @@ parameters:
path: ../../typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
-
- message: "#^Parameter \\#2 \\$array of function implode expects array\\<string\\>, array\\<int, array\\|string\\> given\\.$#"
+ message: "#^Parameter \\#2 \\$array of function implode expects array\\<string\\>, array\\<int\\<0, max\\>, array\\|string\\> given\\.$#"
count: 1
path: ../../typo3/sysext/backend/Classes/Form/InlineStackProcessor.php
@@ -576,7 +576,7 @@ parameters:
path: ../../typo3/sysext/core/Classes/Authentication/Mfa/Provider/TotpProvider.php
-
- message: "#^Parameter \\#1 \\$key1 of method Redis\\:\\:sUnion\\(\\) expects string, array\\<int, string\\> given\\.$#"
+ message: "#^Parameter \\#1 \\$key1 of method Redis\\:\\:sUnion\\(\\) expects string, array\\<int\\<0, max\\>, string\\> given\\.$#"
count: 1
path: ../../typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
diff --git a/composer.json b/composer.json
index 8cf304021686..cfc36d6caebb 100644
--- a/composer.json
+++ b/composer.json
@@ -119,8 +119,8 @@
"php-webdriver/webdriver": "^1.12.0",
"phpspec/prophecy": "^1.15.0",
"phpspec/prophecy-phpunit": "^2.0.1",
- "phpstan/phpstan": "^1.10.6",
- "phpstan/phpstan-phpunit": "^1.3.10",
+ "phpstan/phpstan": "^1.10.11",
+ "phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.6.1",
"typo3/cms-styleguide": "~11.5.4",
"typo3/testing-framework": "^6.16.7",
diff --git a/composer.lock b/composer.lock
index 78ae8bfbcf08..4c93779aac87 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": "ef43e0e7475ac92c0859c3fe6629427b",
+ "content-hash": "f381788b2a8af010dcedb09da8bf0bcd",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -7170,16 +7170,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.6",
+ "version": "1.10.11",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a"
+ "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
- "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
+ "reference": "8aa62e6ea8b58ffb650e02940e55a788cbc3fe21",
"shasum": ""
},
"require": {
@@ -7208,8 +7208,11 @@
"static analysis"
],
"support": {
+ "docs": "https://phpstan.org/user-guide/getting-started",
+ "forum": "https://github.com/phpstan/phpstan/discussions",
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.10.6"
+ "security": "https://github.com/phpstan/phpstan/security/policy",
+ "source": "https://github.com/phpstan/phpstan-src"
},
"funding": [
{
@@ -7225,20 +7228,20 @@
"type": "tidelift"
}
],
- "time": "2023-03-09T16:55:12+00:00"
+ "time": "2023-04-04T19:17:42+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.10",
+ "version": "1.3.11",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "4cc5c6cc38e56bce7ea47c4091814e516d172dc3"
+ "reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/4cc5c6cc38e56bce7ea47c4091814e516d172dc3",
- "reference": "4cc5c6cc38e56bce7ea47c4091814e516d172dc3",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
+ "reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
"shasum": ""
},
"require": {
@@ -7275,9 +7278,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
- "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.10"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.11"
},
- "time": "2023-03-02T10:25:13+00:00"
+ "time": "2023-03-25T19:42:13+00:00"
},
{
"name": "phpunit/php-code-coverage",
--
GitLab