Merge pull request #931 from LuckyCyborg/master

Optimizations and improvements on Routing
nova-framework · Jun 4, 2016 · b98ea75 · b98ea75
2 parents 9673f52 + d0f9e76
commit b98ea75
Show file tree

Hide file tree

Showing 5 changed files with 299 additions and 84 deletions.
diff --git a/app/Filters.php b/app/Filters.php
@@ -27,7 +27,9 @@
 Route::filter('csrf', function($route) {
     $token = Request::input('csrfToken');
 
-    if (($route->method() == 'POST') && ($token != Session::token())) {
+    $method = Request::method();
+
+    if (($method == 'POST') && ($token != Session::token())) {
         // When CSRF Token is invalid, respond with Error 400 Page (Bad Request)
         return Response::error(400);
     }

diff --git a/system/Auth/Guard.php b/system/Auth/Guard.php
@@ -89,9 +89,7 @@ class Guard
      * @param  \Session\Store  $session
      * @return void
      */
-    public function __construct(UserProviderInterface $provider,
-                                SessionStore $session,
-                                Request $request = null)
+    public function __construct(UserProviderInterface $provider, SessionStore $session, Request $request = null)
     {
         $this->session = $session;
         $this->request = $request;

diff --git a/system/Routing/ClassicRouter.php b/system/Routing/ClassicRouter.php
@@ -93,11 +93,11 @@ public function dispatch()
                 // Found a valid Route; process it.
                 $this->matchedRoute = $route;
 
-                $callback = $route->callback();
+                $callback = $route->getCallback();
 
                 if (is_object($callback)) {
                     // Invoke the Route's Callback with the associated parameters.
-                    call_user_func_array($callback, $route->params());
+                    call_user_func_array($callback, $route->getParams());
 
                     return true;
                 }