middleware

rueduphp · Feb 11, 2017 · 347b6a4 · 347b6a4
1 parent 6ed0484
commit 347b6a4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/arrays.php b/lib/arrays.php
@@ -19,7 +19,7 @@ public static function makeResourceWithName($name, array $array = [])
 
             self::$resources[$name] = $resource;
 
-            return $this;
+            return $resource;
         }
 
         public static function makeFromResourceName($name, $default = [], $unserialize = true)

diff --git a/lib/routes.php b/lib/routes.php
@@ -208,13 +208,17 @@ public static function __callStatic($m, $a)
                 return $route->setName($name);
             });
 
+            $route->macro('middleware', function (callable $cb) use ($route) {
+                return $route->setMiddleware($cb);
+            });
+
             $route->macro('uses', function ($string) use ($route) {
                 if (fnmatch('*@*', $string)) {
                     list($controller, $action) = explode('@', $string, 2);
-                }
-
-                if (fnmatch('*#*', $string)) {
+                } elseif (fnmatch('*#*', $string)) {
                     list($controller, $action) = explode('#', $string, 2);
+                } elseif (fnmatch('*.*', $string)) {
+                    list($controller, $action) = explode('.', $string, 2);
                 }
 
                 return $route