geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 10:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed existing tests

Browse Source
This commit is contained in:
Jannis Grimm
2011-07-25 22:29:47 +02:00
parent 9822ac491e
commit c890cf2b64
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Twig/Tests/Node/ModuleTest.php
+16 -9
View File
@@ -105,11 +105,16 @@ class __TwigTemplate_be925a7b06dda0dfdbd18a1509f7eb34 extends Twig_Template
public function getParent(array \$context) public function getParent(array \$context)
{ {
if (null === \$this->parent) { \$parent = "layout.twig";
\$this->parent = \$this->env->loadTemplate("layout.twig"); if (\$parent instanceof Twig_Template) {
\$name = \$parent->getTemplateName();
\$this->parent[\$name] = \$parent;
\$parent = \$name;
} elseif (!isset(\$this->parent[\$parent])) {
\$this->parent[\$parent] = \$this->env->loadTemplate(\$parent);
} }
return \$this->parent; return \$this->parent[\$parent];
} }
protected function doDisplay(array \$context, array \$blocks = array()) protected function doDisplay(array \$context, array \$blocks = array())
@@ -152,14 +157,16 @@ class __TwigTemplate_be925a7b06dda0dfdbd18a1509f7eb34 extends Twig_Template
public function getParent(array \$context) public function getParent(array \$context)
{ {
if (null === \$this->parent) { \$parent = ((true) ? ("foo") : ("foo"));
\$this->parent = ((true) ? ("foo") : ("foo")); if (\$parent instanceof Twig_Template) {
if (!\$this->parent instanceof Twig_Template) { \$name = \$parent->getTemplateName();
\$this->parent = \$this->env->loadTemplate(\$this->parent); \$this->parent[\$name] = \$parent;
} \$parent = \$name;
} elseif (!isset(\$this->parent[\$parent])) {
\$this->parent[\$parent] = \$this->env->loadTemplate(\$parent);
} }
return \$this->parent; return \$this->parent[\$parent];
} }
protected function doDisplay(array \$context, array \$blocks = array()) protected function doDisplay(array \$context, array \$blocks = array())
test/Twig/Tests/Node/SandboxedModuleTest.php
+8 -3
View File
@@ -116,11 +116,16 @@ class __TwigTemplate_be925a7b06dda0dfdbd18a1509f7eb34 extends Twig_Template
public function getParent(array \$context) public function getParent(array \$context)
{ {
if (null === \$this->parent) { \$parent = "layout.twig";
\$this->parent = \$this->env->loadTemplate("layout.twig"); if (\$parent instanceof Twig_Template) {
\$name = \$parent->getTemplateName();
\$this->parent[\$name] = \$parent;
\$parent = \$name;
} elseif (!isset(\$this->parent[\$parent])) {
\$this->parent[\$parent] = \$this->env->loadTemplate(\$parent);
} }
return \$this->parent; return \$this->parent[\$parent];
} }
protected function doDisplay(array \$context, array \$blocks = array()) protected function doDisplay(array \$context, array \$blocks = array())