From b70e9d8a0430d5447d28a0e5d5e8383cf990a9ed Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Mon, 23 Aug 2021 21:08:31 +0200
Subject: [PATCH] [TASK] Require symfony/filesystem as direct dependency
The package symfony/filesystem is used in the class "CliEntryPoint"
but has no direct dependency defined in main composer.json.
Require the package to not break TYPO3 when packages that rely
on symfony/filesystem get removed.
composer req symfony/filesystem:^5.3.0
composer req symfony/filesystem:^5.3.0 -d typo3/sysext/core/ --no-update
Resolves: #94982
Releases: master, 10.4
Change-Id: Ib116913a709fbc2e635f1a7882f86d6be4c4c704
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70729
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
---
composer.json | 1 +
composer.lock | 17 +++++++++--------
typo3/sysext/core/composer.json | 1 +
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/composer.json b/composer.json
index df4896115245..6344cd143939 100644
--- a/composer.json
+++ b/composer.json
@@ -65,6 +65,7 @@
"symfony/dependency-injection": "^5.3.0",
"symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
"symfony/expression-language": "^5.3.0",
+ "symfony/filesystem": "^5.3.0",
"symfony/finder": "^5.3.0",
"symfony/http-foundation": "^5.3.0",
"symfony/mailer": "^5.3.0",
diff --git a/composer.lock b/composer.lock
index e3774d289356..de3cb1b83645 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": "2b759f7cffd3da72b2874134e6809b2f",
+ "content-hash": "1829a3e70a84bfe469ad61f6b1a372e8",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -2629,21 +2629,22 @@
},
{
"name": "symfony/filesystem",
- "version": "v5.3.0",
+ "version": "v5.3.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "348116319d7fb7d1faa781d26a48922428013eb2"
+ "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/348116319d7fb7d1faa781d26a48922428013eb2",
- "reference": "348116319d7fb7d1faa781d26a48922428013eb2",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
+ "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
"shasum": ""
},
"require": {
"php": ">=7.2.5",
- "symfony/polyfill-ctype": "~1.8"
+ "symfony/polyfill-ctype": "~1.8",
+ "symfony/polyfill-php80": "^1.16"
},
"type": "library",
"autoload": {
@@ -2671,7 +2672,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v5.3.0"
+ "source": "https://github.com/symfony/filesystem/tree/v5.3.4"
},
"funding": [
{
@@ -2687,7 +2688,7 @@
"type": "tidelift"
}
],
- "time": "2021-05-26T17:43:10+00:00"
+ "time": "2021-07-21T12:40:44+00:00"
},
{
"name": "symfony/finder",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index b1849115de15..cf7f9508e2c3 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -52,6 +52,7 @@
"symfony/dependency-injection": "^5.3.0",
"symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
"symfony/expression-language": "^5.3.0",
+ "symfony/filesystem": "^5.3.0",
"symfony/finder": "^5.3.0",
"symfony/http-foundation": "^5.3.0",
"symfony/mailer": "^5.3.0",
--
GitLab