[TASK] Extbase (MVC): Avoid code-duplication in Tx_Extbase_MVC_Web_FrontendRequestHan...

Same functionality is available centrally through
Tx_Extbase_Service_ExtensionService::isActionCacheable()

Thanks to Marc Bastian Heinrichs for the idea.

Change-Id: I9d2c7eb2eec8eb58eaebd54b5446b3f88bae3675
Resolves: #13100

diff --git a/typo3/sysext/extbase/Classes/MVC/Web/FrontendRequestHandler.php b/typo3/sysext/extbase/Classes/MVC/Web/FrontendRequestHandler.php
index 15eecce..7e7c255 100644 (file)
--- a/typo3/sysext/extbase/Classes/MVC/Web/FrontendRequestHandler.php
+++ b/typo3/sysext/extbase/Classes/MVC/Web/FrontendRequestHandler.php
@@ -36,6 +36,11 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
         */
        protected $configurationManager;
 
+       /**
+        * @var Tx_Extbase_Service_ExtensionService
+        */
+       protected $extensionService;
+
        /**
         * @param Tx_Extbase_Configuration_ConfigurationManagerInterface $configurationManager
         * @return void
@@ -44,6 +49,14 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
                $this->configurationManager = $configurationManager;
        }
 
+       /**
+        * @param Tx_Extbase_Service_ExtensionService $extensionService
+        * @return void
+        */
+       public function injectExtensionService(Tx_Extbase_Service_ExtensionService $extensionService) {
+               $this->extensionService = $extensionService;
+       }
+
        /**
         * Handles the web request. The response will automatically be sent to the client.
         *
@@ -56,7 +69,7 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
                $requestHashService = $this->objectManager->get('Tx_Extbase_Security_Channel_RequestHashService'); // singleton
                $requestHashService->verifyRequest($request);
 
-               if ($this->isCacheable($request->getControllerName(), $request->getControllerActionName())) {
+               if ($this->extensionService->isActionCacheable(NULL, NULL, $request->getControllerName(), $request->getControllerActionName())) {
                        $request->setIsCached(TRUE);
                } else {
                        $contentObject = $this->configurationManager->getContentObject();
@@ -82,22 +95,5 @@ class Tx_Extbase_MVC_Web_FrontendRequestHandler extends Tx_Extbase_MVC_Web_Abstr
        public function canHandleRequest() {
                return TYPO3_MODE === 'FE';
        }
-
-       /**
-        * Determines whether the current action can be cached
-        *
-        * @param string $controllerName
-        * @param string $actionName
-        * @return boolean TRUE if the given action should be cached, otherwise FALSE
-        */
-       protected function isCacheable($controllerName, $actionName) {
-               $frameworkConfiguration = $this->configurationManager->getConfiguration(Tx_Extbase_Configuration_ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
-               if (isset($frameworkConfiguration['controllerConfiguration'][$controllerName]['nonCacheableActions'])
-                       && in_array($actionName, $frameworkConfiguration['controllerConfiguration'][$controllerName]['nonCacheableActions'])) {
-                               return FALSE;
-                       }
-               return TRUE;
-       }
-
 }
 ?>
\ No newline at end of file