[BUGFIX] Create special boot-time TemplatePaths which avoids Configur…

…ationManager

Helps partially solve some issues on v12 when loading form instances from
templates before TYPO3 is fully initialized.

Classes/Integration/Configuration/ConfigurationContext.php

@@ -0,0 +1,19 @@
+<?php
+namespace FluidTYPO3\Flux\Integration\Configuration;
+
+use TYPO3\CMS\Core\SingletonInterface;
+
+class ConfigurationContext implements SingletonInterface
+{
+    private bool $bootMode = false;
+
+    public function isBootMode(): bool
+    {
+        return $this->bootMode;
+    }
+
+    public function setBootMode(bool $bootMode): void
+    {
+        $this->bootMode = $bootMode;
+    }
+}

Classes/Integration/Configuration/SpooledConfigurationApplicator.php

@@ -15,19 +15,25 @@
 use FluidTYPO3\Flux\Provider\Provider;
 use FluidTYPO3\Flux\Provider\ProviderInterface;
 use FluidTYPO3\Flux\Utility\ExtensionNamingUtility;
+use FluidTYPO3\Flux\Utility\RequestBuilder;
 use TYPO3\CMS\Core\Core\ApplicationContext;
 use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
-use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3Fluid\Fluid\Exception;
 
 class SpooledConfigurationApplicator
 {
+    public function __construct(private ConfigurationContext $context)
+    {
+    }
+
     protected static ?ContentTypeBuilder $contentTypeBuilder = null;
 
     public function processData(): void
     {
+        $this->context->setBootMode(true);
+
         // Initialize the TCA needed by "template as CType" integrations
         static::spoolQueuedContentTypeTableConfigurations(
             Core::getQueuedContentTypeRegistrations()
@@ -47,6 +53,8 @@ public function processData(): void
 
         $this->spoolQueuedContentTypeRegistrations(Core::getQueuedContentTypeRegistrations());
         Core::clearQueuedContentTypeRegistrations();
+
+        $this->context->setBootMode(false);
     }
 
     public static function spoolQueuedContentTypeTableConfigurations(array $queue): void
@@ -112,15 +120,13 @@ protected function spoolQueuedContentTypeRegistrations(array $queue): void
 
         $self = $this;
 
-        // We have to fake a ServerRequest here, since internally Extbase's ConfigurationManager will otherwise always
-        // instance BackendConfigurationManager and hold on to that instance, which means that any subsequent code that
-        // injects ConfigurationManager will contain a BackendConfigurationManager even in frontend context.
-        // This results in various issues such as inability to correctly resolve the correct controller for an Extbase
-        // plugin on requests that don't already have a cached version of Flux forms / contains dynamic Flux forms.
-        $GLOBALS['TYPO3_REQUEST'] = $GLOBALS['TYPO3_REQUEST'] ?? (new ServerRequest())->withAttribute(
-            'applicationType',
-            defined('TYPO3_REQUESTTYPE') ? constant('TYPO3_REQUESTTYPE') : SystemEnvironmentBuilder::REQUESTTYPE_FE
-        );
+        $backup = $GLOBALS['TYPO3_REQUEST'] ?? null;
+
+        if (version_compare(VersionNumberUtility::getCurrentTypo3Version(), '12.3', '<')) {
+            /** @var RequestBuilder $requestBuilder */
+            $requestBuilder = GeneralUtility::makeInstance(RequestBuilder::class);
+            $GLOBALS['TYPO3_REQUEST'] = $requestBuilder->getServerRequest();
+        }
 
         uasort(
             $providers,
@@ -144,6 +150,8 @@ function (ProviderInterface $item1, ProviderInterface $item2) use ($self) {
                 }
             }
         }
+
+        $GLOBALS['TYPO3_REQUEST'] = $backup;
     }
 
     private function resolveSortingValue(?Form $form): int
