Merge pull request #62 from henriktudborg/master

call $callback via call_user_func
klein · Jan 7, 2013 · 6f15be8 · 6f15be8
2 parents 98804c2 + 375d18c
commit 6f15be8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/klein.php b/klein.php
@@ -152,7 +152,7 @@ function dispatch($uri = null, $req_method = null, array $params = null, $captur
         // Easily handle 404's
         } elseif ($_route === '404' && !$matched && count($methods_matched) <= 0) {
             try {
-                $callback($request, $response, $app, $matched, $methods_matched);
+                call_user_func($callback, $request, $response, $app, $matched, $methods_matched);
             } catch (Exception $e) {
                 $response->error($e);
             }
@@ -161,7 +161,7 @@ function dispatch($uri = null, $req_method = null, array $params = null, $captur
         // Easily handle 405's
         } elseif ($_route === '405' && !$matched && count($methods_matched) > 0) {
             try {
-                $callback($request, $response, $app, $matched, $methods_matched);
+                call_user_func($callback, $request, $response, $app, $matched, $methods_matched);
             } catch (Exception $e) {
                 $response->error($e);
             }
@@ -224,7 +224,7 @@ function dispatch($uri = null, $req_method = null, array $params = null, $captur
                        $_REQUEST = array_merge($_REQUEST, $params);
                   }
                   try {
-                       $callback($request, $response, $app, $matched, $methods_matched);
+                       call_user_func($callback, $request, $response, $app, $matched, $methods_matched);
                   } catch (Exception $e) {
                        $response->error($e);
                   }

diff --git a/tests/RoutesTest.php b/tests/RoutesTest.php
@@ -2,6 +2,12 @@
 
 require_once dirname(__FILE__) . '/setup.php';
 
+class TestClass {
+	static function GET($r, $r, $a) {
+		echo 'ok';
+	}
+}
+
 class RoutesTest extends PHPUnit_Framework_TestCase {
 	protected function setUp() {
 		global $__routes;
@@ -21,6 +27,21 @@ public function testBasic() {
 		dispatch( '/' );
 	}
 
+	public function testCallable() {
+		$this->expectOutputString( 'okok' );
+		respond( '/', array('TestClass', 'GET'));
+		respond( '/', 'TestClass::GET');
+		dispatch( '/' );
+	}
+
+	public function testAppReference() {
+		$this->expectOutputString( 'ab' );
+		respond( '/', function($r, $r ,$a){ $a->state = 'a'; });
+		respond( '/', function($r, $r ,$a){ $a->state .= 'b'; });
+		respond( '/', function($r, $r ,$a){ print $a->state; });
+		dispatch( '/' );
+	}
+
 	public function testCatchallImplicit() {
 		$this->expectOutputString( 'b' );