From 710b092b96794c09b9c551d847d0a0fa9a853c97 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Mon, 26 Feb 2024 12:23:59 +0100
Subject: [PATCH] [TASK] Require friendsofphp/php-cs-fixer:^3.50
Unblocks phpunit 11, backport to v12 to keep
php-cs-fixer in sync.
> composer req --dev friendsofphp/php-cs-fixer:^3.50
Resolves: #103200
Releases: main, 12.4
Change-Id: I1ab390c816caf3eabba00e8404d00fe2c9009fd8
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83134
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 19 ++++++++++---------
typo3/sysext/filelist/Classes/FileList.php | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index 1b49422b7d63..59b11372b677 100644
--- a/composer.json
+++ b/composer.json
@@ -109,7 +109,7 @@
"codeception/module-filesystem": "^3.0.1",
"codeception/module-webdriver": "^4.0.0",
"composer/composer": "^2.6.5",
- "friendsofphp/php-cs-fixer": "^3.46",
+ "friendsofphp/php-cs-fixer": "^3.50",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"php-webdriver/webdriver": "^1.14.0",
"phpstan/phpdoc-parser": "^1.26.0",
diff --git a/composer.lock b/composer.lock
index 9f70c3171362..862054bffd8d 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": "dae44d95b7cd2910d3bc4385009a087f",
+ "content-hash": "6fe4df7357986427f3e4098aa07f8e58",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -6259,16 +6259,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.46.0",
+ "version": "v3.50.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2"
+ "reference": "dbea11dcb6d9a1f6c8d51c0e580ab4a8876f524c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/be6831c9af1740470d2a773119b9273f8ac1c3d2",
- "reference": "be6831c9af1740470d2a773119b9273f8ac1c3d2",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/dbea11dcb6d9a1f6c8d51c0e580ab4a8876f524c",
+ "reference": "dbea11dcb6d9a1f6c8d51c0e580ab4a8876f524c",
"shasum": ""
},
"require": {
@@ -6278,7 +6278,7 @@
"ext-json": "*",
"ext-tokenizer": "*",
"php": "^7.4 || ^8.0",
- "sebastian/diff": "^4.0 || ^5.0",
+ "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
"symfony/console": "^5.4 || ^6.0 || ^7.0",
"symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
@@ -6299,7 +6299,8 @@
"php-cs-fixer/accessible-object": "^1.1",
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
- "phpunit/phpunit": "^9.6 || ^10.5.5",
+ "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2",
+ "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
"suggest": {
@@ -6338,7 +6339,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.46.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.50.0"
},
"funding": [
{
@@ -6346,7 +6347,7 @@
"type": "github"
}
],
- "time": "2024-01-03T21:38:46+00:00"
+ "time": "2024-02-23T23:17:45+00:00"
},
{
"name": "friendsoftypo3/phpstan-typo3",
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index aacd49d887ce..8141f7c139b4 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -715,7 +715,7 @@ class FileList
if ($numFiles === 1) {
return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_common.xlf:file'));
}
- return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:files'));
+ return $numFiles . ' ' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:filelist/Resources/Private/Language/locallang_mod_file_list.xlf:files'));
}
return '';
--
GitLab