Merge pull request #2 from onursimsek/bugfix/issue-1

Fix for ViewController and alias middleware
onursimsek · Mar 6, 2024 · 97b0353 · 97b0353
2 parents 9571b82 + f2cee58
commit 97b0353
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 33 deletions.
diff --git a/src/Middleware/PreconditionRequest.php b/src/Middleware/PreconditionRequest.php
@@ -18,12 +18,14 @@ public function __construct(private readonly Router $router, private readonly Re
 
     public function handle(Request $request, Closure $next)
     {
-        $route = $this->router->getRoutes()->match($request);
-        if (! $route->getControllerClass()) {
+        $currentRoute = $this->router->getCurrentRoute();
+        $controllerClass = $currentRoute->getControllerClass();
+
+        if (! $controllerClass || in_array($controllerClass, ['\Illuminate\Routing\ViewController'])) {
             return $next($request);
         }
 
-        return $this->handleRequestUsingAttribute($request, $next, $route->getControllerClass(), $route->getActionMethod());
+        return $this->handleRequestUsingAttribute($request, $next, $controllerClass, $currentRoute->getActionMethod());
     }
 
     private function handleRequestUsingAttribute(Request $request, Closure $next, string $controller, string $action): Response

diff --git a/src/PreconditionServiceProvider.php b/src/PreconditionServiceProvider.php
@@ -4,7 +4,6 @@
 
 namespace OnurSimsek\Precondition;
 
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 use OnurSimsek\Precondition\Middleware\PreconditionRequest;
 
@@ -30,7 +29,6 @@ public function register(): void
 
     protected function registerMiddleware(): void
     {
-        $kernel = $this->app->make(Kernel::class);
-        $kernel->prependMiddleware($this->app->make(PreconditionRequest::class));
+        $this->app['router']->aliasMiddleware('precondition', PreconditionRequest::class);
     }
 }
diff --git a/tests/Unit/Middleware/PreconditionRequestTest.php b/tests/Unit/Middleware/PreconditionRequestTest.php
@@ -7,7 +7,6 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Route;
-use Illuminate\Routing\RouteCollectionInterface;
 use Illuminate\Routing\Router;
 use OnurSimsek\Precondition\Attributes\Precondition;
 use OnurSimsek\Precondition\Middleware\PreconditionRequest;
@@ -25,43 +24,36 @@ public function it_should_not_be_touch_closure_route()
             ->method('getControllerClass')
             ->willReturn(null);
 
-        $routeCollection = $this->getMockBuilder(RouteCollectionInterface::class)->getMock();
-        $routeCollection->expects($this->once())
-            ->method('match')
-            ->willReturn($route);
-
         $router = $this->getMockBuilder(Router::class)->disableOriginalConstructor()->getMock();
         $router->expects($this->once())
-            ->method('getRoutes')
-            ->willReturn($routeCollection);
+            ->method('getCurrentRoute')
+            ->willReturn($route);
 
         $reflection = $this->getReflectionMock();
         $middleware = new PreconditionRequest($router, $reflection);
 
-        self::assertInstanceOf(Response::class, $middleware->handle(new Request(), fn (Request $request) => new Response()));
+        self::assertInstanceOf(
+            Response::class,
+            $middleware->handle(new Request(), fn (Request $request) => new Response())
+        );
     }
 
     #[Test]
     public function it_should_not_be_touch_when_the_action_doesnt_have_the_attribute()
     {
         $route = $this->getMockBuilder(Route::class)->disableOriginalConstructor()->getMock();
-        $route->expects($this->exactly(2))
+        $route->expects($this->once())
             ->method('getControllerClass')
             ->willReturn('UserController');
 
         $route->expects($this->once())
             ->method('getActionMethod')
             ->willReturn('index');
 
-        $routeCollection = $this->getMockBuilder(RouteCollectionInterface::class)->getMock();
-        $routeCollection->expects($this->once())
-            ->method('match')
-            ->willReturn($route);
-
         $router = $this->getMockBuilder(Router::class)->disableOriginalConstructor()->getMock();
         $router->expects($this->once())
-            ->method('getRoutes')
-            ->willReturn($routeCollection);
+            ->method('getCurrentRoute')
+            ->willReturn($route);
 
         $reflection = $this->getReflectionMock();
         $reflection->expects($this->once())
@@ -74,30 +66,28 @@ public function it_should_not_be_touch_when_the_action_doesnt_have_the_attribute
 
         $middleware = new PreconditionRequest($router, $reflection);
 
-        self::assertInstanceOf(Response::class, $middleware->handle(new Request(), fn (Request $request) => new Response()));
+        self::assertInstanceOf(
+            Response::class,
+            $middleware->handle(new Request(), fn (Request $request) => new Response())
+        );
     }
 
     #[Test]
     public function it_can_be_validate_precondition_request()
     {
         $route = $this->getMockBuilder(Route::class)->disableOriginalConstructor()->getMock();
-        $route->expects($this->exactly(2))
+        $route->expects($this->once())
             ->method('getControllerClass')
             ->willReturn('UserController');
 
         $route->expects($this->once())
             ->method('getActionMethod')
             ->willReturn('index');
 
-        $routeCollection = $this->getMockBuilder(RouteCollectionInterface::class)->getMock();
-        $routeCollection->expects($this->once())
-            ->method('match')
-            ->willReturn($route);
-
         $router = $this->getMockBuilder(Router::class)->disableOriginalConstructor()->getMock();
         $router->expects($this->once())
-            ->method('getRoutes')
-            ->willReturn($routeCollection);
+            ->method('getCurrentRoute')
+            ->willReturn($route);
 
         $precondition = $this->getPreconditionAttributeMock();
         $precondition->expects($this->once())
@@ -119,7 +109,10 @@ public function it_can_be_validate_precondition_request()
 
         $middleware = new PreconditionRequest($router, $reflection);
 
-        self::assertInstanceOf(Response::class, $middleware->handle(new Request(), fn (Request $request) => new Response()));
+        self::assertInstanceOf(
+            Response::class,
+            $middleware->handle(new Request(), fn (Request $request) => new Response())
+        );
     }
 
     private function getReflectionMock(): \PHPUnit\Framework\MockObject\MockObject|Reflection