Merge pull request #3 from webfactory/89286_increase_iteration_count

89286 increase iteration count

Author: relthyg

DependencyInjection/Compiler/ShortcodeCompilerPass.php

@@ -7,19 +7,19 @@
 use Symfony\Component\DependencyInjection\Reference;
 
 /**
- * CompilerPass that prepares the shortcode facade and the GuideController (if configured).
+ * CompilerPass that prepares the shortcode handler container and the GuideController (if configured).
  */
 class ShortcodeCompilerPass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
         $shortcodeServices = $container->findTaggedServiceIds('webfactory.shortcode');
 
-        // add services tagged with webfactory.shortcode.facade as handlers to the short code facade
-        $serviceDefinition = $container->findDefinition('webfactory.shortcode.facade');
+        // add services tagged with webfactory.shortcode as handlers to the short code handler container
+        $handlerContainer = $container->findDefinition('webfactory.shortcode.handler_container');
         foreach ($shortcodeServices as $id => $shortcodeTags) {
             foreach ($shortcodeTags as $shortcodeTag) {
-                $serviceDefinition->addMethodCall('addHandler', [$shortcodeTag['shortcode'], new Reference($id)]);
+                $handlerContainer->addMethodCall('add', [$shortcodeTag['shortcode'], new Reference($id)]);
             }
         }
 

Resources/config/shortcodes.xml

@@ -5,10 +5,24 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
 
-        <!-- Definition of a ShortcodeFacade instance. -->
-        <service id="webfactory.shortcode.facade" class="Thunder\Shortcode\ShortcodeFacade">
+        <!-- Definition of a Shortcode HandlerContainer instance. -->
+        <service id="webfactory.shortcode.handler_container" class="Thunder\Shortcode\HandlerContainer\HandlerContainer">
+        </service>
+
+        <!-- Definition of a Shortcode RegularParser instance. -->
+        <service id="webfactory.shortcode.regular_parser" class="Thunder\Shortcode\Parser\RegularParser">
+        </service>
+
+        <!-- Definition of a Shortcode Processor instance. -->
+        <service id="webfactory.shortcode.processor" class="Thunder\Shortcode\Processor\Processor">
+            <argument type="service" id="webfactory.shortcode.regular_parser" />
+            <argument type="service" id="webfactory.shortcode.handler_container" />
+        </service>
+
+        <!-- Definition of a Shortcode EventContainer instance. -->
+        <service id="webfactory.shortcode.event_container" class="Thunder\Shortcode\EventContainer\EventContainer">
             <!-- Event handler that removes <p>...</p> tag that directly wrap shortcodes. -->
-            <call method="addEventHandler">
+            <call method="addListener">
                 <argument type="constant">\Thunder\Shortcode\Events::REPLACE_SHORTCODES</argument>
                 <argument type="service">
                     <service class="Webfactory\ShortcodeBundle\Handler\RemoveWrappingParagraphElementsEventHandler"/>
@@ -34,9 +48,10 @@
             <argument type="service" id="logger" on-invalid="null" />
         </service>
 
-        <!-- Twig extension providing the |shortcodes filter. The content will be passed to the ShortcodeFacade. -->
+        <!-- Twig extension providing the |shortcodes filter. The content will be passed to the Shortcode Processor. -->
         <service id="Webfactory\ShortcodeBundle\Twig\ShortcodeExtension" class="Webfactory\ShortcodeBundle\Twig\ShortcodeExtension">
-            <argument type="service" id="webfactory.shortcode.facade"/>
+            <argument type="service" id="webfactory.shortcode.processor"/>
+            <argument type="service" id="webfactory.shortcode.event_container"/>
             <tag name="twig.extension"/>
         </service>
 

Tests/DependencyInjection/Compiler/ShortcodeCompilerPassTest.php

@@ -29,7 +29,7 @@ protected function setUp()
     }
 
     /** @test */
-    public function tagged_services_are_added_as_handlers_to_facade()
+    public function tagged_services_are_added_as_handlers_to_handler_container()
     {
         $this->containerBuilder->expects($this->once())
             ->method('findTaggedServiceIds')
@@ -42,24 +42,24 @@ public function tagged_services_are_added_as_handlers_to_facade()
                 ],
             ]);
 
-        $mockedShortcodeFacade = $this->createMock(Definition::class);
-        $mockedShortcodeFacade->expects($this->at(0))
+        $mockedShortcodeHandlerContainer = $this->createMock(Definition::class);
+        $mockedShortcodeHandlerContainer->expects($this->at(0))
             ->method('addMethodCall')
-            ->with('addHandler', $this->callback(function (array $argument) {
+            ->with('add', $this->callback(function (array $argument) {
                 return 'shortcode1' === $argument[0]
                     && $argument[1] instanceof Reference;
             }));
-        $mockedShortcodeFacade->expects($this->at(1))
+        $mockedShortcodeHandlerContainer->expects($this->at(1))
             ->method('addMethodCall')
-            ->with('addHandler', $this->callback(function ($argument) {
+            ->with('add', $this->callback(function ($argument) {
                 return 'shortcode2' === $argument[0]
                     && $argument[1] instanceof Reference;
             }));
 
         $this->containerBuilder->expects($this->once())
             ->method('findDefinition')
-            ->with('webfactory.shortcode.facade')
-            ->willReturn($mockedShortcodeFacade);
+            ->with('webfactory.shortcode.handler_container')
+            ->willReturn($mockedShortcodeHandlerContainer);
 
         $this->compilerPass->process($this->containerBuilder);
     }
@@ -92,7 +92,7 @@ public function shortcode_guide_service_gets_configured_if_set()
 
         $this->containerBuilder->expects($this->once())
             ->method('findDefinition')
-            ->with('webfactory.shortcode.facade')
+            ->with('webfactory.shortcode.handler_container')
             ->willReturn($this->createMock(Definition::class));
 
         $this->containerBuilder->expects($this->once())

Twig/ShortcodeExtension.php

@@ -2,7 +2,8 @@
 
 namespace Webfactory\ShortcodeBundle\Twig;
 
-use Thunder\Shortcode\ShortcodeFacade;
+use Thunder\Shortcode\EventContainer\EventContainer;
+use Thunder\Shortcode\Processor\Processor;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -11,15 +12,15 @@
  */
 final class ShortcodeExtension extends AbstractExtension
 {
-    /** @var ShortcodeFacade */
-    private $facade;
+    /** @var Processor */
+    private $processor;
 
     /**
-     * @param ShortcodeFacade $facade
+     * @param Processor $processor
      */
-    public function __construct(ShortcodeFacade $facade)
+    public function __construct(Processor $processor, EventContainer $eventContainer)
     {
-        $this->facade = $facade;
+        $this->processor = $processor->withMaxIterations(null)->withEventContainer($eventContainer);
     }
 
     public function getFilters()
@@ -36,6 +37,6 @@ public function getFilters()
      */
     public function processShortcodes($content)
     {
-        return $this->facade->process($content);
+        return $this->processor->process($content);
     }
 }