mirror of
https://github.com/twigphp/Twig.git
synced 2026-09-19 13:57:00 +00:00
Merge YieldingTemplate and Template
This commit is contained in:
Fabien Potencier
@@ -151,14 +151,14 @@ final class ModuleNode extends Node
|
||||
->write("use Twig\Sandbox\SecurityNotAllowedFilterError;\n")
|
||||
->write("use Twig\Sandbox\SecurityNotAllowedFunctionError;\n")
|
||||
->write("use Twig\Source;\n")
|
||||
->write("use Twig\YieldingTemplate;\n\n")
|
||||
->write("use Twig\Template;\n\n")
|
||||
;
|
||||
}
|
||||
$compiler
|
||||
// if the template name contains */, add a blank to avoid a PHP parse error
|
||||
->write('/* '.str_replace('*/', '* /', $this->getSourceContext()->getName())." */\n")
|
||||
->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getSourceContext()->getName(), $this->getAttribute('index')))
|
||||
->raw(" extends YieldingTemplate\n")
|
||||
->raw(" extends Template\n")
|
||||
->write("{\n")
|
||||
->indent()
|
||||
->write("private Source \$source;\n")
|
||||
|
||||
+151
-171
@@ -4,7 +4,6 @@
|
||||
* This file is part of Twig.
|
||||
*
|
||||
* (c) Fabien Potencier
|
||||
* (c) Armin Ronacher
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
@@ -68,6 +67,14 @@ abstract class Template
|
||||
*/
|
||||
abstract public function getSourceContext();
|
||||
|
||||
/**
|
||||
* Auto-generated method to display the template with the given context.
|
||||
*
|
||||
* @param array $context An array of parameters to pass to the template
|
||||
* @param array $blocks An array of blocks to pass to the template
|
||||
*/
|
||||
abstract protected function doDisplay(array $context, array $blocks = []);
|
||||
|
||||
/**
|
||||
* Returns the parent template.
|
||||
*
|
||||
@@ -116,144 +123,6 @@ abstract class Template
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a parent block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to display from the parent
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
*/
|
||||
public function displayParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
if (isset($this->traits[$name])) {
|
||||
$this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
$parent->displayBlock($name, $context, $blocks, false);
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to display
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
* @param bool $useBlocks Whether to use the current set of blocks
|
||||
*/
|
||||
public function displayBlock($name, array $context, array $blocks = [], $useBlocks = true, self $templateContext = null)
|
||||
{
|
||||
if ($useBlocks && isset($blocks[$name])) {
|
||||
$template = $blocks[$name][0];
|
||||
$block = $blocks[$name][1];
|
||||
} elseif (isset($this->blocks[$name])) {
|
||||
$template = $this->blocks[$name][0];
|
||||
$block = $this->blocks[$name][1];
|
||||
} else {
|
||||
$template = null;
|
||||
$block = null;
|
||||
}
|
||||
|
||||
// avoid RCEs when sandbox is enabled
|
||||
if (null !== $template && !$template instanceof self) {
|
||||
throw new \LogicException('A block must be a method on a \Twig\Template instance.');
|
||||
}
|
||||
|
||||
if (null !== $template) {
|
||||
try {
|
||||
$template->$block($context, $blocks);
|
||||
} catch (Error $e) {
|
||||
if (!$e->getSourceContext()) {
|
||||
$e->setSourceContext($template->getSourceContext());
|
||||
}
|
||||
|
||||
// this is mostly useful for \Twig\Error\LoaderError exceptions
|
||||
// see \Twig\Error\LoaderError
|
||||
if (-1 === $e->getTemplateLine()) {
|
||||
$e->guess();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
} catch (\Throwable $e) {
|
||||
$e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
|
||||
$e->guess();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
$parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false, $templateContext ?? $this);
|
||||
} elseif (isset($blocks[$name])) {
|
||||
throw new RuntimeError(sprintf('Block "%s" should not call parent() in "%s" as the block does not exist in the parent template "%s".', $name, $blocks[$name][0]->getTemplateName(), $this->getTemplateName()), -1, $blocks[$name][0]->getSourceContext());
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('Block "%s" on template "%s" does not exist.', $name, $this->getTemplateName()), -1, ($templateContext ?? $this)->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders a parent block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to render from the parent
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
*
|
||||
* @return string The rendered block
|
||||
*/
|
||||
public function renderParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
if ($this->env->isDebug()) {
|
||||
ob_start();
|
||||
} else {
|
||||
ob_start(fn() => '');
|
||||
}
|
||||
$this->displayParentBlock($name, $context, $blocks);
|
||||
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders a block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to render
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
* @param bool $useBlocks Whether to use the current set of blocks
|
||||
*
|
||||
* @return string The rendered block
|
||||
*/
|
||||
public function renderBlock($name, array $context, array $blocks = [], $useBlocks = true)
|
||||
{
|
||||
$level = ob_get_level();
|
||||
if ($this->env->isDebug()) {
|
||||
ob_start();
|
||||
} else {
|
||||
ob_start(fn() => '');
|
||||
}
|
||||
try {
|
||||
$this->displayBlock($name, $context, $blocks, $useBlocks);
|
||||
} catch (\Throwable $e) {
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
}
|
||||
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether a block exists or not in the current context of the template.
|
||||
*
|
||||
@@ -371,36 +240,16 @@ abstract class Template
|
||||
return $this->blocks;
|
||||
}
|
||||
|
||||
public function display(array $context, array $blocks = [])
|
||||
/**
|
||||
* @return iterable<string>
|
||||
*/
|
||||
public function yield(array $context, array $blocks = []): iterable
|
||||
{
|
||||
$this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
|
||||
}
|
||||
$context = $this->env->mergeGlobals($context);
|
||||
$blocks = array_merge($this->blocks, $blocks);
|
||||
|
||||
public function render(array $context)
|
||||
{
|
||||
$level = ob_get_level();
|
||||
if ($this->env->isDebug()) {
|
||||
ob_start();
|
||||
} else {
|
||||
ob_start(fn() => '');
|
||||
}
|
||||
try {
|
||||
$this->display($context);
|
||||
} catch (\Throwable $e) {
|
||||
while (ob_get_level() > $level) {
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
}
|
||||
|
||||
return ob_get_clean();
|
||||
}
|
||||
|
||||
protected function displayWithErrorHandling(array $context, array $blocks = [])
|
||||
{
|
||||
try {
|
||||
$this->doDisplay($context, $blocks);
|
||||
yield from $this->doDisplay($context, $blocks);
|
||||
} catch (Error $e) {
|
||||
if (!$e->getSourceContext()) {
|
||||
$e->setSourceContext($this->getSourceContext());
|
||||
@@ -421,11 +270,142 @@ abstract class Template
|
||||
}
|
||||
}
|
||||
|
||||
public function render(array $context): string
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yield($context) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
public function display(array $context, array $blocks = []): void
|
||||
{
|
||||
foreach ($this->yield($context, $blocks) as $data) {
|
||||
echo $data;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Auto-generated method to display the template with the given context.
|
||||
*
|
||||
* @param array $context An array of parameters to pass to the template
|
||||
* @param array $blocks An array of blocks to pass to the template
|
||||
* @return iterable<string>
|
||||
*/
|
||||
abstract protected function doDisplay(array $context, array $blocks = []);
|
||||
public function yieldBlock($name, array $context, array $blocks = [], $useBlocks = true, Template $templateContext = null)
|
||||
{
|
||||
if ($useBlocks && isset($blocks[$name])) {
|
||||
$template = $blocks[$name][0];
|
||||
$block = $blocks[$name][1];
|
||||
} elseif (isset($this->blocks[$name])) {
|
||||
$template = $this->blocks[$name][0];
|
||||
$block = $this->blocks[$name][1];
|
||||
} else {
|
||||
$template = null;
|
||||
$block = null;
|
||||
}
|
||||
|
||||
// avoid RCEs when sandbox is enabled
|
||||
if (null !== $template && !$template instanceof Template) {
|
||||
throw new \LogicException('A block must be a method on a \Twig\Template instance.');
|
||||
}
|
||||
|
||||
if (null !== $template) {
|
||||
try {
|
||||
yield from $template->$block($context, $blocks);
|
||||
} catch (Error $e) {
|
||||
if (!$e->getSourceContext()) {
|
||||
$e->setSourceContext($template->getSourceContext());
|
||||
}
|
||||
|
||||
// this is mostly useful for \Twig\Error\LoaderError exceptions
|
||||
// see \Twig\Error\LoaderError
|
||||
if (-1 === $e->getTemplateLine()) {
|
||||
$e->guess();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
} catch (\Throwable $e) {
|
||||
$e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
|
||||
$e->guess();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
/** @var Template $parent */
|
||||
yield from $parent->yieldBlock($name, $context, array_merge($this->blocks, $blocks), false, $templateContext ?? $this);
|
||||
} elseif (isset($blocks[$name])) {
|
||||
throw new RuntimeError(sprintf('Block "%s" should not call parent() in "%s" as the block does not exist in the parent template "%s".', $name, $blocks[$name][0]->getTemplateName(), $this->getTemplateName()), -1, $blocks[$name][0]->getSourceContext());
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('Block "%s" on template "%s" does not exist.', $name, $this->getTemplateName()), -1, ($templateContext ?? $this)->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders a block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to render
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
* @param bool $useBlocks Whether to use the current set of blocks
|
||||
*
|
||||
* @return string The rendered block
|
||||
*/
|
||||
public function renderBlock($name, array $context, array $blocks = [], $useBlocks = true)
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yieldBlock($name, $context, $blocks, $useBlocks) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Yields a parent block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to display from the parent
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
*
|
||||
* @return iterable<string>
|
||||
*/
|
||||
public function yieldParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
if (isset($this->traits[$name])) {
|
||||
yield from $this->traits[$name][0]->yieldBlock($name, $context, $blocks, false);
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
$parent = $parent->unwrap();
|
||||
/** @var Template $parent */
|
||||
yield from $parent->yieldBlock($name, $context, $blocks, false);
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders a parent block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to render from the parent
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
*
|
||||
* @return string The rendered block
|
||||
*/
|
||||
public function renderParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yieldParentBlock($name, $context, $blocks) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,12 +66,8 @@ final class TemplateWrapper
|
||||
public function displayBlock(string $name, array $context = [])
|
||||
{
|
||||
$context = $this->env->mergeGlobals($context);
|
||||
if ($this->template instanceof YieldingTemplate) {
|
||||
foreach ($this->template->yieldBlock($name, $context) as $data) {
|
||||
echo $data;
|
||||
}
|
||||
} else {
|
||||
$this->template->displayBlock($name, $context);
|
||||
foreach ($this->template->yieldBlock($name, $context) as $data) {
|
||||
echo $data;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,182 +0,0 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of Twig.
|
||||
*
|
||||
* (c) Fabien Potencier
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Twig;
|
||||
|
||||
use Twig\Error\Error;
|
||||
use Twig\Error\RuntimeError;
|
||||
|
||||
/**
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* @internal
|
||||
*/
|
||||
abstract class YieldingTemplate extends Template
|
||||
{
|
||||
/**
|
||||
* @return iterable<string>
|
||||
*/
|
||||
public function yield(array $context, array $blocks = []): iterable
|
||||
{
|
||||
$context = $this->env->mergeGlobals($context);
|
||||
$blocks = array_merge($this->blocks, $blocks);
|
||||
|
||||
try {
|
||||
yield from $this->doDisplay($context, $blocks);
|
||||
} catch (Error $e) {
|
||||
if (!$e->getSourceContext()) {
|
||||
$e->setSourceContext($this->getSourceContext());
|
||||
}
|
||||
|
||||
// this is mostly useful for \Twig\Error\LoaderError exceptions
|
||||
// see \Twig\Error\LoaderError
|
||||
if (-1 === $e->getTemplateLine()) {
|
||||
$e->guess();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
} catch (\Throwable $e) {
|
||||
$e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getSourceContext(), $e);
|
||||
$e->guess();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
}
|
||||
|
||||
public function render(array $context): string
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yield($context) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
public function display(array $context, array $blocks = []): void
|
||||
{
|
||||
foreach ($this->yield($context, $blocks) as $data) {
|
||||
echo $data;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return iterable<string>
|
||||
*/
|
||||
public function yieldBlock($name, array $context, array $blocks = [], $useBlocks = true, Template $templateContext = null)
|
||||
{
|
||||
if ($useBlocks && isset($blocks[$name])) {
|
||||
$template = $blocks[$name][0];
|
||||
$block = $blocks[$name][1];
|
||||
} elseif (isset($this->blocks[$name])) {
|
||||
$template = $this->blocks[$name][0];
|
||||
$block = $this->blocks[$name][1];
|
||||
} else {
|
||||
$template = null;
|
||||
$block = null;
|
||||
}
|
||||
|
||||
// avoid RCEs when sandbox is enabled
|
||||
if (null !== $template && !$template instanceof Template) {
|
||||
throw new \LogicException('A block must be a method on a \Twig\Template instance.');
|
||||
}
|
||||
|
||||
if (null !== $template) {
|
||||
try {
|
||||
yield from $template->$block($context, $blocks);
|
||||
} catch (Error $e) {
|
||||
if (!$e->getSourceContext()) {
|
||||
$e->setSourceContext($template->getSourceContext());
|
||||
}
|
||||
|
||||
// this is mostly useful for \Twig\Error\LoaderError exceptions
|
||||
// see \Twig\Error\LoaderError
|
||||
if (-1 === $e->getTemplateLine()) {
|
||||
$e->guess();
|
||||
}
|
||||
|
||||
throw $e;
|
||||
} catch (\Throwable $e) {
|
||||
$e = new RuntimeError(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getSourceContext(), $e);
|
||||
$e->guess();
|
||||
|
||||
throw $e;
|
||||
}
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
/** @var YieldingTemplate $parent */
|
||||
yield from $parent->yieldBlock($name, $context, array_merge($this->blocks, $blocks), false, $templateContext ?? $this);
|
||||
} elseif (isset($blocks[$name])) {
|
||||
throw new RuntimeError(sprintf('Block "%s" should not call parent() in "%s" as the block does not exist in the parent template "%s".', $name, $blocks[$name][0]->getTemplateName(), $this->getTemplateName()), -1, $blocks[$name][0]->getSourceContext());
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('Block "%s" on template "%s" does not exist.', $name, $this->getTemplateName()), -1, ($templateContext ?? $this)->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
public function renderBlock($name, array $context, array $blocks = [], $useBlocks = true)
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yieldBlock($name, $context, $blocks, $useBlocks) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Yields a parent block.
|
||||
*
|
||||
* This method is for internal use only and should never be called
|
||||
* directly.
|
||||
*
|
||||
* @param string $name The block name to display from the parent
|
||||
* @param array $context The context
|
||||
* @param array $blocks The current set of blocks
|
||||
*
|
||||
* @return iterable<string>
|
||||
*/
|
||||
public function yieldParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
if (isset($this->traits[$name])) {
|
||||
yield from $this->traits[$name][0]->yieldBlock($name, $context, $blocks, false);
|
||||
} elseif (false !== $parent = $this->getParent($context)) {
|
||||
$parent = $parent->unwrap();
|
||||
/** @var YieldingTemplate $parent */
|
||||
yield from $parent->yieldBlock($name, $context, $blocks, false);
|
||||
} else {
|
||||
throw new RuntimeError(sprintf('The template has no parent and no traits defining the "%s" block.', $name), -1, $this->getSourceContext());
|
||||
}
|
||||
}
|
||||
|
||||
public function renderParentBlock($name, array $context, array $blocks = [])
|
||||
{
|
||||
$content = '';
|
||||
foreach ($this->yieldParentBlock($name, $context, $blocks) as $data) {
|
||||
$content .= $data;
|
||||
}
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
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 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());
|
||||
}
|
||||
|
||||
protected function displayWithErrorHandling(array $context, array $blocks = [])
|
||||
{
|
||||
throw new RuntimeError(sprintf('Calling "%s" is not supported as "use_yield" is set to "true".', __METHOD__), -1, $this->getSourceContext());
|
||||
}
|
||||
}
|
||||
@@ -72,10 +72,10 @@ use Twig\Sandbox\SecurityNotAllowedTagError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFilterError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFunctionError;
|
||||
use Twig\Source;
|
||||
use Twig\YieldingTemplate;
|
||||
use Twig\Template;
|
||||
|
||||
/* foo.twig */
|
||||
class __TwigTemplate_%x extends YieldingTemplate
|
||||
class __TwigTemplate_%x extends Template
|
||||
{
|
||||
private Source \$source;
|
||||
private array \$macros = [];
|
||||
@@ -143,10 +143,10 @@ use Twig\Sandbox\SecurityNotAllowedTagError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFilterError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFunctionError;
|
||||
use Twig\Source;
|
||||
use Twig\YieldingTemplate;
|
||||
use Twig\Template;
|
||||
|
||||
/* foo.twig */
|
||||
class __TwigTemplate_%x extends YieldingTemplate
|
||||
class __TwigTemplate_%x extends Template
|
||||
{
|
||||
private Source \$source;
|
||||
private array \$macros = [];
|
||||
@@ -234,10 +234,10 @@ use Twig\Sandbox\SecurityNotAllowedTagError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFilterError;
|
||||
use Twig\Sandbox\SecurityNotAllowedFunctionError;
|
||||
use Twig\Source;
|
||||
use Twig\YieldingTemplate;
|
||||
use Twig\Template;
|
||||
|
||||
/* foo.twig */
|
||||
class __TwigTemplate_%x extends YieldingTemplate
|
||||
class __TwigTemplate_%x extends Template
|
||||
{
|
||||
private Source \$source;
|
||||
private array \$macros = [];
|
||||
|
||||
+3
-13
@@ -31,7 +31,7 @@ class TemplateTest extends TestCase
|
||||
|
||||
$twig = new Environment($this->createMock(LoaderInterface::class));
|
||||
$template = new TemplateForTest($twig);
|
||||
$template->displayBlock('foo', [], ['foo' => [new \stdClass(), 'foo']]);
|
||||
$template->renderBlock('foo', [], ['foo' => [new \stdClass(), 'foo']]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -151,24 +151,14 @@ class TemplateTest extends TestCase
|
||||
$template->renderBlock('unknown', []);
|
||||
}
|
||||
|
||||
public function testDisplayBlockWithUndefinedBlock()
|
||||
{
|
||||
$this->expectException(RuntimeError::class);
|
||||
$this->expectExceptionMessage('Block "unknown" on template "index.twig" does not exist in "index.twig".');
|
||||
|
||||
$twig = new Environment($this->createMock(LoaderInterface::class));
|
||||
$template = new TemplateForTest($twig, 'index.twig');
|
||||
$template->displayBlock('unknown', []);
|
||||
}
|
||||
|
||||
public function testDisplayBlockWithUndefinedParentBlock()
|
||||
public function testRenderBlockWithUndefinedParentBlock()
|
||||
{
|
||||
$this->expectException(RuntimeError::class);
|
||||
$this->expectExceptionMessage('Block "foo" should not call parent() in "index.twig" as the block does not exist in the parent template "parent.twig"');
|
||||
|
||||
$twig = new Environment($this->createMock(LoaderInterface::class));
|
||||
$template = new TemplateForTest($twig, 'parent.twig');
|
||||
$template->displayBlock('foo', [], ['foo' => [new TemplateForTest($twig, 'index.twig'), 'block_foo']], false);
|
||||
$template->renderBlock('foo', [], ['foo' => [new TemplateForTest($twig, 'index.twig'), 'block_foo']], false);
|
||||
}
|
||||
|
||||
public function testGetAttributeOnArrayWithConfusableKey()
|
||||
|
||||
Reference in New Issue
Block a user