From f767602dc4b3aa6517f0a2d8e9e0b36c8e25d6da Mon Sep 17 00:00:00 2001
From: Anja Leichsenring <aleichsenring@ab-softlab.de>
Date: Fri, 2 Oct 2020 18:55:32 +0200
Subject: [PATCH] [TASK] Raise typo3/testing-framework to 6.4.4
This provides the phpunit prophecy trait to phpunit v8.
Used command:
composer require --dev typo3/testing-framework:^6.4.4
Resolves: #92477
Releases: master, 10.4
Change-Id: Ib55d4d06a2a50a31820810b7e8d8f19940310a65
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66004
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
composer.json | 2 +-
composer.lock | 21 ++++++++-------------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/composer.json b/composer.json
index 6180a02cb93f..bfcd0975adbe 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,7 @@
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.44",
"typo3/cms-styleguide": "~11.0.0",
- "typo3/testing-framework": "^6.4.3"
+ "typo3/testing-framework": "^6.4.4"
},
"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 4bc69da472d1..e64776b1dd23 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": "52f3f27b45bf17950fe59c832b4a66a3",
+ "content-hash": "9463bcc3c693352685e3a2351b69dfb6",
"packages": [
{
"name": "cogpowered/finediff",
@@ -7768,7 +7768,7 @@
"type": "patreon"
}
],
- "abandoned": true,
+ "abandoned": "symplify/package-builder",
"time": "2020-04-09T23:55:34+00:00"
},
{
@@ -8305,16 +8305,16 @@
},
{
"name": "typo3/testing-framework",
- "version": "6.4.3",
+ "version": "6.4.4",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/testing-framework.git",
- "reference": "22461bc2b45c408b1ce4f2ae9521117e795f0c65"
+ "reference": "a061ad4c3844b05cdea8f5ced467063d0f0ab851"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/22461bc2b45c408b1ce4f2ae9521117e795f0c65",
- "reference": "22461bc2b45c408b1ce4f2ae9521117e795f0c65",
+ "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/a061ad4c3844b05cdea8f5ced467063d0f0ab851",
+ "reference": "a061ad4c3844b05cdea8f5ced467063d0f0ab851",
"shasum": ""
},
"require": {
@@ -8362,12 +8362,7 @@
"tests",
"typo3"
],
- "support": {
- "general": "https://typo3.org/support/",
- "issues": "https://github.com/TYPO3/testing-framework/issues",
- "source": "https://github.com/TYPO3/testing-framework/tree/6.4.3"
- },
- "time": "2020-09-30T06:12:51+00:00"
+ "time": "2020-10-02T16:50:10+00:00"
}
],
"aliases": [],
@@ -8388,5 +8383,5 @@
"platform-overrides": {
"php": "7.2.5"
},
- "plugin-api-version": "2.0.0"
+ "plugin-api-version": "1.1.0"
}
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index 1a750dc34648..eae78f5f9c7d 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -72,7 +72,7 @@
"phpspec/prophecy": "^1.7.5",
"phpstan/phpstan": "^0.12.44",
"typo3/cms-styleguide": "~11.0.0",
- "typo3/testing-framework": "^6.4.3"
+ "typo3/testing-framework": "^6.4.4"
},
"suggest": {
"ext-fileinfo": "Used for proper file type detection in the file abstraction layer",
--
GitLab