From 2b071e887838a483e311843abe4def125a60fa92 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 27 Nov 2023 10:52:22 +0100
Subject: [PATCH] Remove testing framework patch

The patch got merged upstream
---
 Patches/testing-framework-request-state.patch | 30 -------------------
 composer.json                                 |  3 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 Patches/testing-framework-request-state.patch

diff --git a/Patches/testing-framework-request-state.patch b/Patches/testing-framework-request-state.patch
deleted file mode 100644
index 73768d04..00000000
--- a/Patches/testing-framework-request-state.patch
+++ /dev/null
@@ -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');
diff --git a/composer.json b/composer.json
index 08247665..0b69c7b9 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {