From 3c54a7f97baa83ec66cc0404a6fa4372e6220a4c Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Fri, 21 Apr 2023 07:19:37 +0200
Subject: [PATCH] [TASK] Allow doctrine/instantiator ^1.5 || ^2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
v11 has "^1.4". For v12, we first removed it entirely,
and brought doctrine/instantiator back as "^2.0"
in #100207.
The "^2.0" restriction is a bit harsh, not all
other libraries caught up on this relatively
young new major.
To play well with others, we change
doctrine/instantiator to "^1.5 || ^2.0", the changes
betwen 1.5 and 2.0 [1] are mainly type
sugar that is not critical to us. The ^1.5 minor
restriction shouldn't be an issue for "sane" other
libraries which tend to go with something like "^1.0",
or "^1.3", or similar.
> composer req doctrine/instantiator:"^1.5 || ^2.0"
> composer req --no-update doctrine/instantiator:"^1.5 || ^2.0" -d typo3/sysext/extbase
[1] https://github.com/doctrine/instantiator/compare/1.5.0...2.0.0
Resolves: #100630
Related: #100207
Releases: main
Change-Id: I9b4de7b57a89a6db65e4fb9154196b3790c50104
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78779
Reviewed-by: Jörg Bösche <typo3@joergboesche.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Jörg Bösche <typo3@joergboesche.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Stefan Bürk <stefan@buerk.tech>
---
composer.json | 2 +-
composer.lock | 2 +-
typo3/sysext/extbase/composer.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index 99d59cb2c614..61806f1a2c03 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^3.6.2",
"doctrine/event-manager": "^2.0",
- "doctrine/instantiator": "^2.0",
+ "doctrine/instantiator": "^1.5 || ^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.15.4",
diff --git a/composer.lock b/composer.lock
index 139f09ce3f04..8381b9bde7f1 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": "d26ebfcbfbabdd3a05a74e6c96f727a4",
+ "content-hash": "9d826a06da83c04fc7e4a57ad3fd0d42",
"packages": [
{
"name": "bacon/bacon-qr-code",
diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json
index 9bc0369bbc6c..b0896fc06980 100644
--- a/typo3/sysext/extbase/composer.json
+++ b/typo3/sysext/extbase/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/instantiator": "^2.0",
+ "doctrine/instantiator": "^1.5 || ^2.0",
"phpdocumentor/reflection-docblock": "^5.2",
"phpdocumentor/type-resolver": "^1.7.1",
"symfony/dependency-injection": "^6.2",
--
GitLab