@@ -169,7 +177,7 @@ protected function getApplicationContext(): ApplicationContext
     protected static function getContentTypeBuilder(): ContentTypeBuilder
     {
         /** @var ContentTypeBuilder $contentTypeBuilder */
-        $contentTypeBuilder = GeneralUtility::makeInstance(ContentTypeBuilder::class);
+        $contentTypeBuilder = GeneralUtility::makeInstance(ContentTypeBuilder::class, true);
         return $contentTypeBuilder;
     }
 

Classes/Utility/RenderingContextBuilder.php

@@ -9,6 +9,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Flux\Integration\Configuration\ConfigurationContext;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
@@ -21,9 +23,14 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
+use TYPO3Fluid\Fluid\View\TemplatePaths;
 
 class RenderingContextBuilder
 {
+    public function __construct(private ConfigurationContext $context)
+    {
+    }
+
     public function buildRenderingContextFor(
         string $extensionIdentity,
         string $controllerName,
@@ -58,8 +65,20 @@ public function buildRenderingContextFor(
             $renderingContext->setRequest($request);
         }
 
-        $templatePaths = $renderingContext->getTemplatePaths();
-        $templatePaths->fillDefaultsByPackageName($extensionKey);
+        if (!$this->context->isBootMode()) {
+            $templatePaths = $renderingContext->getTemplatePaths();
+        } else {
+            $resources = ExtensionManagementUtility::extPath($extensionKey) . 'Resources/Private/';
+            $paths = [
+                TemplatePaths::CONFIG_TEMPLATEROOTPATHS => [$resources . 'Templates/'],
+                TemplatePaths::CONFIG_PARTIALROOTPATHS => [$resources . 'Partials/'],
+                TemplatePaths::CONFIG_LAYOUTROOTPATHS => [$resources . 'Layouts/'],
+            ];
+            $templatePaths = GeneralUtility::makeInstance(TemplatePaths::class, $paths);
+            $templatePaths->fillDefaultsByPackageName($extensionKey);
+            $renderingContext->setTemplatePaths($templatePaths);
+        }
+
 
         if ($templatePathAndFilename) {
             $templatePaths->setTemplatePathAndFilename($templatePathAndFilename);

Configuration/Services.yaml

@@ -12,6 +12,10 @@ services:
     autowire: false
   TYPO3\CMS\Backend\View\BackendViewFactory:
     public: true
+  FluidTYPO3\Flux\Integration\Configuration\SpooledConfigurationApplicator:
+    public: true
+  FluidTYPO3\Flux\Utility\RenderingContextBuilder:
+    public: true
 
   FluidTYPO3\Flux\Integration\Event\PageContentPreviewRenderingEventListener:
     tags:

Tests/Unit/Integration/Configuration/SpooledConfigurationApplicatorTest.php

@@ -12,6 +12,7 @@
 use FluidTYPO3\Flux\Content\TypeDefinition\ContentTypeDefinitionInterface;
 use FluidTYPO3\Flux\Content\TypeDefinition\FluidRenderingContentTypeDefinitionInterface;
 use FluidTYPO3\Flux\Form;
+use FluidTYPO3\Flux\Integration\Configuration\ConfigurationContext;
 use FluidTYPO3\Flux\Integration\Configuration\SpooledConfigurationApplicator;
 use FluidTYPO3\Flux\Integration\ContentTypeBuilder;
 use FluidTYPO3\Flux\Integration\ViewBuilder;
@@ -95,8 +96,11 @@ protected function setUp(): void
         $this->contentTypeManager->method('fetchContentTypes')
             ->willReturn([$this->contentTypeDefinition, $this->contentTypeDefinition2]);
 
+        $configurationContext = new ConfigurationContext();
+
         $this->subject = $this->getMockBuilder(SpooledConfigurationApplicator::class)
             ->setMethods(['getApplicationContext', 'getContentTypeManager'])
+            ->setConstructorArgs([$configurationContext])
             ->getMock();
         $this->subject->method('getContentTypeManager')->willReturn($this->contentTypeManager);