From d7d19ee06f0ba8f0cacf60b5be00d3aecbdefdcb Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Mon, 14 Jun 2021 13:44:19 +0200 Subject: [PATCH] [TASK] Raise typo3/testing-framework:^6.8.4 Acceptance tests now properly configure graphics magick, so image generation works for them. This triggeres different and more relevant code paths. composer req --dev typo3/testing-framework:^6.8.4 composer req --dev typo3/testing-framework:^6.8.4 -d typo3/sysext/core --no-update Change-Id: I65dd2061c13479fb031373973860d3204dfe4bbf Resolves: #94339 Releases: master, 10.4 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69484 Tested-by: core-ci Tested-by: Jochen Tested-by: Oliver Bartsch Tested-by: Christian Kuhn Reviewed-by: Jochen Reviewed-by: Oliver Bartsch Reviewed-by: Christian Kuhn --- composer.json | 2 +- composer.lock | 14 +++++++------- typo3/sysext/core/composer.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 84efa9811587..5cd68d7ab60c 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.3" + "typo3/testing-framework": "^6.8.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 5aae2fad26a5..1dc844afc27a 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": "4723051a66990c5301b6b18f55343e38", + "content-hash": "d543948e6b1252d91eb89ed0c068331c", "packages": [ { "name": "bacon/bacon-qr-code", @@ -7541,16 +7541,16 @@ }, { "name": "typo3/testing-framework", - "version": "6.8.3", + "version": "6.8.4", "source": { "type": "git", "url": "https://github.com/TYPO3/testing-framework.git", - "reference": "554fabca86975ec895eb443a017e09d1e37abc38" + "reference": "0999567ed9450888a3bc050bf1f8bc8dfcbb4edc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/554fabca86975ec895eb443a017e09d1e37abc38", - "reference": "554fabca86975ec895eb443a017e09d1e37abc38", + "url": "https://api.github.com/repos/TYPO3/testing-framework/zipball/0999567ed9450888a3bc050bf1f8bc8dfcbb4edc", + "reference": "0999567ed9450888a3bc050bf1f8bc8dfcbb4edc", "shasum": "" }, "require": { @@ -7600,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.3" + "source": "https://github.com/TYPO3/testing-framework/tree/6.8.4" }, - "time": "2021-06-12T20:34:13+00:00" + "time": "2021-06-14T12:34:09+00:00" } ], "aliases": [], diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json index e67dcebf7e4d..09415ff067f7 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.3" + "typo3/testing-framework": "^6.8.4" }, "suggest": { "ext-fileinfo": "Used for proper file type detection in the file abstraction layer",