From e9a66237409ae886baaa737ed63b047df320f05b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Tue, 22 Mar 2022 08:04:47 +0100
Subject: [PATCH] [BUGFIX] Raise doctrine/dbal:^2.13.8
This patch raises doctrine/dbal to 2.13.8 as minimum version,
which contains a bugfix to avoid a native php error is emitted,
stating "mysqli::real_connect(): Passing null to parameter #7".
See: https://github.com/doctrine/dbal/pull/5296
One phpstan ignore pattern slightly changed because of a
changed return type declarion of doctrine/dbal. Tackling
the corresponding error should be done in a dedicated test
after proper investigation.
Used commands:
> composer req doctrine/dbal:^2.13.8
> composer req doctrine/dbal:^2.13.8 \
-d typo3/sysext/core --no-update
> composer req doctrine/dbal:^2.13.8 \
-d typo3/sysext/install --no-update
> composer req doctrine/dbal:^2.13.8 \
-d typo3/sysext/redirects --no-update
> composer req doctrine/dbal:^2.13.8 \
-d typo3/sysext/core --no-update
> Build/Scripts/runTests.sh -s phpstanGenerateBaseline
Resolves: #97222
Releases: 11.5
Change-Id: I6c1712a792780bd2966b3977d43f767e59304bd5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74013
Tested-by: core-ci <typo3@b13.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
---
Build/phpstan/phpstan-baseline.neon | 2 +-
composer.json | 2 +-
composer.lock | 22 +++++++++++-----------
typo3/sysext/core/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 80d4e4d8e471..5cd0127b0b8e 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -926,7 +926,7 @@ parameters:
path: ../../typo3/sysext/core/Classes/Database/Connection.php
-
- message: "#^Strict comparison using \\=\\=\\= between int and false will always evaluate to false\\.$#"
+ message: "#^Strict comparison using \\=\\=\\= between int\\|string and false will always evaluate to false\\.$#"
count: 1
path: ../../typo3/sysext/core/Classes/Database/Connection.php
diff --git a/composer.json b/composer.json
index e13c7691ab20..17b40ff5d61a 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,7 @@
"bacon/bacon-qr-code": "^2.0.4",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.11",
- "doctrine/dbal": "^2.13.5",
+ "doctrine/dbal": "^2.13.8",
"doctrine/event-manager": "^1.0.0",
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.3",
diff --git a/composer.lock b/composer.lock
index b82498874f72..3bd8e744392c 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": "fb8947dbee37a47ddeafa5f93a244ccc",
+ "content-hash": "b95bd6265d2d27b08db0786c9a3dffd3",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -318,16 +318,16 @@
},
{
"name": "doctrine/dbal",
- "version": "2.13.5",
+ "version": "2.13.8",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "d92ddb260547c2a7b650ff140f744eb6f395d8fc"
+ "reference": "dc9b3c3c8592c935a6e590441f9abc0f9eba335b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/d92ddb260547c2a7b650ff140f744eb6f395d8fc",
- "reference": "d92ddb260547c2a7b650ff140f744eb6f395d8fc",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/dc9b3c3c8592c935a6e590441f9abc0f9eba335b",
+ "reference": "dc9b3c3c8592c935a6e590441f9abc0f9eba335b",
"shasum": ""
},
"require": {
@@ -340,13 +340,13 @@
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
- "phpstan/phpstan": "1.1.1",
- "phpunit/phpunit": "^7.5.20|^8.5|9.5.10",
+ "phpstan/phpstan": "1.4.6",
+ "phpunit/phpunit": "^7.5.20|^8.5|9.5.16",
"psalm/plugin-phpunit": "0.16.1",
- "squizlabs/php_codesniffer": "3.6.1",
+ "squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
- "vimeo/psalm": "4.12.0"
+ "vimeo/psalm": "4.22.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -407,7 +407,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/2.13.5"
+ "source": "https://github.com/doctrine/dbal/tree/2.13.8"
},
"funding": [
{
@@ -423,7 +423,7 @@
"type": "tidelift"
}
],
- "time": "2021-11-11T16:27:36+00:00"
+ "time": "2022-03-09T15:25:46+00:00"
},
{
"name": "doctrine/deprecations",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 726ae76dc583..f15bc75efab6 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -31,7 +31,7 @@
"bacon/bacon-qr-code": "^2.0.4",
"christian-riesen/base32": "^1.6",
"doctrine/annotations": "^1.11",
- "doctrine/dbal": "^2.13.5",
+ "doctrine/dbal": "^2.13.8",
"doctrine/event-manager": "^1.0.0",
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.3",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index 58c4afa7a337..c9397b7dc7d5 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^2.13.5",
+ "doctrine/dbal": "^2.13.8",
"guzzlehttp/promises": "^1.4.0",
"nikic/php-parser": "^4.13.2",
"symfony/finder": "^5.4",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index 93ee8418426a..b3a4bad1fd96 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^2.13.5",
+ "doctrine/dbal": "^2.13.8",
"psr/http-message": "^1.0",
"psr/log": "^1.0",
"symfony/console": "^5.4",
--
GitLab