Move provisioning code to provisioner (#38)

Author: helhum

.styleci.yml

@@ -55,4 +55,5 @@ finder:
     - "*.php"
   exclude:
     - ".Build"
+  not-name:
     - "ext_emconf.php"

Classes/Core/FrontendRenderingProvisioner.php

@@ -37,17 +37,21 @@ public function provision(TypoScriptFrontendController $typoScriptFrontendContro
         $this->configureLinkBuilding($typoScriptFrontendController);
         $this->configurePageRenderer($typoScriptFrontendController);
         $this->configureImageProcessing($typoScriptFrontendController);
+        $this->fixNoScriptInclude($typoScriptFrontendController);
 
         // Create new top level content object which is required by some rendering methods
         $typoScriptFrontendController->newCObj();
+
+        // Bypass any other page rendering, by including our own dummy rendering
+        $typoScriptFrontendController->config['config']['pageGenScript'] = 'EXT:typoscript_rendering/Scripts/DummyRendering.php';
     }
 
     /**
      * @param TypoScriptFrontendController $typoScriptFrontendController
      *
      * @return void
      */
-    protected function configureLinkBuilding(TypoScriptFrontendController $typoScriptFrontendController)
+    private function configureLinkBuilding(TypoScriptFrontendController $typoScriptFrontendController)
     {
         // Mount point parameters
         if ($typoScriptFrontendController->config['config']['MP_defaults']) {
@@ -97,7 +101,7 @@ protected function configureLinkBuilding(TypoScriptFrontendController $typoScrip
      *
      * @return void
      */
-    protected function configurePageRenderer(TypoScriptFrontendController $typoScriptFrontendController)
+    private function configurePageRenderer(TypoScriptFrontendController $typoScriptFrontendController)
     {
         $pageRenderer = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Page\\PageRenderer');
         // Setting XHTML-doctype from doctype
@@ -138,11 +142,24 @@ protected function configurePageRenderer(TypoScriptFrontendController $typoScrip
      *
      * @return void
      */
-    protected function configureImageProcessing(TypoScriptFrontendController $typoScriptFrontendController)
+    private function configureImageProcessing(TypoScriptFrontendController $typoScriptFrontendController)
     {
         $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'] = isset($typoScriptFrontendController->config['config']['noScaleUp']) ? '' . $typoScriptFrontendController->config['config']['noScaleUp'] : $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'];
         if (property_exists($typoScriptFrontendController, 'TYPO3_CONF_VARS')) {
             $typoScriptFrontendController->TYPO3_CONF_VARS['GFX']['im_noScaleUp'] = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_noScaleUp'];
         }
     }
+
+    /**
+     * @param TypoScriptFrontendController $typoScriptFrontendController
+     *
+     * @return void
+     */
+    private function fixNoScriptInclude(TypoScriptFrontendController $typoScriptFrontendController)
+    {
+        $GLOBALS['TYPO3_CONF_VARS']['FE']['noPHPscriptInclude'] = false;
+        if (property_exists($typoScriptFrontendController, 'TYPO3_CONF_VARS')) {
+            $typoScriptFrontendController->TYPO3_CONF_VARS['FE']['noPHPscriptInclude'] = $GLOBALS['TYPO3_CONF_VARS']['FE']['noPHPscriptInclude'];
+        }
+    }
 }

Classes/RenderingDispatcher.php

@@ -74,13 +74,6 @@ public function checkDataSubmission(TypoScriptFrontendController $typoScriptFron
             $renderer->renderRequest($request, $response, $renderingContext);
 
             $typoScriptFrontendController->content = $response->getContent();
-            $typoScriptFrontendController->config['config']['pageGenScript'] = 'EXT:typoscript_rendering/Scripts/DummyRendering.php';
-            // Force DummyRendering to be included, even if TYPO3 setup disallows inclusion of PHP scripts
-            if (property_exists($typoScriptFrontendController, 'TYPO3_CONF_VARS')) {
-                $typoScriptFrontendController->TYPO3_CONF_VARS['FE']['noPHPscriptInclude'] = false;
-            } else {
-                $GLOBALS['TYPO3_CONF_VARS']['FE']['noPHPscriptInclude'] = false;
-            }
         }
     }