From 5c3a64a1c53bfb7e262d131cc8a7bb188124b787 Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Wed, 8 Feb 2023 09:55:14 +0100
Subject: [PATCH] [TASK] Raise doctrine/dbal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Used commands:
> composer req doctrine/dbal:^3.6.0
> composer req doctrine/dbal:^3.6.0 --no-update -d typo3/sysext/core/
> composer req doctrine/dbal:^3.6.0 --no-update -d typo3/sysext/install/
> composer req doctrine/dbal:^3.6.0 --no-update -d typo3/sysext/redirects/
> ./Build/Scripts/runTests.sh -s phpstanGenerateBaseline
Resolves: #99875
Releases: main
Change-Id: I8105e999a1f0766170da44125f0f21e32ac91e82
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/77783
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Nikita Hovratov <nikita.h@live.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Nikita Hovratov <nikita.h@live.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
Build/phpstan/phpstan-baseline.neon | 25 +++++++++++++++++++++++++
composer.json | 2 +-
composer.lock | 21 +++++++++++----------
typo3/sysext/core/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
6 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index ed446dc01a7c..c772322b5650 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -490,6 +490,16 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Classes/Database/Connection.php
+ -
+ message: "#^Offset 'persistent' on array\\{charset\\?\\: string, dbname\\?\\: string, defaultTableOptions\\?\\: array\\<string, mixed\\>, default_dbname\\?\\: string, driver\\?\\: 'ibm_db2'\\|'mysqli'\\|'oci8'\\|'pdo_mysql'\\|'pdo_oci'\\|'pdo_pgsql'\\|'pdo_sqlite'\\|'pdo_sqlsrv'\\|'pgsql'\\|'sqlite3'\\|'sqlsrv', driverClass\\?\\: class\\-string\\<Doctrine\\\\DBAL\\\\Driver\\>, driverOptions\\?\\: array, host\\?\\: string, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#"
+ count: 1
+ path: ../../typo3/sysext/core/Classes/Database/Driver/PDOMySql/Driver.php
+
+ -
+ message: "#^Offset 'persistent' on array\\{charset\\?\\: string, dbname\\?\\: string, defaultTableOptions\\?\\: array\\<string, mixed\\>, default_dbname\\?\\: string, driver\\?\\: 'ibm_db2'\\|'mysqli'\\|'oci8'\\|'pdo_mysql'\\|'pdo_oci'\\|'pdo_pgsql'\\|'pdo_sqlite'\\|'pdo_sqlsrv'\\|'pgsql'\\|'sqlite3'\\|'sqlsrv', driverClass\\?\\: class\\-string\\<Doctrine\\\\DBAL\\\\Driver\\>, driverOptions\\?\\: array, host\\?\\: string, \\.\\.\\.\\} in empty\\(\\) does not exist\\.$#"
+ count: 1
+ path: ../../typo3/sysext/core/Classes/Database/Driver/PDOPgSql/Driver.php
+
-
message: "#^Parameter \\#4 \\$condition of method Doctrine\\\\DBAL\\\\Query\\\\QueryBuilder\\:\\:leftJoin\\(\\) expects string\\|null, TYPO3\\\\CMS\\\\Core\\\\Database\\\\Query\\\\Expression\\\\CompositeExpression given\\.$#"
count: 1
@@ -545,6 +555,21 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Classes/Database/Schema/DefaultTcaSchema.php
+ -
+ message: "#^Conditional return type uses subject type T which is not part of PHPDoc @template tags\\.$#"
+ count: 1
+ path: ../../typo3/sysext/core/Classes/Database/Schema/Types/DateTimeType.php
+
+ -
+ message: "#^Conditional return type uses subject type T which is not part of PHPDoc @template tags\\.$#"
+ count: 1
+ path: ../../typo3/sysext/core/Classes/Database/Schema/Types/DateType.php
+
+ -
+ message: "#^Conditional return type uses subject type T which is not part of PHPDoc @template tags\\.$#"
+ count: 1
+ path: ../../typo3/sysext/core/Classes/Database/Schema/Types/TimeType.php
+
-
message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Package\\\\PackageInterface\\:\\:getServiceProvider\\(\\)\\.$#"
count: 1
diff --git a/composer.json b/composer.json
index 74bd4699997d..754d295d5dd8 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
"bacon/bacon-qr-code": "^2.0.7",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.13.3 || ^2.0",
- "doctrine/dbal": "^3.5.1",
+ "doctrine/dbal": "^3.6.0",
"doctrine/event-manager": "^2.0",
"doctrine/lexer": "^2.0 || ^3.0",
"egulias/email-validator": "^4.0",
diff --git a/composer.lock b/composer.lock
index 24d0797f0f5b..1ae545ba5caa 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": "e60e99757c4a15cbc612def15a2dd1f0",
+ "content-hash": "aaa899df170c46fe4481f491c705c205",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -337,16 +337,16 @@
},
{
"name": "doctrine/dbal",
- "version": "3.5.3",
+ "version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e"
+ "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
- "reference": "88fa7e5189fd5ec6682477044264dc0ed4e3aa1e",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/85b98cb23c8af471a67abfe14485da696bcabc2e",
+ "reference": "85b98cb23c8af471a67abfe14485da696bcabc2e",
"shasum": ""
},
"require": {
@@ -359,11 +359,12 @@
"psr/log": "^1|^2|^3"
},
"require-dev": {
- "doctrine/coding-standard": "11.0.0",
+ "doctrine/coding-standard": "11.1.0",
+ "fig/log-test": "^1",
"jetbrains/phpstorm-stubs": "2022.3",
- "phpstan/phpstan": "1.9.4",
+ "phpstan/phpstan": "1.9.14",
"phpstan/phpstan-strict-rules": "^1.4",
- "phpunit/phpunit": "9.5.27",
+ "phpunit/phpunit": "9.6.3",
"psalm/plugin-phpunit": "0.18.4",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.4|^6.0",
@@ -428,7 +429,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.5.3"
+ "source": "https://github.com/doctrine/dbal/tree/3.6.0"
},
"funding": [
{
@@ -444,7 +445,7 @@
"type": "tidelift"
}
],
- "time": "2023-01-12T10:21:44+00:00"
+ "time": "2023-02-07T22:52:03+00:00"
},
{
"name": "doctrine/deprecations",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index fd30058b8def..46110237765d 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.5.1",
+ "doctrine/dbal": "^3.6.0",
"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 54bf5d2ffe53..59c4bb376905 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.5.1",
+ "doctrine/dbal": "^3.6.0",
"guzzlehttp/promises": "^1.5.2",
"nikic/php-parser": "^4.15.1",
"symfony/finder": "^6.2",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index 12a047769e66..2a47c9b707c6 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^3.5.1",
+ "doctrine/dbal": "^3.6.0",
"psr/http-message": "^1.0",
"psr/log": "^2.0 || ^3.0",
"symfony/console": "^6.2",
--
GitLab