[TASK] Make ext:form ConfigurationService stateless

Refactor ext:form ConfigurationService towards DI.
The main FormFrontendController is refactored
along the way. Both their test cases are turned
into functional tests, to other tests are adapted
slightly.

Resolves: #104641
Releases: main
Change-Id: I555ac4c4489eaf4b29e07240262bca362ac97dd6
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/85654
Tested-by: Anja Leichsenring <[email protected]>
Tested-by: Christian Kuhn <[email protected]>
Reviewed-by: Christian Kuhn <[email protected]>
Reviewed-by: Anja Leichsenring <[email protected]>
Tested-by: Stefan Bürk <[email protected]>
Reviewed-by: Stefan Bürk <[email protected]>
Tested-by: core-ci <[email protected]>

Author: lolli42

Build/phpstan/phpstan-baseline.neon

@@ -1210,16 +1210,6 @@ parameters:
 			count: 5
 			path: ../../typo3/sysext/form/Classes/Controller/FormManagerController.php
 
-		-
-			message: "#^Call to sprintf contains 4 placeholders, 5 values given\\.$#"
-			count: 1
-			path: ../../typo3/sysext/form/Classes/Domain/Configuration/ConfigurationService.php
-
-		-
-			message: "#^Variable \\$formElements on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 2
-			path: ../../typo3/sysext/form/Classes/Domain/Configuration/ConfigurationService.php
-
 		-
 			message: "#^Result of && is always false\\.$#"
 			count: 1

typo3/sysext/form/Classes/Controller/FormFrontendController.php

@@ -39,18 +39,12 @@
  */
 class FormFrontendController extends ActionController
 {
-    /**
-     * @var \TYPO3\CMS\Form\Mvc\Persistence\FormPersistenceManagerInterface
-     */
-    protected $formPersistenceManager;
-
-    /**
-     * @internal
-     */
-    public function injectFormPersistenceManager(FormPersistenceManagerInterface $formPersistenceManager)
-    {
-        $this->formPersistenceManager = $formPersistenceManager;
-    }
+    public function __construct(
+        protected readonly ConfigurationService $configurationService,
+        protected readonly FormPersistenceManagerInterface $formPersistenceManager,
+        protected readonly FlexFormService $flexFormService,
+        protected readonly FlexFormTools $flexFormTools,
+    ) {}
 
     /**
      * Take the form which should be rendered from the plugin settings
@@ -72,7 +66,6 @@ public function renderAction(): ResponseInterface
             $formDefinition['identifier'] .= '-' . ($this->request->getAttribute('currentContentObject')?->data['uid'] ?? '');
         }
         $this->view->assign('formConfiguration', $formDefinition);
-
         return $this->htmlResponse();
     }
 
@@ -94,22 +87,16 @@ public function performAction(): ResponseInterface
     protected function overrideByFlexFormSettings(array $formDefinition): array
     {
         $flexFormData = GeneralUtility::xml2array($this->request->getAttribute('currentContentObject')?->data['pi_flexform'] ?? '');
-
         if (!is_array($flexFormData)) {
             return $formDefinition;
         }
-
         if (isset($formDefinition['finishers'])) {
             $prototypeName = $formDefinition['prototypeName'] ?? 'standard';
-            $configurationService = GeneralUtility::makeInstance(ConfigurationService::class);
-            $prototypeConfiguration = $configurationService->getPrototypeConfiguration($prototypeName);
-
+            $prototypeConfiguration = $this->configurationService->getPrototypeConfiguration($prototypeName);
             foreach ($formDefinition['finishers'] as $index => $formFinisherDefinition) {
                 $finisherIdentifier = $formFinisherDefinition['identifier'];
-
                 $sheetIdentifier = $this->getFlexformSheetIdentifier($formDefinition, $prototypeName, $finisherIdentifier);
                 $flexFormSheetSettings = $this->getFlexFormSettingsFromSheet($flexFormData, $sheetIdentifier);
-
                 if (($this->settings['overrideFinishers'] ?? false) && isset($flexFormSheetSettings['finishers'][$finisherIdentifier])) {
                     $prototypeFinisherDefinition = $prototypeConfiguration['finishersDefinition'][$finisherIdentifier] ?? [];
                     $converterDto = GeneralUtility::makeInstance(
@@ -119,7 +106,6 @@ protected function overrideByFlexFormSettings(array $formDefinition): array
                         $finisherIdentifier,
                         $flexFormSheetSettings
                     );
-
                     // Iterate over all `prototypes.<prototypeName>.finishersDefinition.<finisherIdentifier>.FormEngine.elements` values
                     GeneralUtility::makeInstance(ArrayProcessor::class, $prototypeFinisherDefinition['FormEngine']['elements'])->forEach(
                         GeneralUtility::makeInstance(
@@ -129,19 +115,15 @@ protected function overrideByFlexFormSettings(array $formDefinition): array
                             GeneralUtility::makeInstance(FinisherOptionsFlexFormOverridesConverter::class, $converterDto)
                         )
                     );
-
                     $formDefinition['finishers'][$index] = $converterDto->getFinisherDefinition();
                 }
             }
         }
         return $formDefinition;
     }
 
-    protected function getFlexformSheetIdentifier(
-        array $formDefinition,
-        string $prototypeName,
-        string $finisherIdentifier
-    ): string {
+    protected function getFlexformSheetIdentifier(array $formDefinition, string $prototypeName, string $finisherIdentifier): string
+    {
         return md5(
             implode('', [
                 $formDefinition['persistenceIdentifier'],
@@ -152,10 +134,8 @@ protected function getFlexformSheetIdentifier(
         );
     }
 
-    protected function getFlexFormSettingsFromSheet(
-        array $flexForm,
-        string $sheetIdentifier
-    ): array {
+    protected function getFlexFormSettingsFromSheet(array $flexForm, string $sheetIdentifier): array
+    {
         $sheetData = [];
         $sheetData['data'] = array_filter(
             $flexForm['data'] ?? [],
@@ -164,15 +144,10 @@ static function ($key) use ($sheetIdentifier) {
             },
             ARRAY_FILTER_USE_KEY
         );
-
         if (empty($sheetData['data'])) {
             return [];
         }
-
-        $flexFormService = GeneralUtility::makeInstance(FlexFormService::class);
-        $flexFormTools = GeneralUtility::makeInstance(FlexFormTools::class);
-
-        $sheetDataXml = $flexFormTools->flexArray2Xml($sheetData);
-        return $flexFormService->convertFlexFormContentToArray($sheetDataXml)['settings'] ?? [];
+        $sheetDataXml = $this->flexFormTools->flexArray2Xml($sheetData);
+        return $this->flexFormService->convertFlexFormContentToArray($sheetDataXml)['settings'] ?? [];
     }
 }