From f4e11f0e852a87e46af4ab8af0c46594ffbb2965 Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Sat, 24 Feb 2024 11:15:28 +0100
Subject: [PATCH] [TASK] Update PHPStan & friends
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The new version changes the format of a warning.
Executed commands:
composer require --dev \
phpstan/phpstan:^1.10.59 \
phpstan/phpdoc-parser:^1.26.0 \
phpstan/phpstan-phpunit:^1.2.16
./Build/Scripts/runTests.sh -s phpstanGenerateBaseline
Resolves: #103193
Releases: main, 12.4
Change-Id: I36a6b4f98e03b73dbf076d84ce1ea900c26fcfb2
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83121
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
Build/phpstan/phpstan-baseline.neon | 2 +-
composer.json | 6 ++---
composer.lock | 36 ++++++++++++++---------------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index b332e03d2b5d..2a01820aa334 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -2956,7 +2956,7 @@ parameters:
path: ../../typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
-
- message: "#^Offset 1 does not exist on array\\<0, TYPO3\\\\CMS\\\\Redirects\\\\Event\\\\BeforeRedirectMatchDomainEvent\\>\\.$#"
+ message: "#^Offset 1 does not exist on non\\-empty\\-array\\<0, TYPO3\\\\CMS\\\\Redirects\\\\Event\\\\BeforeRedirectMatchDomainEvent\\>\\.$#"
count: 1
path: ../../typo3/sysext/redirects/Tests/Functional/Service/RedirectServiceTest.php
diff --git a/composer.json b/composer.json
index 8c22b76b17b0..9d47d4a7cffb 100644
--- a/composer.json
+++ b/composer.json
@@ -112,9 +112,9 @@
"friendsofphp/php-cs-fixer": "^3.46",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"php-webdriver/webdriver": "^1.14.0",
- "phpstan/phpdoc-parser": "^1.25.0",
- "phpstan/phpstan": "^1.10.58",
- "phpstan/phpstan-phpunit": "^1.3.15",
+ "phpstan/phpdoc-parser": "^1.26.0",
+ "phpstan/phpstan": "^1.10.59",
+ "phpstan/phpstan-phpunit": "^1.2.16",
"phpunit/phpunit": "^10.5.5",
"sokil/php-isocodes-db-i18n": "^4.0.19",
"symfony/translation": "^6.4 || ^7.0",
diff --git a/composer.lock b/composer.lock
index 26ea885a978f..3dab60228527 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": "d6188eae7f9f432c7834ac70477bef63",
+ "content-hash": "7bbe8999680e30af6a2ecd1cc326e6b9",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -1596,16 +1596,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.25.0",
+ "version": "1.26.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240"
+ "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240",
- "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
+ "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
"shasum": ""
},
"require": {
@@ -1637,9 +1637,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
},
- "time": "2024-01-04T17:06:16+00:00"
+ "time": "2024-02-23T16:05:55+00:00"
},
{
"name": "psr/cache",
@@ -6699,16 +6699,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.58",
+ "version": "1.10.59",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2"
+ "reference": "e607609388d3a6d418a50a49f7940e8086798281"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2",
- "reference": "a23518379ec4defd9e47cbf81019526861623ec2",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
+ "reference": "e607609388d3a6d418a50a49f7940e8086798281",
"shasum": ""
},
"require": {
@@ -6757,20 +6757,20 @@
"type": "tidelift"
}
],
- "time": "2024-02-12T20:02:57+00:00"
+ "time": "2024-02-20T13:59:13+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
- "version": "1.3.15",
+ "version": "1.3.16",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a"
+ "reference": "d5242a59d035e46774f2e634b374bc39ff62cb95"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
- "reference": "70ecacc64fe8090d8d2a33db5a51fe8e88acd93a",
+ "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/d5242a59d035e46774f2e634b374bc39ff62cb95",
+ "reference": "d5242a59d035e46774f2e634b374bc39ff62cb95",
"shasum": ""
},
"require": {
@@ -6807,9 +6807,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.15"
+ "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.16"
},
- "time": "2023-10-09T18:58:39+00:00"
+ "time": "2024-02-23T09:51:20+00:00"
},
{
"name": "phpunit/php-code-coverage",
--
GitLab