Merge pull request #55 from abeaumet/master

Added ability to specify closures for route handlers.
anandkunal · Sep 26, 2013 · 470ae04 · 470ae04
2 parents 0f3942c + 26f3fca
commit 470ae04
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Toro.php b/src/Toro.php
@@ -43,11 +43,21 @@ public static function serve($routes)
         }
 
         $result = null;
-        if ($discovered_handler && class_exists($discovered_handler)) {
+
+        $handler_instance = null;
+        if ($discovered_handler) {
+            if (is_string($discovered_handler)) {
+                $handler_instance = new $discovered_handler();
+            }
+            elseif (is_callable($discovered_handler)) {
+                $handler_instance = $discovered_handler();
+            }
+        }
+
+        if ($handler_instance) {
             unset($regex_matches[0]);
-            $handler_instance = new $discovered_handler();
 
-            if (self::is_xhr_request() && method_exists($discovered_handler, $request_method . '_xhr')) {
+            if (self::is_xhr_request() && method_exists($handler_instance, $request_method . '_xhr')) {
                 header('Content-type: application/json');
                 header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
                 header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');