Release v2.0.0 for TYPO3 14

Release 2.0.0

Author: peratoner-louis

.gitattributes

@@ -0,0 +1,2 @@
+/Documentation export-ignore
+/.* export-ignore

.gitignore

@@ -3,6 +3,8 @@
 *.swp
 .DS_Store
 *.vscode
+.idea/
+.claude/
 .Build/
 composer.lock
 Documentation-GENERATED-temp/
@@ -15,4 +17,3 @@ Documentation-GENERATED-temp/
 /Documentation-GENERATED-temp/*
 .php_cs.cache
 .php-cs-fixer.cache
-composer.lock

Classes/Domain/Factory/ExtendedArrayFormFactory.php

@@ -1,27 +1,28 @@
 <?php
 
-declare(strict_types=1);
-
 /*
 * This file is part of the "lia_form" Extension for TYPO3 CMS.
 *
 * For the full copyright and license information, please read the
 * LICENSE.txt file that was distributed with this source code.
 */
 
+declare(strict_types=1);
+
 namespace LIA\LiaForm\Domain\Factory;
 
 use LIA\LiaForm\Event\BeforeFormDefinitionCreatesEvent;
-use LIA\LiaForm\Services\ServerRequestService;
 use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Core\EventDispatcher\EventDispatcher;
 use TYPO3\CMS\Form\Domain\Exception\RenderingException;
 use TYPO3\CMS\Form\Domain\Factory\ArrayFormFactory;
 use TYPO3\CMS\Form\Domain\Model\FormDefinition;
 
 /**
  * This Factory build the FormDefinition object and returns it.
  * It also dispatch an event to manipulate the form configuration.
+ *
+ * Note: EventDispatcher is injected via parent class AbstractFormFactory::injectEventDispatcher().
+ * This class uses the inherited $this->eventDispatcher property.
  */
 class ExtendedArrayFormFactory extends ArrayFormFactory
 {
@@ -30,21 +31,35 @@ class ExtendedArrayFormFactory extends ArrayFormFactory
      */
     private static int $renderedForms = 0;
 
-    public function __construct(private readonly EventDispatcher $eventDispatcher) {}
-
     /**
      * Build a form definition by given configuration array.
      *
+     * @param array<string, mixed> $configuration The form configuration
      * @throws RenderingException
+     * @throws \RuntimeException If no request is available
      */
-    public function build(array $configuration, ?string $prototypeName = null, ?ServerRequestInterface $request = null): FormDefinition
-    {
+    public function build(
+        array $configuration,
+        ?string $prototypeName = null,
+        ?ServerRequestInterface $request = null
+    ): FormDefinition {
         self::$renderedForms++;
-        $eventDispatcher = $this->eventDispatcher;
-        $event = $eventDispatcher->dispatch(
+
+        // Use provided request or fall back to GLOBALS (only in edge cases)
+        $serverRequest = $request ?? $this->getServerRequestFromGlobals();
+
+        if ($this->eventDispatcher === null) {
+            throw new \RuntimeException(
+                'EventDispatcher not injected. Ensure DI is configured correctly.',
+                1709391236
+            );
+        }
+
+        /** @var BeforeFormDefinitionCreatesEvent $event */
+        $event = $this->eventDispatcher->dispatch(
             new BeforeFormDefinitionCreatesEvent(
                 $configuration,
-                ServerRequestService::getServerRequest(),
+                $serverRequest,
                 self::$renderedForms
             )
         );
@@ -53,4 +68,26 @@ public function build(array $configuration, ?string $prototypeName = null, ?Serv
 
         return parent::build($configuration, $prototypeName);
     }
+
+    /**
+     * Get server request from GLOBALS as fallback.
+     *
+     * This is only used when no request is passed to build().
+     * In normal TYPO3 frontend rendering, the request is always available.
+     *
+     * @throws \RuntimeException If no valid server request is available
+     */
+    private function getServerRequestFromGlobals(): ServerRequestInterface
+    {
+        $request = $GLOBALS['TYPO3_REQUEST'] ?? null;
+
+        if (!$request instanceof ServerRequestInterface) {
+            throw new \RuntimeException(
+                'No valid server request available. ExtendedArrayFormFactory requires a ServerRequestInterface.',
+                1709391235
+            );
+        }
+
+        return $request;
+    }
 }

Classes/Domain/Model/FormElements/PhoneAndAreaCodeElement.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the "LIA Form" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace LIA\LiaForm\Domain\Model\FormElements;
@@ -9,20 +16,52 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Form\Domain\Model\FormElements\AbstractFormElement;
 
+/**
+ * Form element for phone number with area code selection.
+ *
+ * Loads area codes from JSON configuration and allows event-based
+ * customization of the data source.
+ *
+ * Note: This class uses GeneralUtility::makeInstance() for EventDispatcher because
+ * Form Framework form elements are instantiated via the form factory without DI support.
+ * This is a documented TYPO3 Form Framework limitation.
+ *
+ * @author LOUIS INTERNET <devs@louis.info>
+ */
 class PhoneAndAreaCodeElement extends AbstractFormElement
 {
-    public function initializeFormElement()
+    /**
+     * Initialize the form element.
+     *
+     * Loads phone area codes from JSON file and sets them as options.
+     */
+    public function initializeFormElement(): void
     {
         $dispatcher = GeneralUtility::makeInstance(EventDispatcher::class);
-        $event = new BeforePhoneAreaCodeInitializeEvent('EXT:lia_form/Configuration/Data/PhoneAreaCodeList.json');
+        $event = new BeforePhoneAreaCodeInitializeEvent(
+            'EXT:lia_form/Configuration/Data/PhoneAreaCodeList.json'
+        );
         $dispatcher->dispatch($event);
         $dataSourcePath = $event->getDataSourcePath();
 
-        if (str_starts_with($dataSourcePath, 'EXT')) {
-            $dataSourcePath = GeneralUtility::getFileAbsFileName($dataSourcePath);
+        // Security: Only EXT: paths are allowed to prevent path traversal attacks
+        if (!str_starts_with($dataSourcePath, 'EXT:')) {
+            throw new \InvalidArgumentException(
+                'Only EXT: paths are allowed for dataSourcePath to prevent path traversal. Got: ' . $dataSourcePath,
+                1709391234
+            );
         }
-        $data = json_decode(file_get_contents($dataSourcePath), true);
 
-        $this->setProperty('options', $data);
+        $dataSourcePath = GeneralUtility::getFileAbsFileName($dataSourcePath);
+
+        $jsonContent = file_get_contents($dataSourcePath);
+        if ($jsonContent === false) {
+            return;
+        }
+
+        $data = json_decode($jsonContent, true);
+        if (is_array($data)) {
+            $this->setProperty('options', $data);
+        }
     }
 }

Classes/Event/BeforeFormDefinitionCreatesEvent.php

@@ -1,5 +1,12 @@
 <?php
 
+/*
+ * This file is part of the "LIA Form" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 /*
@@ -20,40 +27,52 @@
 final class BeforeFormDefinitionCreatesEvent
 {
     /**
-     * Event constructor.
+     * Create event instance.
+     *
+     * @param array<string, mixed> $formDefinitionConfigArray The form configuration array
+     * @param ServerRequestInterface $request The current server request
+     * @param int $renderedForms Count of forms rendered in this request
      */
     public function __construct(
-        private array $formDefintionConfigArray,
+        private array $formDefinitionConfigArray,
         private readonly ServerRequestInterface $request,
         private readonly int $renderedForms
     ) {}
 
     /**
-     * Returns the formDefintionConfigArray
+     * Get the form definition configuration array.
+     *
+     * @return array<string, mixed> The form configuration
      */
     public function getFormDefinitionConfigArray(): array
     {
-        return $this->formDefintionConfigArray;
+        return $this->formDefinitionConfigArray;
     }
 
     /**
-     * Set the formDefinitionConfigArray
+     * Set the form definition configuration array.
+     *
+     * @param array<string, mixed> $newFormDefinitionConfigArray The new form configuration
      */
     public function setFormDefinitionConfigArray(array $newFormDefinitionConfigArray): void
     {
-        $this->formDefintionConfigArray = $newFormDefinitionConfigArray;
+        $this->formDefinitionConfigArray = $newFormDefinitionConfigArray;
     }
 
     /**
-     * Return the ServerRequestInterface
+     * Get the server request interface.
+     *
+     * @return ServerRequestInterface The current request
      */
     public function getServerRequestInterface(): ServerRequestInterface
     {
         return $this->request;
     }
 
     /**
-     * Returns the count of the rendered forms.
+     * Get the count of rendered forms.
+     *
+     * @return int Number of forms rendered in this request
      */
     public function getRenderedForms(): int
     {

Classes/Event/BeforePhoneAreaCodeInitializeEvent.php

@@ -1,30 +1,48 @@
 <?php
 
+/*
+ * This file is part of the "LIA Form" Extension for TYPO3 CMS.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ */
+
 declare(strict_types=1);
 
 namespace LIA\LiaForm\Event;
 
+/**
+ * Event dispatched before phone area code initialization.
+ *
+ * Allows customization of the data source path for phone area codes.
+ *
+ * @author LOUIS INTERNET <devs@louis.info>
+ */
 final class BeforePhoneAreaCodeInitializeEvent
 {
     /**
-     * Event constructor
+     * Create event instance.
      *
-     * @param string $dataSourcePath
+     * @param string $dataSourcePath Path to the area code data source
      */
-    public function __construct(private string $dataSourcePath) {}
+    public function __construct(
+        private string $dataSourcePath
+    ) {}
 
     /**
-     * Get the value of dataSourcePath
+     * Get the data source path.
+     *
+     * @return string The path to the area code data source
      */
     public function getDataSourcePath(): string
     {
         return $this->dataSourcePath;
     }
 
     /**
-     * Set the value of dataSourcePath
+     * Set the data source path.
      *
-     * @param string $dataSourcePath
+     * @param string $dataSourcePath The new path to the area code data source
      */
     public function setDataSourcePath(string $dataSourcePath): void
     {