From 1ffa731a41757952f11f46bbb1638e5addd733a1 Mon Sep 17 00:00:00 2001 From: Sebastian Schreiber Date: Fri, 24 May 2024 15:35:37 +0200 Subject: [PATCH] [TASK] Adjust requirements for symfony components --- composer.json | 27 ++++++++++---------- packages/fractor-doc-generator/composer.json | 6 ++--- packages/fractor-yaml/composer.json | 2 +- packages/fractor/composer.json | 10 ++++---- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 4030e3f8..4b162ab9 100644 --- a/composer.json +++ b/composer.json @@ -10,20 +10,20 @@ } ], "require": { - "php": "^8.2", - "ext-dom": "*", - "ext-xml": "*", "composer-plugin-api": "^2.0", "ergebnis/json-printer": "^3.5", "eta-orionis/composer-json-manipulator": "^1.0", + "ext-dom": "*", + "ext-xml": "*", "nette/utils": "^4.0", + "php": "^8.2", "sebastian/diff": "^5.0", - "symfony/config": "^6.4", - "symfony/console": "^6.4", - "symfony/dependency-injection": "^6.4", - "symfony/filesystem": "^6.4", - "symfony/finder": "^6.4", - "symfony/yaml": "^6.0", + "symfony/config": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0", + "symfony/filesystem": "^6.4 || ^7.0", + "symfony/finder": "^6.4 || ^7.0", + "symfony/yaml": "^6.0 || ^7.0", "webmozart/assert": "^1.11" }, "require-dev": { @@ -69,6 +69,9 @@ } }, "autoload-dev": { + "classmap": [ + "packages/fractor-doc-generator/stubs" + ], "psr-4": { "a9f\\FractorComposerJson\\Tests\\": "packages/fractor-composer-json/tests/", "a9f\\FractorDocGenerator\\Tests\\": "packages/fractor-doc-generator/tests/", @@ -77,10 +80,7 @@ "a9f\\FractorYaml\\Tests\\": "packages/fractor-yaml/tests/", "a9f\\Fractor\\Tests\\": "packages/fractor/tests/", "a9f\\Typo3Fractor\\Tests\\": "packages/typo3-fractor/tests/" - }, - "classmap": [ - "packages/fractor-doc-generator/stubs" - ] + } }, "config": { "allow-plugins": { @@ -149,5 +149,4 @@ "@auto-scripts" ] } - } diff --git a/packages/fractor-doc-generator/composer.json b/packages/fractor-doc-generator/composer.json index eacead78..92a6376b 100644 --- a/packages/fractor-doc-generator/composer.json +++ b/packages/fractor-doc-generator/composer.json @@ -14,9 +14,9 @@ "php": "^8.2", "nette/utils": "^4.0", "sebastian/diff": "^5.0", - "symfony/config": "^6.4", - "symfony/console": "^6.4", - "symfony/dependency-injection": "^6.4" + "symfony/config": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0" }, "require-dev": { "symplify/rule-doc-generator": "12.1.3" diff --git a/packages/fractor-yaml/composer.json b/packages/fractor-yaml/composer.json index 200dc192..318c9d95 100644 --- a/packages/fractor-yaml/composer.json +++ b/packages/fractor-yaml/composer.json @@ -14,7 +14,7 @@ "php": "^8.2", "a9f/fractor": "^0.2", "a9f/fractor-extension-installer": "^0.2", - "symfony/yaml": "^6.0", + "symfony/yaml": "^6.0 || ^7.0", "webmozart/assert": "^1.11" }, "require-dev": { diff --git a/packages/fractor/composer.json b/packages/fractor/composer.json index b6265777..ae916065 100644 --- a/packages/fractor/composer.json +++ b/packages/fractor/composer.json @@ -14,11 +14,11 @@ "php": "^8.2", "nette/utils": "^4.0", "sebastian/diff": "^5.0", - "symfony/config": "^6.4", - "symfony/console": "^6.4", - "symfony/dependency-injection": "^6.4", - "symfony/filesystem": "^6.4", - "symfony/finder": "^6.4", + "symfony/config": "^6.4 || ^7.0", + "symfony/console": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0", + "symfony/filesystem": "^6.4 || ^7.0", + "symfony/finder": "^6.4 || ^7.0", "webmozart/assert": "^1.11" }, "require-dev": {