Support `RequestHandlerInterface`-based controllers in `wcf\system\request\Request`

diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php
index 7cc51e507fac9d2acde9f01fc732891e9835b290..d20c144faea70052dbf559201957bc25fdbf3138 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/Request.class.php
+++ b/wcfsetup/install/files/lib/system/request/Request.class.php
@@ -92,13 +92,17 @@ final class Request implements RequestHandlerInterface
             $this->requestObject = new $this->className();
         }
 
-        $response = $this->requestObject->__run();
+        if ($this->requestObject instanceof RequestHandlerInterface) {
+            return $this->requestObject->handle($request);
+        } else {
+            $response = $this->requestObject->__run();
 
-        if ($response instanceof ResponseInterface) {
-            return $response;
+            if ($response instanceof ResponseInterface) {
+                return $response;
+            } else {
+                return new LegacyPlaceholderResponse();
+            }
         }
-
-        return new LegacyPlaceholderResponse();
     }
 
     /**