Merge pull request #2 from rakit/v0.4.0

v0.4.0 - Some changes in middleware

Author: emsifa

src/App.php

@@ -36,6 +36,8 @@ class App implements ArrayAccess {
 
     protected $middlewares = array();
 
+    protected $global_middlewares = array();
+
     protected $waiting_list_providers = array();
 
     protected $providers = array();
@@ -113,17 +115,49 @@ public function once($event, Closure $callable)
     }
 
     /**
-     * Register a middleware
+     * Set middleware
      *
      * @param   string $name
      * @param   mixed $callable
      * @return  void
      */
-    public function middleware($name, $callable)
+    public function setMiddleware($name, $callable)
     {
         $this->middlewares[$name] = $callable;
     }
 
+    /**
+     * Check middleware is registered or not
+     *
+     * @param   string $name
+     * @return  void
+     */
+    public function hasMiddleware($name)
+    {
+        return isset($this->middlewares[$name]);
+    }
+
+    /**
+     * Add global middleware
+     *
+     * @param   string|callable $name_or_callable
+     * @return  void
+     */
+    public function useMiddleware($name_or_callable)
+    {
+        if (!is_callable($name_or_callable)) {
+            if (is_string($name_or_callable) AND $this->hasMiddleware($name_or_callable)) {
+                $callable = $this->middlewares[$name_or_callable];
+            } else {
+                throw new InvalidArgumentException("Cannot use global middleware. Middleware must be callable or registered middleware", 1);
+            }
+        } else {
+            $callable = $name_or_callable;
+        }
+
+        $this->global_middlewares[] = $callable;
+    }
+
     /**
      * Register GET route
      *
@@ -205,7 +239,11 @@ public function group($prefix, Closure $grouper)
      */
     public function route($methods, $path, $action)
     {
-        return $this->router->add($methods, $path, $action);
+        $route = $this->router->add($methods, $path, $action);
+        if (!empty($this->global_middlewares)) {
+            $route->middleware($this->global_middlewares);
+        }
+        return $route;
     }
 
     /**

tests/RunAppTests.php

@@ -179,7 +179,7 @@ public function testRouteParamCondition()
      */
     public function testMiddlewareBefore()
     {
-        $this->app->middleware('foobar', function($req, $res, $next) {
+        $this->app->setMiddleware('foobar', function($req, $res, $next) {
             $req->foobar = "foobar";
             return $next();
         });
@@ -197,7 +197,7 @@ public function testMiddlewareBefore()
      */
     public function testMiddlewareAfter()
     {
-        $this->app->middleware('uppercase', function($req, $res, $next) {
+        $this->app->setMiddleware('uppercase', function($req, $res, $next) {
             $next();
             return strtoupper($res->body);
         });
@@ -215,7 +215,7 @@ public function testMiddlewareAfter()
      */
     public function testMiddlewareBeforeAndAfter()
     {
-        $this->app->middleware('uppercase', function($req, $res, $next) {
+        $this->app->setMiddleware('uppercase', function($req, $res, $next) {
             $req->foobar = "foobar";
 
             $next();
@@ -236,7 +236,7 @@ public function testMiddlewareBeforeAndAfter()
      */
     public function testMiddlewareParam()
     {
-        $this->app->middleware('setStr', function($req, $res, $next, $str) {
+        $this->app->setMiddleware('setStr', function($req, $res, $next, $str) {
             $req->str = $str;
             return $next();
         });
@@ -254,17 +254,17 @@ public function testMiddlewareParam()
      */
     public function testMultipleMiddleware()
     {
-        $this->app->middleware('setStr', function($req, $res, $next, $str) {
+        $this->app->setMiddleware('setStr', function($req, $res, $next, $str) {
             $req->str = $str;
             return $next();
         });
 
-        $this->app->middleware('uppercase', function($req, $res, $next) {
+        $this->app->setMiddleware('uppercase', function($req, $res, $next) {
             $next();
             return strtoupper($res->body);
         });
 
-        $this->app->middleware('jsonify', function($req, $res, $next) {
+        $this->app->setMiddleware('jsonify', function($req, $res, $next) {
             $next();
             return $res->json(['body' => $res->body]);
         });
@@ -282,7 +282,7 @@ public function testMultipleMiddleware()
      */
     public function testIgnoringController()
     {
-        $this->app->middleware('no-controller', function($req, $res, $next) {
+        $this->app->setMiddleware('no-controller', function($req, $res, $next) {
             return "controller ignored";
         });
 
@@ -331,7 +331,7 @@ public function testResponseJson()
      */
     public function testMiddlewareKeepResponseToJson()
     {
-        $this->app->middleware('uppercase', function($req, $res, $next) {
+        $this->app->setMiddleware('uppercase', function($req, $res, $next) {
             $next();
             return strtoupper($res->body);
         });
@@ -345,6 +345,28 @@ public function testMiddlewareKeepResponseToJson()
         $this->assertResponse("GET", "/anything.json", '{"MESSAGE":"HELLO"}', 200, 'application/json');
     }
 
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState enabled
+     */
+    public function testGlobalMiddleware()
+    {
+        $this->app->setMiddleware('uppercase', function($req, $res, $next) {
+            $next();
+            return strtoupper($res->body);
+        });
+
+        $this->app->useMiddleware('uppercase');
+
+        $this->app->get('/anything.json', function() {
+            return [
+                'message' => 'hello'
+            ];
+        });
+
+        $this->assertResponse("GET", "/anything.json", '{"MESSAGE":"HELLO"}', 200, 'application/json');
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState enabled
@@ -369,7 +391,7 @@ public function testRouteGroupParamCondition()
      */
     public function testRouteGroupMiddleware()
     {
-        $this->app->middleware('setStr', function($req, $res, $next, $str) {
+        $this->app->setMiddleware('setStr', function($req, $res, $next, $str) {
             $req->str = $str;
             return $next();
         });
@@ -425,7 +447,7 @@ public function testAppBindedToClosure()
     {
         $this->app->something = "foo";
         $this->app->foo = "bar";
-        $this->app->middleware('test', function($req, $res, $next) {
+        $this->app->setMiddleware('test', function($req, $res, $next) {
             $next();
             return strtoupper($this->something.$res->body);
         });