changed unit tests so that they work for PHP 5.2

videlalvaro · Aug 8, 2011 · bac4974 · bac4974
1 parent dbeede7
commit bac4974
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/test/Twig/Tests/ParserTest.php b/test/Twig/Tests/ParserTest.php
@@ -24,9 +24,9 @@ public function testSetMacroThrowsExceptionOnReservedMethods()
      */
     public function testFilterBodyNodes($input, $expected)
     {
-        list($parser, $invoker) = $this->getParserForFilterBodyNodes();
+        $parser = $this->getParserForFilterBodyNodes();
 
-        $this->assertEquals($expected, $invoker->invoke($parser, $input));
+        $this->assertEquals($expected, $parser->filterBodyNodes($input));
     }
 
     public function getFilterBodyNodesData()
@@ -49,9 +49,9 @@ public function getFilterBodyNodesData()
      */
     public function testFilterBodyNodesThrowsException($input)
     {
-        list($parser, $invoker) = $this->getParserForFilterBodyNodes();
+        $parser = $this->getParserForFilterBodyNodes();
 
-        $invoker->invoke($parser, $input);
+        $parser->filterBodyNodes($input);
     }
 
     public function getFilterBodyNodesDataThrowsException()
@@ -64,16 +64,20 @@ public function getFilterBodyNodesDataThrowsException()
 
     protected function getParserForFilterBodyNodes()
     {
-        $invoker = new ReflectionMethod('Twig_Parser', 'filterBodyNodes');
-        $invoker->setAccessible(true);
+        $parser = new TestParser(new Twig_Environment());
+        $parser->setParent(new Twig_Node());
+        $parser->stream = $this->getMockBuilder('Twig_TokenStream')->disableOriginalConstructor()->getMock();
 
-        $p = new ReflectionProperty('Twig_Parser', 'stream');
-        $p->setAccessible(true);
+        return $parser;
+    }
+}
 
-        $parser = new Twig_Parser(new Twig_Environment());
-        $parser->setParent(new Twig_Node());
-        $p->setValue($parser, $this->getMockBuilder('Twig_TokenStream')->disableOriginalConstructor()->getMock());
+class TestParser extends Twig_Parser
+{
+    public $stream;
 
-        return array($parser, $invoker);
+    public function filterBodyNodes(Twig_NodeInterface $node)
+    {
+        return parent::filterBodyNodes($node);
     }
 }