Making middleware optionally arrays and updated comments

README.markdown

@@ -112,28 +112,6 @@ Minimal bootstrap file for this example
 
 ## Configuration
 
-### RESTful Routing
-
-You can define the http method that routes use by adding it to the beginning of the route and separating the http method and the path by a space (or any whitespace char(s) [space, tab, newline]).
-
-    $app->addRoutes(array(
-        '/'               => 'Home:index',
-        'get /posts'      => 'Posts:index',
-        'get /posts/:id'  => 'Posts:show',
-        'post /posts'     => 'Posts:create'
-    ));
-
-Leading spaces in routes are ignored and all spaces in between the http method and the route are ignored so that you can have sexy indenting like this:
-
-    $app->addRoutes(array(
-        '     /'           => 'Home:index',
-        'get  /posts'      => 'Posts:index',
-        'get  /posts/:id'  => 'Posts:show',
-        'post /posts'      => 'Posts:create'
-    ));
-
-If you don't specify an http method then that route will work with any http method.
-
 ### controller.class_prefix
 
 Optional class prefix for controller classes. Will be prepended to routes.

src/SlimController/Slim.php

@@ -38,14 +38,14 @@ class Slim extends \Slim\Slim
      * With explicit HTTP method
      * <code>
      * $app->addRoutes(array(
-     *  '/some/path' => array('className:methodName', 'get')
+     *  '/some/path' => array('get' => 'className:methodName')
      * ));
      * </code>
      *
      * With local middleware
      * <code>
      * $app->addRoutes(array(
-     *  '/some/path' => array('className:methodName', 'get', function() {})
+     *  '/some/path'  => array('get' => 'className:methodName', function() {})
      *  '/other/path' => array('className:methodName', function() {})
      * ));
      * </code>

tests/SlimController/Tests/SlimTest.php

@@ -37,7 +37,7 @@ public function testAddRoutesWithVariables()
         $this->assertEquals(1, count($this->app->router()->getMatchedRoutes($this->req->getMethod(), $this->req->getResourceUri())));
     }
 
-    public function testAddRoutesInRestFormat()
+    public function testAddRoutesInExtendedFormat()
     {
         $this->setUrl('/bla');
         $this->app->addRoutes(array(
@@ -76,6 +76,27 @@ public function testGlobalMiddlewareIsAddedToRoute()
         $this->assertSame(1, count($middleware));
     }
 
+    public function testGlobalMiddlewareIsAddedToRouteAsArray()
+    {
+        $middlewares = array(
+            function() { return false; },
+            function() { return false; }
+        );
+
+        $this->setUrl('/bla');
+        $this->app->addRoutes(array(
+            '/bla' => 'Controller:index'
+        ), $middlewares);
+
+        /** @var \Slim\Route[] $routes */
+        $routes = $this->app->router()->getMatchedRoutes($this->req->getMethod(), $this->req->getResourceUri());
+        $this->assertEquals(1, count($routes));
+
+        $middleware = $routes[0]->getMiddleware();
+        $this->assertInternalType('array', $middleware);
+        $this->assertSame(2, count($middleware));
+    }
+
     public function testLocalMiddlewareIsAddedToRoute()
     {
         $this->setUrl('/bla');