From 2a3365a36bdc47b21a3c8feb63398bbb2f97c922 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 28 Apr 2011 13:18:02 +0200 Subject: [PATCH] Revert "refactored some tests" This reverts commit d45c980a41729e9506148f46c4fd6dc70907b0ad. Tests should work on PHP 5.2 --- test/Twig/Tests/TemplateTest.php | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/test/Twig/Tests/TemplateTest.php b/test/Twig/Tests/TemplateTest.php index f16db7b..06dd356 100644 --- a/test/Twig/Tests/TemplateTest.php +++ b/test/Twig/Tests/TemplateTest.php @@ -26,9 +26,10 @@ class Twig_Tests_TemplateTest extends PHPUnit_Framework_TestCase */ public function testUnknownPropertyOnArray($array) { - list($template, $m) = $this->getTemplate(true); + $env = new Twig_Environment(null, array('strict_variables' => true)); + $template = new Twig_TemplateTest($env); - $m->invoke($template, $array, 'unknown', array(), Twig_TemplateInterface::ARRAY_CALL); + $template->getAttribute($array, 'unknown', array(), Twig_TemplateInterface::ARRAY_CALL); } /** @@ -36,20 +37,9 @@ class Twig_Tests_TemplateTest extends PHPUnit_Framework_TestCase */ public function testGetAttribute($expected, $object, $item, $arguments, $type) { - list($template, $m) = $this->getTemplate(false); + $template = new Twig_TemplateTest(new Twig_Environment()); - $this->assertEquals($expected, $m->invoke($template, $object, $item, $arguments, $type)); - } - - protected function getTemplate($strict) - { - $env = new Twig_Environment(null, array('strict_variables' => $strict)); - $template = $this->getMockForAbstractClass('Twig_Template', array($env)); - $r = new ReflectionObject($template); - $m = $r->getMethod('getAttribute'); - $m->setAccessible(true); - - return array($template, $m); + $this->assertEquals($expected, $template->getAttribute($object, $item, $arguments, $type)); } public function getGetAttributeTests() @@ -100,6 +90,18 @@ class Twig_Tests_TemplateTest extends PHPUnit_Framework_TestCase } } +class Twig_TemplateTest extends Twig_Template +{ + protected function doDisplay(array $context, array $blocks = array()) + { + } + + public function getAttribute($object, $item, array $arguments = array(), $type = Twig_TemplateInterface::ANY_CALL, $noStrictCheck = false, $lineno = -1) + { + return parent::getAttribute($object, $item, $arguments, $type); + } +} + class Twig_TemplateObject { public $foo = 'foo'; -- 1.7.2.5