Make correct use of event handler to remove paragraph tags (Case 89286)

Author: relthyg

Resources/config/shortcodes.xml

@@ -7,13 +7,6 @@
 
         <!-- Definition of a Shortcode HandlerContainer instance. -->
         <service id="webfactory.shortcode.handler_container" class="Thunder\Shortcode\HandlerContainer\HandlerContainer">
-            <!-- Event handler that removes <p>...</p> tag that directly wrap shortcodes. -->
-            <call method="add">
-                <argument type="constant">\Thunder\Shortcode\Events::REPLACE_SHORTCODES</argument>
-                <argument type="service">
-                    <service class="Webfactory\ShortcodeBundle\Handler\RemoveWrappingParagraphElementsEventHandler"/>
-                </argument>
-            </call>
         </service>
 
         <!-- Definition of a Shortcode RegularParser instance. -->
@@ -26,6 +19,17 @@
             <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="addListener">
+                <argument type="constant">\Thunder\Shortcode\Events::REPLACE_SHORTCODES</argument>
+                <argument type="service">
+                    <service class="Webfactory\ShortcodeBundle\Handler\RemoveWrappingParagraphElementsEventHandler"/>
+                </argument>
+            </call>
+        </service>
+
         <!-- Base definition for the EmbedForShortcodeHandler with esi renderer. -->
         <service abstract="true" id="webfactory.shortcode.embed_esi_for_shortcode_handler" class="Webfactory\ShortcodeBundle\Handler\EmbeddedShortcodeHandler" lazy="true">
             <argument type="service" id="fragment.handler"/>
@@ -47,6 +51,7 @@
         <!-- 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.processor"/>
+            <argument type="service" id="webfactory.shortcode.event_container"/>
             <tag name="twig.extension"/>
         </service>
 

Twig/ShortcodeExtension.php

@@ -2,6 +2,7 @@
 
 namespace Webfactory\ShortcodeBundle\Twig;
 
+use Thunder\Shortcode\EventContainer\EventContainer;
 use Thunder\Shortcode\Processor\Processor;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
@@ -17,9 +18,9 @@ final class ShortcodeExtension extends AbstractExtension
     /**
      * @param Processor $processor
      */
-    public function __construct(Processor $processor)
+    public function __construct(Processor $processor, EventContainer $eventContainer)
     {
-        $this->processor = $processor->withMaxIterations(null);
+        $this->processor = $processor->withMaxIterations(null)->withEventContainer($eventContainer);
     }
 
     public function getFilters()