From 72e320bd4bd851580e0b1c313e240723291dbbf5 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Fri, 11 Nov 2022 23:38:25 +0100
Subject: [PATCH] [TASK] Require Doctrine DBAL 3.5+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The latest Doctrine DBAL 3.5 is similar
to Doctrine DBAL 4, which is what we
want to use in the future.
Used command(s):
> composer req "doctrine/dbal":"^3.5.1" \
--no-update -d typo3/sysext/core
> composer req "doctrine/dbal":"^3.5.1" \
--no-update -d typo3/sysext/install
> composer req "doctrine/dbal":"^3.5.1" \
--no-update -d typo3/sysext/redirects
> composer req "doctrine/dbal":"^3.5.1"
Resolves: #99072
Releases: main
Change-Id: I62eaa0cd0c759ecc58c40d3b12dd751fd1b47bc6
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76564
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 38 ++++++++++++++--------------
typo3/sysext/core/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/composer.json b/composer.json
index 4133e5e07527..541133adb708 100644
--- a/composer.json
+++ b/composer.json
@@ -50,7 +50,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3",
- "doctrine/dbal": "^3.3.7",
+ "doctrine/dbal": "^3.5.1",
"doctrine/event-manager": "^1.1.2",
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.2.1",
diff --git a/composer.lock b/composer.lock
index 444171d85dcf..836e70132d00 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": "a83611d835927f4a74854aa1ea7efc70",
+ "content-hash": "82556e2668af2843622dd32c271638cc",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -334,38 +334,38 @@
},
{
"name": "doctrine/dbal",
- "version": "3.3.7",
+ "version": "3.5.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
+ "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
- "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
+ "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3|^1",
- "doctrine/event-manager": "^1.0",
- "php": "^7.3 || ^8.0",
+ "doctrine/event-manager": "^1|^2",
+ "php": "^7.4 || ^8.0",
"psr/cache": "^1|^2|^3",
"psr/log": "^1|^2|^3"
},
"require-dev": {
- "doctrine/coding-standard": "9.0.0",
- "jetbrains/phpstorm-stubs": "2022.1",
- "phpstan/phpstan": "1.7.13",
- "phpstan/phpstan-strict-rules": "^1.2",
- "phpunit/phpunit": "9.5.20",
- "psalm/plugin-phpunit": "0.16.1",
- "squizlabs/php_codesniffer": "3.7.0",
- "symfony/cache": "^5.2|^6.0",
- "symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
- "vimeo/psalm": "4.23.0"
+ "doctrine/coding-standard": "10.0.0",
+ "jetbrains/phpstorm-stubs": "2022.2",
+ "phpstan/phpstan": "1.8.10",
+ "phpstan/phpstan-strict-rules": "^1.4",
+ "phpunit/phpunit": "9.5.25",
+ "psalm/plugin-phpunit": "0.17.0",
+ "squizlabs/php_codesniffer": "3.7.1",
+ "symfony/cache": "^5.4|^6.0",
+ "symfony/console": "^4.4|^5.4|^6.0",
+ "vimeo/psalm": "4.29.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -425,7 +425,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.3.7"
+ "source": "https://github.com/doctrine/dbal/tree/3.5.1"
},
"funding": [
{
@@ -441,7 +441,7 @@
"type": "tidelift"
}
],
- "time": "2022-06-13T21:43:03+00:00"
+ "time": "2022-10-24T07:26:18+00:00"
},
{
"name": "doctrine/deprecations",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 8d9f8b135bd2..fd339c091ad0 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -33,7 +33,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3",
- "doctrine/dbal": "^3.3.7",
+ "doctrine/dbal": "^3.5.1",
"doctrine/event-manager": "^1.1.2",
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.2.1",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index c01e8b3fb805..d74f26e5265c 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.3.7",
+ "doctrine/dbal": "^3.5.1",
"guzzlehttp/promises": "^1.4.0",
"nikic/php-parser": "^4.15.1",
"symfony/finder": "^6.1",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index 68ac65535d23..8363d082c6cf 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.3.7",
+ "doctrine/dbal": "^3.5.1",
"psr/http-message": "^1.0",
"psr/log": "^2.0 || ^3.0",
"symfony/console": "^6.1",
--
GitLab