From ff1931a74712e02497831a57f69a8b6c41f491e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Sun, 4 Feb 2024 05:24:33 +0100
Subject: [PATCH] [TASK] Update `doctrine/dbal:^3.8.1`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Doctrine DBAL 3.8.x comes with further deprecations, but
also with the new `QueryBuilder::reset*()` methods as a
mitigation for the deprecated generic QueryBuilder methods
`resetQueryParams()` and `resetQueryParam()`.
See [1] for release notes and [2] for changes from current
minimum version towards 3.8.1.
Raising the minimum version ensures that extension authors
are able to create TYPO3 v12 and v13 compatible code. At least,
they can rely on it with the TYPO3 release containing this change
for non-Composer and Composer mode.
Used command(s):
> \
composer req --no-update --no-install \
-d typo3/sysext/redirects \
"doctrine/dbal":"^3.8.1" ; \
composer req --no-update --no-install \
-d typo3/sysext/core \
"doctrine/dbal":"^3.8.1" ; \
composer req --no-update --no-install \
-d typo3/sysext/install \
"doctrine/dbal":"^3.8.1" ; \
composer req -W \
"doctrine/dbal":"^3.8.1"
[1] https://github.com/doctrine/dbal/releases/tag/3.8.1
[2] https://github.com/doctrine/dbal/compare/3.7.2...3.8.1
Resolves: #103031
Releases: 12.4
Change-Id: Ifb1b236c9c57a46a7cde7b753e813d6ae8cfbd01
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/82778
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
composer.json | 2 +-
composer.lock | 36 ++++++++++++++--------------
typo3/sysext/core/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/composer.json b/composer.json
index 4e5aac6dcc2d..5df8068ef6dc 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 || ^2.0",
- "doctrine/dbal": "^3.7.2",
+ "doctrine/dbal": "^3.8.1",
"doctrine/event-manager": "^2.0",
"doctrine/instantiator": "^1.5 || ^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
diff --git a/composer.lock b/composer.lock
index 5b830e8e177f..16e40ad21043 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": "2963555475d536de38708fa41dd6e0f1",
+ "content-hash": "5ad2492e965dcdb86bc1494ac4210c14",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -340,16 +340,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.7.2",
+ "version": "3.8.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "0ac3c270590e54910715e9a1a044cc368df282b2"
+ "reference": "c9ea252cdce4da324ede3d6c5913dd89f769afd2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2",
- "reference": "0ac3c270590e54910715e9a1a044cc368df282b2",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/c9ea252cdce4da324ede3d6c5913dd89f769afd2",
+ "reference": "c9ea252cdce4da324ede3d6c5913dd89f769afd2",
"shasum": ""
},
"require": {
@@ -365,14 +365,14 @@
"doctrine/coding-standard": "12.0.0",
"fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2023.1",
- "phpstan/phpstan": "1.10.42",
+ "phpstan/phpstan": "1.10.57",
"phpstan/phpstan-strict-rules": "^1.5",
- "phpunit/phpunit": "9.6.13",
+ "phpunit/phpunit": "9.6.16",
"psalm/plugin-phpunit": "0.18.4",
"slevomat/coding-standard": "8.13.1",
- "squizlabs/php_codesniffer": "3.7.2",
- "symfony/cache": "^5.4|^6.0",
- "symfony/console": "^4.4|^5.4|^6.0",
+ "squizlabs/php_codesniffer": "3.8.1",
+ "symfony/cache": "^5.4|^6.0|^7.0",
+ "symfony/console": "^4.4|^5.4|^6.0|^7.0",
"vimeo/psalm": "4.30.0"
},
"suggest": {
@@ -433,7 +433,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.7.2"
+ "source": "https://github.com/doctrine/dbal/tree/3.8.1"
},
"funding": [
{
@@ -449,20 +449,20 @@
"type": "tidelift"
}
],
- "time": "2023-11-19T08:06:58+00:00"
+ "time": "2024-02-03T17:33:49+00:00"
},
{
"name": "doctrine/deprecations",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
- "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
+ "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
"shasum": ""
},
"require": {
@@ -494,9 +494,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
+ "source": "https://github.com/doctrine/deprecations/tree/1.1.3"
},
- "time": "2023-09-27T20:04:15+00:00"
+ "time": "2024-01-30T19:34:25+00:00"
},
{
"name": "doctrine/event-manager",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 44ddac9e5a50..2d24e731ceae 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -34,7 +34,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
- "doctrine/dbal": "^3.7.2",
+ "doctrine/dbal": "^3.8.1",
"doctrine/event-manager": "^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index fe3165d81ef4..d7d656eb8c16 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.7.2",
+ "doctrine/dbal": "^3.8.1",
"guzzlehttp/promises": "^1.5.2 || ^2.0",
"nikic/php-parser": "^4.15.4",
"symfony/finder": "^6.4 || ^7.0",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index 21683e4439e8..63549eb525f2 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.7.2",
+ "doctrine/dbal": "^3.8.1",
"psr/http-message": "^1.1 || ^2.0",
"psr/log": "^2.0 || ^3.0",
"symfony/console": "^6.4 || ^7.0",
--
GitLab