Merge pull request #155 from stefandoorn/render-template

Add template argument to bitbag_cms_render_block twig function (closes #148)
BitBagCommerce · Jun 20, 2018 · 3407816 · 3407816
2 parents d850d36 + ecd076e
commit 3407816
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/spec/Twig/Extension/RenderBlockExtensionSpec.php b/spec/Twig/Extension/RenderBlockExtensionSpec.php
@@ -64,4 +64,18 @@ function it_renders_block(
 
         $this->renderBlock($twigEnvironment, 'bitbag');
     }
+
+    function it_renders_block_with_template(
+        BlockResourceResolverInterface $blockResourceResolver,
+        BlockTemplateResolverInterface $blockTemplateResolver,
+        BlockInterface $block,
+        \Twig_Environment $twigEnvironment
+    ): void
+    {
+        $blockResourceResolver->findOrLog('bitbag')->willReturn($block);
+        $blockTemplateResolver->resolveTemplate($block)->shouldNotBeCalled();
+        $twigEnvironment->render('@BitBagSyliusCmsPlugin/Shop/Block/htmlBlock_other_template.html.twig', ['block' => $block])->willReturn('<div>BitBag Other Template</div>');
+
+        $this->renderBlock($twigEnvironment, 'bitbag', '@BitBagSyliusCmsPlugin/Shop/Block/htmlBlock_other_template.html.twig');
+    }
 }
diff --git a/src/Twig/Extension/RenderBlockExtension.php b/src/Twig/Extension/RenderBlockExtension.php
@@ -62,17 +62,18 @@ public function getFunctions(): array
     /**
      * @param \Twig_Environment $twigEnvironment
      * @param string $code
+     * @param string|null $template
      *
      * @return string
      *
      * @throws TemplateTypeNotFound
      */
-    public function renderBlock(\Twig_Environment $twigEnvironment, string $code): string
+    public function renderBlock(\Twig_Environment $twigEnvironment, string $code, ?string $template = null): string
     {
         $block = $this->blockResourceResolver->findOrLog($code);
 
         if (null !== $block) {
-            $template = $this->blockTemplateResolver->resolveTemplate($block);
+            $template = $template ?? $this->blockTemplateResolver->resolveTemplate($block);
 
             return $twigEnvironment->render($template, ['block' => $block]);
         }