Work-Related/events
Work-Related/events
1
0
mirror of https://github.com/werkraum-media/events.git synced 2024-11-23 08:56:10 +01:00
Code Issues Activity

Remove testing framework patch (#45)

Browse source 
The patch got merged upstream
This commit is contained in:
Daniel Siepmann 2023-11-27 10:58:47 +01:00 committed by GitHub
parent 81065f5c67
commit 8851a4e299
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Patches/testing-framework-request-state.patch
View file

@ -1,30 +0,0 @@
Issue: https://github.com/TYPO3/testing-framework/issues/517
PR: https://github.com/TYPO3/testing-framework/pull/518
diff --git a/Classes/Core/Functional/Framework/FrameworkState.php b/Classes/Core/Functional/Framework/FrameworkState.php
index 93716fc..f900539 100644
--- a/Classes/Core/Functional/Framework/FrameworkState.php
+++ b/Classes/Core/Functional/Framework/FrameworkState.php
@@ -50,6 +50,7 @@ class FrameworkState
// different. And code that runs after that within the test scope may fail (eg. the referenceIndex check in tearDown() that
// relies on TCA). So we back up TCA for now before executing frontend tests.
$state['globals-tca'] = $GLOBALS['TCA'];
+ $state['request'] = $GLOBALS['TYPO3_REQUEST'] ?? null;
// Can be dropped when GeneralUtility::getIndpEnv() is abandoned
$generalUtilityReflection = new \ReflectionClass(GeneralUtility::class);
@@ -67,6 +68,7 @@ class FrameworkState
public static function reset()
{
unset($GLOBALS['BE_USER']);
+ unset($GLOBALS['TYPO3_REQUEST']);
$generalUtilityReflection = new \ReflectionClass(GeneralUtility::class);
$generalUtilityIndpEnvCache = $generalUtilityReflection->getProperty('indpEnvCache');
@@ -91,6 +93,7 @@ class FrameworkState
}
$GLOBALS['TCA'] = $state['globals-tca'];
+ $GLOBALS['TYPO3_REQUEST'] = $state['request'];
$generalUtilityReflection = new \ReflectionClass(GeneralUtility::class);
$generalUtilityIndpEnvCache = $generalUtilityReflection->getProperty('indpEnvCache');

3
composer.json
View file

@ -49,8 +49,7 @@
"composer-exit-on-patch-failure": true,
"patches": {
"typo3/testing-framework": {
"Fix TypoScript record creation": "Patches/testing-framework-ts-record.patch",
"Fix Request state": "Patches/testing-framework-request-state.patch"
"Fix TypoScript record creation": "Patches/testing-framework-ts-record.patch"
}
},
"typo3/cms": {