Support sending PSR-7 responses from controllers

diff --git a/wcfsetup/install/files/lib/system/request/Request.class.php b/wcfsetup/install/files/lib/system/request/Request.class.php
index b5ea9678bac046f75b5ce61d36e5abad4e424c86..6cb3304e19619432baaea027887786fc24e4c21b 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/Request.class.php
+++ b/wcfsetup/install/files/lib/system/request/Request.class.php
@@ -86,7 +86,8 @@ class Request
     {
         if ($this->requestObject === null) {
             $this->requestObject = new $this->className();
-            $this->requestObject->__run();
+
+            return $this->requestObject->__run();
         }
     }
 

diff --git a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
index aefd18574f1f6bdf2f2b4e4a9917119e1a3365b7..74210e7966283b5ebc5328cc4562015abbdf5971 100644 (file)
--- a/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
+++ b/wcfsetup/install/files/lib/system/request/RequestHandler.class.php
@@ -2,6 +2,8 @@
 
 namespace wcf\system\request;
 
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
+use Psr\Http\Message\ResponseInterface;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\box\BoxHandler;
 use wcf\system\exception\AJAXException;
@@ -91,7 +93,12 @@ class RequestHandler extends SingletonFactory
             $this->checkOfflineMode();
 
             // start request
-            $this->getActiveRequest()->execute();
+            $result = $this->getActiveRequest()->execute();
+
+            if ($result instanceof ResponseInterface) {
+                $emitter = new SapiEmitter();
+                $emitter->emit($result);
+            }
         } catch (NamedUserException $e) {
             $e->show();