Reduce usage of GLOBALS

lochmueller · Nov 19, 2023 · 02ac119 · 02ac119
1 parent 5d5af5a
commit 02ac119
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
@@ -234,7 +234,7 @@ protected function isDateOutOfTypoScriptConfiguration(\DateTime $dateTime): bool
     protected function return404Page(): ResponseInterface
     {
         return GeneralUtility::makeInstance(ErrorController::class)->pageNotFoundAction(
-            $GLOBALS['TYPO3_REQUEST'],
+            $this->request,
             'The requested page does not exist',
             ['code' => PageAccessFailureReasons::PAGE_NOT_FOUND]
         );

diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -12,6 +12,7 @@
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
 use TYPO3\CMS\Core\Pagination\ArrayPaginator;
 use TYPO3\CMS\Core\Pagination\SimplePagination;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
@@ -23,13 +24,17 @@
 #[Controller]
 class BackendController extends AbstractController
 {
+    protected LanguageService $languageService;
+
     private const PATH_CORE_LOCALLANG = 'LLL:EXT:core/Resources/Private/Language/locallang_common.xlf';
 
     public const OPTIONS_KEY = 'calendarize_be';
 
     public function __construct(
-        protected readonly ModuleTemplateFactory $moduleTemplateFactory
+        protected readonly ModuleTemplateFactory $moduleTemplateFactory,
+        protected readonly LanguageServiceFactory $languageServiceFactory,
     ) {
+        $this->languageService = $this->languageServiceFactory->createFromUserPreferences($this->getBackendUser());
     }
 
     public function initializeListAction(): void
@@ -85,8 +90,8 @@ public function listAction(OptionRequest $options = null, int $currentPage = 1):
             'pagination' => $pagination,
             'totalAmount' => \count($indices),
             'filterOptions' => [
-                'asc' => $this->getLanguageService()->sL(self::PATH_CORE_LOCALLANG . ':ascending') ?: 'ascending',
-                'desc' => $this->getLanguageService()->sL(self::PATH_CORE_LOCALLANG . ':descending') ?: 'descending',
+                'asc' => $this->languageService->sL(self::PATH_CORE_LOCALLANG . ':ascending') ?: 'ascending',
+                'desc' => $this->languageService->sL(self::PATH_CORE_LOCALLANG . ':descending') ?: 'descending',
             ],
         ]);
 
@@ -223,9 +228,4 @@ protected function getBackendUser(): ?BackendUserAuthentication
     {
         return $GLOBALS['BE_USER'];
     }
-
-    protected function getLanguageService(): ?LanguageService
-    {
-        return $GLOBALS['LANG'] ?? null;
-    }
 }
diff --git a/Classes/Controller/CalendarController.php b/Classes/Controller/CalendarController.php
@@ -865,9 +865,7 @@ protected function getCurrentConfigurations(): array
 
     protected function getBaseUri(): string
     {
-        $request = $GLOBALS['TYPO3_REQUEST'];
-
-        return $request->getAttribute('normalizedParams')->getSiteUrl();
+        return $this->request->getAttribute('normalizedParams')->getSiteUrl();
     }
 
     protected function getTypoScriptFrontendController(): TypoScriptFrontendController

diff --git a/Classes/DataProcessing/DisableLanguageMenuProcessor.php b/Classes/DataProcessing/DisableLanguageMenuProcessor.php
@@ -50,7 +50,7 @@ public function process(
         if (!$processorConfiguration['menus']) {
             return $processedData;
         }
-        $indexId = $this->getIndexId();
+        $indexId = $this->getIndexId($cObj->getRequest());
         if (0 === $indexId) {
             return $processedData;
         }
@@ -138,10 +138,9 @@ protected function handleMenu(array &$menu, array $availableLanguages): void
         }
     }
 
-    protected function getIndexId(): int
+    protected function getIndexId(ServerRequestInterface $request): int
     {
         $indexId = 0;
-        $request = $this->getRequest();
         /** @var PageArguments $pageArguments */
         $pageArguments = $request->getAttribute('routing');
         if (isset($pageArguments->getRouteArguments()['tx_calendarize_calendar']['index'])) {
@@ -152,9 +151,4 @@ protected function getIndexId(): int
 
         return $indexId;
     }
-
-    protected function getRequest(): ServerRequestInterface
-    {
-        return $GLOBALS['TYPO3_REQUEST'];
-    }
 }
diff --git a/Classes/ViewHelpers/LanguageViewHelper.php b/Classes/ViewHelpers/LanguageViewHelper.php
@@ -6,6 +6,7 @@
 
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Site\Entity\SiteLanguage;
+use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 
 /**
  * LanguageViewHelper.
@@ -25,6 +26,9 @@ public function render(): string
 
     protected function getRequest(): ServerRequestInterface
     {
-        return $GLOBALS['TYPO3_REQUEST'];
+        /** @var RenderingContext $renderingContext */
+        $renderingContext = $this->renderingContext;
+
+        return $renderingContext->getRequest();
     }
 }