From 33e9fce5376b232425d72d37f3eb58fe60491ba4 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 3 Dec 2020 16:34:46 +0100
Subject: [PATCH] [TASK] Require doctrine/dbal 2.12.0
This is a pre-cursor for PHP 8.0 support
as well as a preliminary change to ensure
a smooth upgrade path to doctrine/dbal 3.0
Used composer command
* composer req "doctrine/dbal:^2.12"
Resolves: #92981
Releases: master
Change-Id: Ibcf217d458a669e69c84fa93d4b8ba93461e84e5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66971
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Daniel Haupt <mail@danielhaupt.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Daniel Haupt <mail@danielhaupt.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
composer.json | 2 +-
composer.lock | 43 +++++++++++++++++++---------
typo3/sysext/core/composer.json | 2 +-
typo3/sysext/install/composer.json | 2 +-
typo3/sysext/redirects/composer.json | 2 +-
5 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/composer.json b/composer.json
index 25086dd2cb2b..53b1a58ef5f6 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
"ext-xml": "*",
"cogpowered/finediff": "~0.3.1",
"doctrine/annotations": "^1.11",
- "doctrine/dbal": "^2.10",
+ "doctrine/dbal": "^2.12",
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
diff --git a/composer.lock b/composer.lock
index b557c390f1b8..fd23f24e86c2 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": "1c5cbd3dbbcc61e2bbeedeb17a766877",
+ "content-hash": "6550bb3bd7a54f1d3378e49c203ba07b",
"packages": [
{
"name": "cogpowered/finediff",
@@ -217,30 +217,32 @@
},
{
"name": "doctrine/dbal",
- "version": "v2.10.0",
+ "version": "2.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
- "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934"
+ "reference": "adce7a954a1c2f14f85e94aed90c8489af204086"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
- "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
+ "url": "https://api.github.com/repos/doctrine/dbal/zipball/adce7a954a1c2f14f85e94aed90c8489af204086",
+ "reference": "adce7a954a1c2f14f85e94aed90c8489af204086",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.0",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
- "php": "^7.2"
+ "php": "^7.3 || ^8"
},
"require-dev": {
- "doctrine/coding-standard": "^6.0",
+ "doctrine/coding-standard": "^8.1",
"jetbrains/phpstorm-stubs": "^2019.1",
- "phpstan/phpstan": "^0.11.3",
- "phpunit/phpunit": "^8.4.1",
- "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
+ "phpstan/phpstan": "^0.12.40",
+ "phpunit/phpunit": "^9.4",
+ "psalm/plugin-phpunit": "^0.10.0",
+ "symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
+ "vimeo/psalm": "^3.17.2"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -251,8 +253,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10.x-dev",
- "dev-develop": "3.0.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -307,9 +308,23 @@
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
- "source": "https://github.com/doctrine/dbal/tree/v2.10.0"
+ "source": "https://github.com/doctrine/dbal/tree/2.12.1"
},
- "time": "2019-11-03T16:50:43+00:00"
+ "funding": [
+ {
+ "url": "https://www.doctrine-project.org/sponsorship.html",
+ "type": "custom"
+ },
+ {
+ "url": "https://www.patreon.com/phpdoctrine",
+ "type": "patreon"
+ },
+ {
+ "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+ "type": "tidelift"
+ }
+ ],
+ "time": "2020-11-14T20:26:58+00:00"
},
{
"name": "doctrine/event-manager",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 83db4d338984..126f387b86e7 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -28,7 +28,7 @@
"ext-xml": "*",
"cogpowered/finediff": "~0.3.1",
"doctrine/annotations": "^1.11",
- "doctrine/dbal": "^2.10",
+ "doctrine/dbal": "^2.12",
"doctrine/instantiator": "^1.4",
"doctrine/lexer": "^1.2.1",
"egulias/email-validator": "^2.1",
diff --git a/typo3/sysext/install/composer.json b/typo3/sysext/install/composer.json
index 79f571065b82..3a0fe80352f1 100644
--- a/typo3/sysext/install/composer.json
+++ b/typo3/sysext/install/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^2.10",
+ "doctrine/dbal": "^2.12",
"nikic/php-parser": "^4.3",
"symfony/finder": "^4.4 || ^5.0",
"typo3/cms-core": "11.0.*@dev",
diff --git a/typo3/sysext/redirects/composer.json b/typo3/sysext/redirects/composer.json
index 34232900c207..1a81dd872824 100644
--- a/typo3/sysext/redirects/composer.json
+++ b/typo3/sysext/redirects/composer.json
@@ -19,7 +19,7 @@
"sort-packages": true
},
"require": {
- "doctrine/dbal": "^2.10",
+ "doctrine/dbal": "^2.12",
"psr/http-message": "^1.0",
"psr/log": "^1.0",
"symfony/console": "^4.4 || ^5.0",
--
GitLab