[TASK] Enable request object (e.g. for workflows)

in2code-de · Nov 12, 2024 · a075ed1 · a075ed1
1 parent 0078169
commit a075ed1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Classes/Utility/EnvironmentUtility.php b/Classes/Utility/EnvironmentUtility.php
@@ -8,26 +8,18 @@
 
 class EnvironmentUtility
 {
-    /**
-     * @return bool
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
     public static function isFrontend(): bool
     {
-        if (isset($GLOBALS['TYPO3_REQUEST']) === false) {
+        if (ObjectUtility::getRequest() === null) {
             // E.g. when called from CLI
             return false;
         }
         return ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
     }
 
-    /**
-     * @return bool
-     * @SuppressWarnings(PHPMD.Superglobals)
-     */
     public static function isBackend(): bool
     {
-        if (isset($GLOBALS['TYPO3_REQUEST']) === false) {
+        if (ObjectUtility::getRequest() === null) {
             // E.g. when called from CLI
             return false;
         }

diff --git a/Classes/Utility/ObjectUtility.php b/Classes/Utility/ObjectUtility.php
@@ -6,6 +6,7 @@
 use DateTime;
 use In2code\Lux\Domain\Model\Transfer\FilterDto;
 use In2code\Lux\Domain\Service\ConfigurationService;
+use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -45,4 +46,13 @@ public static function getFilterWithLimit(int $limit = 10): FilterDto
     {
         return GeneralUtility::makeInstance(FilterDto::class)->setLimit(10);
     }
+
+    /**
+     * @return ServerRequestInterface|null
+     * @SuppressWarnings(PHPMD.Superglobals)
+     */
+    public static function getRequest(): ?ServerRequestInterface
+    {
+        return $GLOBALS['TYPO3_REQUEST'] ?? null;
+    }
 }