Fix bug

twigphp · Jan 25, 2024 · a93723e · a93723e
1 parent 0d3a283
commit a93723e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/YieldingTemplate.php b/src/YieldingTemplate.php
@@ -155,17 +155,22 @@ public function yieldParentBlock($name, array $context, array $blocks = [])
         }
     }
 
-    public function displayBlock($name, array $context, array $blocks = [], $useBlocks = true, Template $templateContext = null)
+    public function renderParentBlock($name, array $context, array $blocks = [])
     {
-        throw new RuntimeError(sprintf('Calling "%s" for block "%s" is not supported as "use_yield" is set to "true".', __METHOD__, $name), -1, $this->getSourceContext());
+        $content = '';
+        foreach ($this->yieldParentBlock($name, $context, $blocks) as $data) {
+            $content .= $data;
+        }
+
+        return $content;
     }
 
-    public function displayParentBlock($name, array $context, array $blocks = [])
+    public function displayBlock($name, array $context, array $blocks = [], $useBlocks = true, Template $templateContext = null)
     {
         throw new RuntimeError(sprintf('Calling "%s" for block "%s" is not supported as "use_yield" is set to "true".', __METHOD__, $name), -1, $this->getSourceContext());
     }
 
-    public function renderParentBlock($name, array $context, array $blocks = [])
+    public function displayParentBlock($name, array $context, array $blocks = [])
     {
         throw new RuntimeError(sprintf('Calling "%s" for block "%s" is not supported as "use_yield" is set to "true".', __METHOD__, $name), -1, $this->getSourceContext());
     }

diff --git a/tests/Fixtures/functions/parent_in_condition.test b/tests/Fixtures/functions/parent_in_condition.test
@@ -0,0 +1,11 @@
+--TEST--
+"block" calling parent() in a conditional expression
+--TEMPLATE--
+{% extends "parent.twig" %}
+{% block label %}{{ parent() ?: 'foo' }}{% endblock %}
+--TEMPLATE(parent.twig)--
+{% block label %}PARENT_LABEL{% endblock %}
+--DATA--
+return []
+--EXPECT--
+PARENT_LABEL