compatibility swoole branch

tastphp · Jul 25, 2017 · 9323289 · 9323289
1 parent 93858dd
commit 9323289
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/src/Framework/Event/HttpEvent.php b/src/Framework/Event/HttpEvent.php
@@ -10,10 +10,13 @@ final class HttpEvent extends Event
 
     protected $response;
 
-    public function __construct($request = null, $response = null)
+    protected $parameters;
+
+    public function __construct($request = null, $response = null, $parameters = null)
     {
         $this->request = $request;
         $this->response = $response;
+        $this->parameters = $parameters;
     }
 
     public function getResponse()
@@ -25,4 +28,9 @@ public function getRequest()
     {
         return $this->request;
     }
-}
+
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+}
diff --git a/src/Framework/Listener/ResponseListener.php b/src/Framework/Listener/ResponseListener.php
@@ -12,8 +12,12 @@ class ResponseListener
     public function onResponseAction(Event $event)
     {
         $response = $event->getResponse();
+        $app = $event->getParameters();
 
         if (is_string($response)) {
+            if (!empty($app['swoole'])) {
+                return $response;
+            }
             echo $response;
             return;
         }

diff --git a/src/Framework/Traits/KernelTrait.php b/src/Framework/Traits/KernelTrait.php
@@ -15,7 +15,10 @@ trait KernelTrait
      */
     public function run()
     {
-        $this['eventDispatcher']->dispatch(AppEvent::RESPONSE, new \TastPHP\Framework\Event\HttpEvent(null, $this['router']->matchCurrentRequest()));
+        $httpEvent = $this['eventDispatcher']->dispatch(AppEvent::RESPONSE, new \TastPHP\Framework\Event\HttpEvent(null, $this['router']->matchCurrentRequest(),$this));
+        if (!empty($this['swoole'])) {
+            return $httpEvent;
+        }
     }
 
     /**