fixed named args for static methods

twigphp · Jan 29, 2015 · 7868fe8 · 7868fe8
1 parent 6b434f4
commit 7868fe8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/Twig/Node/Expression/Call.php b/lib/Twig/Node/Expression/Call.php
@@ -120,6 +120,9 @@ protected function getArguments($callable, $arguments)
         } elseif (is_object($callable) && !$callable instanceof Closure) {
             $r = new ReflectionObject($callable);
             $r = $r->getMethod('__invoke');
+        } elseif (is_string($callable) && false !== strpos($callable, '::')) {
+            $parts = explode('::', $callable, 2);
+            $r = new ReflectionMethod($parts[0], $parts[1]);
         } else {
             $r = new ReflectionFunction($callable);
         }

diff --git a/test/Twig/Tests/Node/Expression/CallTest.php b/test/Twig/Tests/Node/Expression/CallTest.php
@@ -78,6 +78,16 @@ public function testResolveArgumentsOnlyNecessaryArgumentsForCustomFunction()
         $this->assertEquals(array('arg1'), $node->getArguments(array($this, 'customFunction'), array('arg1' => 'arg1')));
     }
 
+    public function testGetArgumentsForStaticMethod()
+    {
+        $node = new Twig_Tests_Node_Expression_Call(array(), array('type' => 'function', 'name' => 'custom_static_function'));
+        $this->assertEquals(array('arg1'), $node->getArguments(__CLASS__.'::customStaticFunction', array('arg1' => 'arg1')));
+    }
+
+    public static function customStaticFunction($arg1, $arg2 = 'default', $arg3 = array())
+    {
+    }
+
     public function customFunction($arg1, $arg2 = 'default', $arg3 = array())
     {
     }