Play around with interface, hopefully simplifying it.

src/FluxBB/Core/Action.php

@@ -73,15 +73,29 @@ abstract class Action implements MessageProviderInterface
 
 
     /**
-     * Determine whether the given subject is authorized to execute this action.
+     * Make sure the given subject is authorized to execute this action.
+     *
+     * If authorization fails, an exception should be thrown.
      *
-     * @param \FluxBB\Server\Request $request
      * @param \FluxBB\Models\HasPermissions $subject
-     * @return bool
+     * @return $this
+     * @throws \Exception
      */
-    public function authorize(Request $request, HasPermissions $subject)
+    public function authorize(HasPermissions $subject)
     {
-        return true;
+        return $this;
+    }
+
+    /**
+     * Set the request instance.
+     *
+     * @param \FluxBB\Server\Request $request
+     * @return $this
+     */
+    public function setRequest($request)
+    {
+        $this->request = $request;
+        return $this;
     }
 
     /**

src/FluxBB/Server/Server.php

@@ -59,26 +59,9 @@ public function dispatch(Request $request, HasPermissions $subject)
         // Create the action instance
         $action = $this->resolve($request->getHandler());
 
-        // Make sure that we are authorized for this request
-        $this->ensureAuthorization($action, $request, $subject);
-
-        return $action->handle($request);
-    }
-
-    /**
-     * Throw an exception in case we are not authorized to execute this action.
-     *
-     * @param \FluxBB\Core\Action $action
-     * @param \FluxBB\Server\Request $request
-     * @param \FluxBB\Models\HasPermissions $subject
-     * @return void
-     * @throws \Exception
-     */
-    protected function ensureAuthorization(Action $action, Request $request, HasPermissions $subject)
-    {
-        if (!$action->authorize($request, $subject)) {
-            throw new \Exception('Too bad, we are not authorized.');
-        }
+        return $action->setRequest($request)
+                      ->authorize($subject)
+                      ->execute();
     }
 
     /**