geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 03:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.x' into 2.x

Browse Source 
* 1.x:
  refactored the implementation of dump()
This commit is contained in:
Fabien Potencier
2019-03-23 14:35:29 +01:00
parent c468c93d2a 4f77fd5b48
commit ce396b4f80
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Extension/DebugExtension.php
+3 -2
View File
@@ -27,7 +27,7 @@ final class DebugExtension extends AbstractExtension
;
return [
new TwigFunction('dump', 'twig_var_dump', ['is_safe' => $isDumpOutputHtmlSafe ? ['html'] : [], 'needs_context' => true, 'needs_environment' => true]),
new TwigFunction('dump', 'twig_var_dump', ['is_safe' => $isDumpOutputHtmlSafe ? ['html'] : [], 'needs_context' => true, 'needs_environment' => true, 'is_variadic' => true]),
];
}
}
@@ -38,6 +38,7 @@ class_alias('Twig\Extension\DebugExtension', 'Twig_Extension_Debug');
namespace {
use Twig\Environment;
use Twig\Template;
use Twig\TemplateWrapper;
function twig_var_dump(Environment $env, $context, ...$vars)
{
@@ -50,7 +51,7 @@ function twig_var_dump(Environment $env, $context, ...$vars)
if (!$vars) {
$vars = [];
foreach ($context as $key => $value) {
if (!$value instanceof Template) {
if (!$value instanceof Template && !$value instanceof TemplateWrapper) {
$vars[$key] = $value;
}
}