From c4036fe111701aab87587957206eca0d5bc4132e Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Tue, 21 Sep 2021 19:53:46 +0200
Subject: [PATCH] [TASK] Update TYPO3 composer packages to latest version
Update the following packages from TYPO3 itself to their latest
version:
typo3/cms-cli
typo3/cms-composer-installers
typo3/symfony-psr-event-dispatcher-adapter
Composer commands used:
composer req typo3/cms-cli:^3.1
composer req typo3/cms-cli:^3.1 -d typo3/sysext/core --no-update
composer u typo3/cms-composer-installers
composer u typo3/symfony-psr-event-dispatcher-adapter
Resolves: #95304
Releases: master
Change-Id: Icf3d4f3d8a577e01fbdbe1402170349282149aed
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/71170
Tested-by: core-ci <typo3@b13.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 49 +++++++++++++++++----------------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/composer.json b/composer.json
index 6d226a872647..b635cde92358 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
"symfony/var-dumper": "^5.3.0",
"symfony/yaml": "^5.3.0",
"typo3/class-alias-loader": "^1.0",
- "typo3/cms-cli": "^3.0",
+ "typo3/cms-cli": "^3.1",
"typo3/cms-composer-installers": "^2.0 || ^3.0",
"typo3/html-sanitizer": "^2.0.11",
"typo3/phar-stream-wrapper": "^3.1.7",
diff --git a/composer.lock b/composer.lock
index a0c05ca15bd9..35987e41a13e 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": "2ae665fe0a3b748f2fdaee9675ed70e3",
+ "content-hash": "f6c55eb3c1ad5e1b2c1eded16010e70d",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -4764,20 +4764,20 @@
},
{
"name": "typo3/cms-cli",
- "version": "3.0.0",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/cms-cli.git",
- "reference": "bfb13f4ab6a505104662b79c18108f41c48e9288"
+ "reference": "1572143c88ec08d238e417de55c9813fb949e783"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/cms-cli/zipball/bfb13f4ab6a505104662b79c18108f41c48e9288",
- "reference": "bfb13f4ab6a505104662b79c18108f41c48e9288",
+ "url": "https://api.github.com/repos/TYPO3/cms-cli/zipball/1572143c88ec08d238e417de55c9813fb949e783",
+ "reference": "1572143c88ec08d238e417de55c9813fb949e783",
"shasum": ""
},
"require": {
- "php": "^7.0"
+ "php": "^7.0 || ^8.0"
},
"bin": [
"typo3"
@@ -4791,27 +4791,27 @@
"homepage": "https://typo3.org",
"support": {
"issues": "https://github.com/TYPO3/cms-cli/issues",
- "source": "https://github.com/TYPO3/cms-cli/tree/3.0.0"
+ "source": "https://github.com/TYPO3/cms-cli/tree/3.1.0"
},
- "time": "2021-02-09T12:45:27+00:00"
+ "time": "2021-03-01T12:18:57+00:00"
},
{
"name": "typo3/cms-composer-installers",
- "version": "v3.0.1",
+ "version": "v3.1.1",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/CmsComposerInstallers.git",
- "reference": "cde93ec5dbfb115e4d47c5f9b6d8822adeeac290"
+ "reference": "3092660e3cb629782b364266985b5b9b1f51f165"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/cde93ec5dbfb115e4d47c5f9b6d8822adeeac290",
- "reference": "cde93ec5dbfb115e4d47c5f9b6d8822adeeac290",
+ "url": "https://api.github.com/repos/TYPO3/CmsComposerInstallers/zipball/3092660e3cb629782b364266985b5b9b1f51f165",
+ "reference": "3092660e3cb629782b364266985b5b9b1f51f165",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0 || ^2.0.0",
- "php": ">=7.0.0 <7.5"
+ "php": "^7.2 || ^8.0"
},
"conflict": {
"composer/installers": "<1.0.24 || >1.0.24"
@@ -4821,7 +4821,10 @@
"netresearch/composer-installers": "*"
},
"require-dev": {
- "composer/composer": "1.2.*@dev || 2.0.*@dev"
+ "composer/composer": "1.2.*@dev || 2.0.*@dev",
+ "friendsofphp/php-cs-fixer": "^2.18",
+ "overtrue/phplint": "^2.0",
+ "phpunit/phpunit": "^8.5"
},
"type": "composer-plugin",
"extra": {
@@ -4863,9 +4866,9 @@
"support": {
"general": "https://typo3.org/support/",
"issues": "https://github.com/TYPO3/CmsComposerInstallers/issues",
- "source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.0.1"
+ "source": "https://github.com/TYPO3/CmsComposerInstallers/tree/v3.1.1"
},
- "time": "2020-05-04T18:03:13+00:00"
+ "time": "2021-03-22T12:30:09+00:00"
},
{
"name": "typo3/html-sanitizer",
@@ -4975,20 +4978,20 @@
},
{
"name": "typo3/symfony-psr-event-dispatcher-adapter",
- "version": "v2.0.0",
+ "version": "v2.1.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/symfony-psr-event-dispatcher-adapter.git",
- "reference": "6ea13090471966f2fb5de933e5cd5edd4f5d2327"
+ "reference": "c93fd7cc9f215cfbbc6ce89089eadabedf65a21f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/symfony-psr-event-dispatcher-adapter/zipball/6ea13090471966f2fb5de933e5cd5edd4f5d2327",
- "reference": "6ea13090471966f2fb5de933e5cd5edd4f5d2327",
+ "url": "https://api.github.com/repos/TYPO3/symfony-psr-event-dispatcher-adapter/zipball/c93fd7cc9f215cfbbc6ce89089eadabedf65a21f",
+ "reference": "c93fd7cc9f215cfbbc6ce89089eadabedf65a21f",
"shasum": ""
},
"require": {
- "php": "^7.2",
+ "php": "^7.2 || ^8.0",
"psr/event-dispatcher": "^1.0",
"symfony/event-dispatcher-contracts": "^2.0"
},
@@ -5012,9 +5015,9 @@
],
"support": {
"issues": "https://github.com/TYPO3/symfony-psr-event-dispatcher-adapter/issues",
- "source": "https://github.com/TYPO3/symfony-psr-event-dispatcher-adapter/tree/v2.0.0"
+ "source": "https://github.com/TYPO3/symfony-psr-event-dispatcher-adapter/tree/v2.1.0"
},
- "time": "2020-09-09T20:23:21+00:00"
+ "time": "2021-03-02T09:36:49+00:00"
},
{
"name": "typo3fluid/fluid",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index fcb5e1ea976a..9d2810aa1daf 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -68,7 +68,7 @@
"symfony/routing": "^5.3.0",
"symfony/yaml": "^5.3.0",
"typo3/class-alias-loader": "^1.0",
- "typo3/cms-cli": "^3.0",
+ "typo3/cms-cli": "^3.1",
"typo3/cms-composer-installers": "^2.0 || ^3.0",
"typo3/html-sanitizer": "^2.0.11",
"typo3/phar-stream-wrapper": "^3.1.7",
--
GitLab