From fc127b554031f73e53d2cdef27c6016bcb1e2e45 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Fri, 11 Aug 2023 11:34:51 +0200
Subject: [PATCH] [TASK] Require doctrine/lexer:^3.0
The lexer is used in the core ext_tables.sql
parser. Other dependencies that use it allow
3.0 already, it comes with more PHP type hints,
it should be fair to require ^3.0 with core v13.
> composer req doctrine/lexer:^3.0
> composer req doctrine/lexer:^3.0 -d typo3/sysext/core --no-update
Resolves: #101659
Releases: main
Change-Id: Iaae9f9c5ffc4087bd4bcb3772df3c22c6fab18cf
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80520
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
---
composer.json | 2 +-
composer.lock | 2 +-
typo3/sysext/core/composer.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/composer.json b/composer.json
index dd54f5684f3a..18d5de7971f9 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
"doctrine/dbal": "^3.6.2",
"doctrine/event-manager": "^2.0",
"doctrine/instantiator": "^1.5 || ^2.0",
- "doctrine/lexer": "^2.0 || ^3.0",
+ "doctrine/lexer": "^3.0",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.15.4",
"firebase/php-jwt": "^6.4.0",
diff --git a/composer.lock b/composer.lock
index 4ce59d00f847..0065778f7fa8 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": "debe2db3887b46aadad7c7972139c67a",
+ "content-hash": "c70a3aa8a0bfc5cef8a783e9b8b97c4e",
"packages": [
{
"name": "bacon/bacon-qr-code",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index a43dd0a24436..ebd39f781251 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -36,7 +36,7 @@
"doctrine/annotations": "^1.13.3 || ^2.0",
"doctrine/dbal": "^3.6.2",
"doctrine/event-manager": "^2.0",
- "doctrine/lexer": "^2.0 || ^3.0",
+ "doctrine/lexer": "^3.0",
"egulias/email-validator": "^4.0",
"enshrined/svg-sanitize": "^0.15.4",
"firebase/php-jwt": "^6.4.0",
--
GitLab