Use Shortcode\Processor directly instead of ShortCodeFacade (Case 89286)

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,17 +5,27 @@
            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">
             <!-- Event handler that removes <p>...</p> tag that directly wrap shortcodes. -->
-            <call method="addEventHandler">
+            <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. -->
+        <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>
+
         <!-- 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"/>
@@ -34,9 +44,9 @@
             <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"/>
             <tag name="twig.extension"/>
         </service>
 

Twig/ShortcodeExtension.php

@@ -2,7 +2,7 @@
 
 namespace Webfactory\ShortcodeBundle\Twig;
 
-use Thunder\Shortcode\ShortcodeFacade;
+use Thunder\Shortcode\Processor\Processor;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;
 
@@ -11,15 +11,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)
     {
-        $this->facade = $facade;
+        $this->processor = $processor;
     }
 
     public function getFilters()
@@ -36,6 +36,6 @@ public function getFilters()
      */
     public function processShortcodes($content)
     {
-        return $this->facade->process($content);
+        return $this->processor->process($content);
     }
 }