From 0f07ad539bd095511b430942ba532e1a53fb6d36 Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Sun, 13 Jun 2021 03:50:19 +0200
Subject: [PATCH] [TASK] Raise typo3/testing-framework:^6.8.3
Brings a composer conflict setting to prevent incompatible
doctrine/dbal versions, and an acceptance test related fix.
composer req --dev typo3/testing-framework:^6.8.3
composer req --dev typo3/testing-framework:^6.8.3 -d typo3/sysext/core --no-update
Resolves: #94332
Releases: master, 10.4
Change-Id: Ib1192c5135c02d485c8f28b54755c22a1a50c10f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69481
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 17 ++++++++++-------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/composer.json b/composer.json
index 7b4ce8154e0c..84efa9811587 100644
--- a/composer.json
+++ b/composer.json
@@ -97,7 +97,7 @@
"phpstan/phpstan": "^0.12.64",
"phpunit/phpunit": "^8.5.13",
"typo3/cms-styleguide": "~11.3.0",
- "typo3/testing-framework": "^6.8.2"
+ "typo3/testing-framework": "^6.8.3"
},
"suggest": {
"ext-gd": "GDlib/Freetype is required for building images with text (GIFBUILDER) and can also be used to scale images",
diff --git a/composer.lock b/composer.lock
index 40254df74faa..5aae2fad26a5 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": "392b6da64c34956cd9a02de228760d1c",
+ "content-hash": "4723051a66990c5301b6b18f55343e38",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -7541,16 +7541,16 @@
},
{
"name": "typo3/testing-framework",
- "version": "6.8.2",
+ "version": "6.8.3",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "d74a027a186d62e6218b8e29328449d9b97e259f"
+ "reference": "554fabca86975ec895eb443a017e09d1e37abc38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/d74a027a186d62e6218b8e29328449d9b97e259f",
- "reference": "d74a027a186d62e6218b8e29328449d9b97e259f",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/554fabca86975ec895eb443a017e09d1e37abc38",
+ "reference": "554fabca86975ec895eb443a017e09d1e37abc38",
"shasum": ""
},
"require": {
@@ -7565,6 +7565,9 @@
"typo3/cms-recordlist": "10.*.*@dev || 11.*.*@dev",
"typo3fluid/fluid": "^2.5|^3"
},
+ "conflict": {
+ "doctrine/dbal": "2.13.0 || 2.13.1"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -7597,9 +7600,9 @@
"support": {
"general": "https://typo3.org/support/",
"issues": "https://github.com/TYPO3/testing-framework/issues",
- "source": "https://github.com/TYPO3/testing-framework/tree/6.8.2"
+ "source": "https://github.com/TYPO3/testing-framework/tree/6.8.3"
},
- "time": "2021-05-04T20:51:31+00:00"
+ "time": "2021-06-12T20:34:13+00:00"
}
],
"aliases": [],
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 718fb71b389b..e67dcebf7e4d 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -77,7 +77,7 @@
"phpspec/prophecy": "^1.12.2",
"phpstan/phpstan": "^0.12.64",
"typo3/cms-styleguide": "~11.3.0",
- "typo3/testing-framework": "^6.8.2"
+ "typo3/testing-framework": "^6.8.3"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
--
GitLab