Use a factory to create Processor instances

The Processor uses a somewhat surprising pattern of returning new instances
from with*() methods to assure instance immutability.

Thus, we cannot easily configure it as a service in the Symfony DIC
but need to resort to writing a factory for it.

Author: mpdude

DependencyInjection/WebfactoryShortcodeExtension.php

@@ -6,7 +6,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Thunder\Shortcode\Processor\Processor;
 
 /**
  * Loads the bundle configuration.
@@ -23,8 +22,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $container->setAlias('webfactory_shortcode.parser', 'webfactory_shortcode.'.$config['parser'].'_parser');
 
-        $container->getDefinition(Processor::class)
-            ->addMethodCall('withRecursionDepth', [$config['recursion_depth']])
-            ->addMethodCall('withMaxIterations', [$config['max_iterations']]);
+        $container->setParameter('webfactory_shortcode.recursion_depth', $config['recursion_depth']);
+        $container->setParameter('webfactory_shortcode.max_iterations', $config['max_iterations']);
     }
 }

Factory/ProcessorFactory.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Webfactory\ShortcodeBundle\Factory;
+
+use Thunder\Shortcode\EventContainer\EventContainer;
+use Thunder\Shortcode\HandlerContainer\HandlerContainer;
+use Thunder\Shortcode\Parser\ParserInterface;
+use Thunder\Shortcode\Processor\Processor;
+
+class ProcessorFactory
+{
+    /**
+     * @var ParserInterface
+     */
+    private $parserInterface;
+
+    /**
+     * @var HandlerContainer
+     */
+    private $handlerContainer;
+
+    /**
+     * @var EventContainer
+     */
+    private $eventContainer;
+
+    /**
+     * @var int
+     */
+    private $recursionDepth;
+
+    /**
+     * @var int
+     */
+    private $maxIterations;
+
+    public function __construct(ParserInterface $parserInterface, HandlerContainer $handlerContainer, EventContainer $eventContainer, ?int $recursionDepth, ?int $maxIterations)
+    {
+        $this->parserInterface = $parserInterface;
+        $this->handlerContainer = $handlerContainer;
+        $this->eventContainer = $eventContainer;
+        $this->recursionDepth = $recursionDepth;
+        $this->maxIterations = $maxIterations;
+    }
+
+    public function create(): Processor
+    {
+        $processor = new Processor($this->parserInterface, $this->handlerContainer);
+
+        return $processor->withEventContainer($this->eventContainer)->withRecursionDepth($this->recursionDepth)->withMaxIterations($this->maxIterations);
+    }
+}

Resources/config/shortcodes.xml

@@ -11,13 +11,17 @@
         <service id="webfactory_shortcode.regular_parser" class="Thunder\Shortcode\Parser\RegularParser"/>
         <service id="webfactory_shortcode.regex_parser" class="Thunder\Shortcode\Parser\RegexParser"/>
 
-        <!-- Definition of a Shortcode Processor instance. -->
-        <service id="Thunder\Shortcode\Processor\Processor">
+        <service id="Webfactory\ShortcodeBundle\Factory\ProcessorFactory">
             <argument type="service" id="webfactory_shortcode.parser" />
             <argument type="service" id="Thunder\Shortcode\HandlerContainer\HandlerContainer" />
-            <call method="withEventContainer">
-                <argument type="service" id="Thunder\Shortcode\EventContainer\EventContainer" />
-            </call>
+            <argument type="service" id="Thunder\Shortcode\EventContainer\EventContainer" />
+            <argument>%webfactory_shortcode.recursion_depth%</argument>
+            <argument>%webfactory_shortcode.max_iterations%</argument>
+        </service>
+
+        <!-- Definition of a Shortcode Processor instance. -->
+        <service id="Thunder\Shortcode\Processor\Processor">
+            <factory service="Webfactory\ShortcodeBundle\Factory\ProcessorFactory" method="create" />
         </service>
 
         <!-- Definition of a Shortcode EventContainer instance. -->