Refactor middleware handling for resource registration and add suppor…

…t for setting middleware for specific methods on registered resources

tests/Routing/RouteRegistrarTest.php

@@ -851,13 +851,13 @@ public function testCanSetMiddlewareForSpecificMethodsOnRegisteredResource()
                      ->middlewareFor(['create', 'store'], 'one')
                      ->middlewareFor(['edit'],['one', 'two']);
 
-        $this->assertEquals($this->router->getRoutes()->getByName('users.index')->gatherMiddleware(),[RouteRegistrarMiddlewareStub::class]);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.create')->gatherMiddleware(),['one']);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.store')->gatherMiddleware(),['one']);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.show')->gatherMiddleware(),[]);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.edit')->gatherMiddleware(),['one', 'two']);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.update')->gatherMiddleware(),[]);
-        $this->assertEquals($this->router->getRoutes()->getByName('users.destroy')->gatherMiddleware(),[]);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.index')->gatherMiddleware(), [RouteRegistrarMiddlewareStub::class]);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.create')->gatherMiddleware(), ['one']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.store')->gatherMiddleware(), ['one']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.show')->gatherMiddleware(), []);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.edit')->gatherMiddleware(), ['one', 'two']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.update')->gatherMiddleware(), []);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.destroy')->gatherMiddleware(), []);
     }
 
     public function testResourceWithoutMiddlewareRegistration()
@@ -1354,6 +1354,23 @@ public function testApiSingletonCanIncludeAnySingletonMethods()
         $this->assertTrue($this->router->getRoutes()->hasNamedRoute('user.edit'));
     }
 
+    public function testCanSetMiddlewareForSpecificMethodsOnRegisteredSingletonResource()
+    {
+        $this->router->singleton('users', RouteRegistrarControllerStub::class)
+                    ->creatable()
+                    ->destroyable()
+                    ->middlewareFor('show', RouteRegistrarMiddlewareStub::class)
+                    ->middlewareFor(['create', 'store'], 'one')
+                    ->middlewareFor(['edit'],['one', 'two']);
+
+        $this->assertEquals($this->router->getRoutes()->getByName('users.create')->gatherMiddleware(), ['one']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.store')->gatherMiddleware(), ['one']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.show')->gatherMiddleware(), [RouteRegistrarMiddlewareStub::class]);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.edit')->gatherMiddleware(), ['one', 'two']);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.update')->gatherMiddleware(), []);
+        $this->assertEquals($this->router->getRoutes()->getByName('users.destroy')->gatherMiddleware(), []);
+    }
+
     /**
      * Get the last route registered with the router.
      *