From 4e42e1f0334632581c2d0b6d40808dc8569bdf56 Mon Sep 17 00:00:00 2001
From: Oliver Klee <typo3-coding@oliverklee.de>
Date: Sat, 16 Jul 2022 09:38:10 +0200
Subject: [PATCH] [TASK] Bump the Doctrine dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Used commands:
> composer req -W doctrine/annotations:^1.13.3 doctrine/dbal:^3.3.7 \
doctrine/event-manager:^1.1.1
> composer req doctrine/annotations:^1.13.3 doctrine/dbal:^3.3.7 \
doctrine/event-manager:^1.1.1 -d typo3/sysext/core --no-update
> composer req doctrine/dbal:^3.3.7 -d typo3/sysext/install --no-update
> composer req doctrine/dbal:^3.3.7 -d typo3/sysext/redirects --no-update
Also make use of a Doctrine-DBAL-provided PHPStan/Psalm type to satisfy
the required types for the new DBAL version.
Resolves: #97956
Releases: main
Change-Id: Ia193947df78c67c60f5861ca1f9912eacbf5b980
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75204
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
composer.json | 6 +-
composer.lock | 89 +++++++++----------
typo3/sysext/core/composer.json | 6 +-
.../Controller/InstallerController.php | 4 +
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
6 files changed, 54 insertions(+), 55 deletions(-)
diff --git a/composer.json b/composer.json
index e27c264e036e..8c81b0b6c74f 100644
--- a/composer.json
+++ b/composer.json
@@ -49,9 +49,9 @@
"composer-runtime-api": "^2.1",
"bacon/bacon-qr-code": "^2.0.4",
"christian-riesen/base32": "^1.6",
- "doctrine/annotations": "^1.11",
- "doctrine/dbal": "^3.3.2",
- "doctrine/event-manager": "^1.0.0",
+ "doctrine/annotations": "^1.13.3",
+ "doctrine/dbal": "^3.3.7",
+ "doctrine/event-manager": "^1.1.1",
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.2.1",
"enshrined/svg-sanitize": "^0.15.4",
diff --git a/composer.lock b/composer.lock
index 422acf6b6c07..5a135dae320f 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": "abe1a0a0f9698c8f179e3814bb3505c5",
+ "content-hash": "ddafa1becc62ce306b9e8f6512c563ac",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -167,16 +167,16 @@
},
{
"name": "doctrine/annotations",
- "version": "1.13.2",
+ "version": "1.13.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
+ "reference": "648b0343343565c4a056bfc8392201385e8d89f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
- "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/648b0343343565c4a056bfc8392201385e8d89f0",
+ "reference": "648b0343343565c4a056bfc8392201385e8d89f0",
"shasum": ""
},
"require": {
@@ -188,9 +188,10 @@
"require-dev": {
"doctrine/cache": "^1.11 || ^2.0",
"doctrine/coding-standard": "^6.0 || ^8.1",
- "phpstan/phpstan": "^0.12.20",
+ "phpstan/phpstan": "^1.4.10 || ^1.8.0",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5",
- "symfony/cache": "^4.4 || ^5.2"
+ "symfony/cache": "^4.4 || ^5.2",
+ "vimeo/psalm": "^4.10"
},
"type": "library",
"autoload": {
@@ -233,22 +234,22 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
- "source": "https://github.com/doctrine/annotations/tree/1.13.2"
+ "source": "https://github.com/doctrine/annotations/tree/1.13.3"
},
- "time": "2021-08-05T19:00:23+00:00"
+ "time": "2022-07-02T10:48:51+00:00"
},
{
"name": "doctrine/cache",
- "version": "2.1.1",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce"
+ "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/331b4d5dbaeab3827976273e9356b3b453c300ce",
- "reference": "331b4d5dbaeab3827976273e9356b3b453c300ce",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
+ "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
"shasum": ""
},
"require": {
@@ -258,18 +259,12 @@
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
- "alcaeus/mongo-php-adapter": "^1.1",
"cache/integration-tests": "dev-master",
- "doctrine/coding-standard": "^8.0",
- "mongodb/mongodb": "^1.1",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
- "predis/predis": "~1.0",
+ "doctrine/coding-standard": "^9",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psr/cache": "^1.0 || ^2.0 || ^3.0",
- "symfony/cache": "^4.4 || ^5.2 || ^6.0@dev",
- "symfony/var-exporter": "^4.4 || ^5.2 || ^6.0@dev"
- },
- "suggest": {
- "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
+ "symfony/cache": "^4.4 || ^5.4 || ^6",
+ "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
},
"type": "library",
"autoload": {
@@ -318,7 +313,7 @@
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
- "source": "https://github.com/doctrine/cache/tree/2.1.1"
+ "source": "https://github.com/doctrine/cache/tree/2.2.0"
},
"funding": [
{
@@ -334,26 +329,26 @@
"type": "tidelift"
}
],
- "time": "2021-07-17T14:49:29+00:00"
+ "time": "2022-05-20T20:07:39+00:00"
},
{
"name": "doctrine/dbal",
- "version": "3.3.2",
+ "version": "3.3.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed"
+ "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/35eae239ef515d55ebb24e9d4715cad09a4f58ed",
- "reference": "35eae239ef515d55ebb24e9d4715cad09a4f58ed",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
+ "reference": "9f79d4650430b582f4598fe0954ef4d52fbc0a8a",
"shasum": ""
},
"require": {
"composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
- "doctrine/deprecations": "^0.5.3",
+ "doctrine/deprecations": "^0.5.3|^1",
"doctrine/event-manager": "^1.0",
"php": "^7.3 || ^8.0",
"psr/cache": "^1|^2|^3",
@@ -361,15 +356,15 @@
},
"require-dev": {
"doctrine/coding-standard": "9.0.0",
- "jetbrains/phpstorm-stubs": "2021.1",
- "phpstan/phpstan": "1.4.0",
- "phpstan/phpstan-strict-rules": "^1.1",
- "phpunit/phpunit": "9.5.11",
+ "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.6.2",
+ "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.16.1"
+ "vimeo/psalm": "4.23.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -429,7 +424,7 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/3.3.2"
+ "source": "https://github.com/doctrine/dbal/tree/3.3.7"
},
"funding": [
{
@@ -445,29 +440,29 @@
"type": "tidelift"
}
],
- "time": "2022-02-05T16:33:45+00:00"
+ "time": "2022-06-13T21:43:03+00:00"
},
{
"name": "doctrine/deprecations",
- "version": "v0.5.3",
+ "version": "v1.0.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/deprecations.git",
- "reference": "9504165960a1f83cc1480e2be1dd0a0478561314"
+ "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/deprecations/zipball/9504165960a1f83cc1480e2be1dd0a0478561314",
- "reference": "9504165960a1f83cc1480e2be1dd0a0478561314",
+ "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
+ "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de",
"shasum": ""
},
"require": {
"php": "^7.1|^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0|^7.0|^8.0",
- "phpunit/phpunit": "^7.0|^8.0|^9.0",
- "psr/log": "^1.0"
+ "doctrine/coding-standard": "^9",
+ "phpunit/phpunit": "^7.5|^8.5|^9.5",
+ "psr/log": "^1|^2|^3"
},
"suggest": {
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -486,9 +481,9 @@
"homepage": "https://www.doctrine-project.org/",
"support": {
"issues": "https://github.com/doctrine/deprecations/issues",
- "source": "https://github.com/doctrine/deprecations/tree/v0.5.3"
+ "source": "https://github.com/doctrine/deprecations/tree/v1.0.0"
},
- "time": "2021-03-21T12:59:47+00:00"
+ "time": "2022-05-02T15:47:09+00:00"
},
{
"name": "doctrine/event-manager",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index c43e87b776f5..67cc0b534969 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -32,9 +32,9 @@
"composer-runtime-api": "^2.1",
"bacon/bacon-qr-code": "^2.0.4",
"christian-riesen/base32": "^1.6",
- "doctrine/annotations": "^1.11",
- "doctrine/dbal": "^3.3.2",
- "doctrine/event-manager": "^1.0.0",
+ "doctrine/annotations": "^1.13.3",
+ "doctrine/dbal": "^3.3.7",
+ "doctrine/event-manager": "^1.1.1",
"doctrine/lexer": "^1.2.3",
"egulias/email-validator": "^3.2.1",
"enshrined/svg-sanitize": "^0.15.4",
diff --git a/typo3/sysext/install/Classes/Controller/InstallerController.php b/typo3/sysext/install/Classes/Controller/InstallerController.php
index a1c2def46e87..f9284cef0f00 100644
--- a/typo3/sysext/install/Classes/Controller/InstallerController.php
+++ b/typo3/sysext/install/Classes/Controller/InstallerController.php
@@ -78,6 +78,8 @@ use TYPO3Fluid\Fluid\View\TemplateView as FluidTemplateView;
/**
* Install step controller, dispatcher class of step actions.
* @internal This class is a specific controller implementation and is not considered part of the Public TYPO3 API.
+ *
+ * @phpstan-import-type Params from DriverManager
*/
class InstallerController
{
@@ -1232,6 +1234,7 @@ For each website you need a TypoScript template on the main page of your website
*/
protected function getDatabaseConfigurationFromEnvironment(): array
{
+ /** @var Params $envCredentials */
$envCredentials = [];
foreach (['driver', 'host', 'user', 'password', 'port', 'dbname', 'unix_socket'] as $value) {
$envVar = 'TYPO3_INSTALL_DB_' . strtoupper($value);
@@ -1240,6 +1243,7 @@ For each website you need a TypoScript template on the main page of your website
}
}
if (!empty($envCredentials)) {
+ /** @var Params $connectionParams */
$connectionParams = $envCredentials;
$connectionParams['wrapperClass'] = Connection::class;
$connectionParams['charset'] = 'utf-8';
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index 1f24d851f608..1873cfdc1b4f 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.2",
+ "doctrine/dbal": "^3.3.7",
"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 12970df45dd0..ef0cf8ed4fd4 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.2",
+ "doctrine/dbal": "^3.3.7",
"psr/http-message": "^1.0",
"psr/log": "^2.0 || ^3.0",
"symfony/console": "^5.4",
--
GitLab