From 74b597cb507fda6f8c4214a9d203541df614597f Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Mon, 12 Sep 2022 11:30:10 +0200
Subject: [PATCH] [TASK] Use same version of friendsofphp/php-cs-fixer as in
v12
To avoid divergent code-style results among other Git branches,
package friendsofphp/php-cs-fixer is upgraded to version 3.9.5.
Resolves: #98331
Releases: 11.5
Change-Id: I9cac87b225b816dc5c4a943ef4a90827a164496c
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75691
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
composer.json | 2 +-
composer.lock | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/composer.json b/composer.json
index fc9f8b7f8b3c..2c959fbad90a 100644
--- a/composer.json
+++ b/composer.json
@@ -111,7 +111,7 @@
"codeception/module-webdriver": "^1.4.0",
"composer/composer": "^2.2.12",
"composer/package-versions-deprecated": "^1.11.99.4",
- "friendsofphp/php-cs-fixer": "^3.8.0",
+ "friendsofphp/php-cs-fixer": "^3.9.5",
"friendsoftypo3/phpstan-typo3": "^0.9.0",
"jangregor/phpstan-prophecy": "^1.0",
"php-webdriver/webdriver": "^1.12.0",
diff --git a/composer.lock b/composer.lock
index e1929e1583a2..b7e8c182de89 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": "a9ffb0ca76225c8cd10898a4aed3aa93",
+ "content-hash": "44741aab4692ea2135a265f71fd0e767",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -6423,16 +6423,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.8.0",
+ "version": "v3.9.5",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3"
+ "reference": "4465d70ba776806857a1ac2a6f877e582445ff36"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3",
- "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/4465d70ba776806857a1ac2a6f877e582445ff36",
+ "reference": "4465d70ba776806857a1ac2a6f877e582445ff36",
"shasum": ""
},
"require": {
@@ -6500,7 +6500,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
- "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.8.0"
+ "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.9.5"
},
"funding": [
{
@@ -6508,7 +6508,7 @@
"type": "github"
}
],
- "time": "2022-03-18T17:20:59+00:00"
+ "time": "2022-07-22T08:43:51+00:00"
},
{
"name": "friendsoftypo3/phpstan-typo3",
--
GitLab