Merge pull request #123 from utopia-php/fix-missing-interface

Fix: Missing interfaces
utopia-php · Feb 20, 2024 · fd126c0 · fd126c0
2 parents f21fd86 + 0bba768
commit fd126c0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/src/Http/Adapter/FPM/Response.php b/src/Http/Adapter/FPM/Response.php
@@ -12,11 +12,12 @@ class Response extends UtopiaResponse
      * Send output
      *
      * @param  string  $content
-     * @return void
+     * @return bool False if write cannot complete, such as request ended by client
      */
-    protected function write(string $content): void
+    public function write(string $content): bool
     {
         echo $content;
+        return true;
     }
 
     /**
@@ -27,7 +28,7 @@ protected function write(string $content): void
      * @param  string  $content
      * @return void
      */
-    protected function end(string $content = null): void
+    public function end(string $content = null): void
     {
         if (!is_null($content)) {
             echo $content;
@@ -55,7 +56,7 @@ protected function sendStatus(int $statusCode): void
      * @param  string  $value
      * @return void
      */
-    protected function sendHeader(string $key, string $value): void
+    public function sendHeader(string $key, string $value): void
     {
         \header($key.': '.$value);
     }

diff --git a/src/Http/Adapter/Swoole/Response.php b/src/Http/Adapter/Swoole/Response.php
@@ -32,11 +32,11 @@ public function getSwooleResponse(): SwooleResponse
      * Write
      *
      * @param  string  $content
-     * @return void
+     * @return bool False if write cannot complete, such as request ended by client
      */
-    protected function write(string $content): void
+    public function write(string $content): bool
     {
-        $this->swoole->write($content);
+        return $this->swoole->write($content);
     }
 
     /**
@@ -45,7 +45,7 @@ protected function write(string $content): void
      * @param  string|null  $content
      * @return void
      */
-    protected function end(string $content = null): void
+    public function end(string $content = null): void
     {
         $this->swoole->end($content);
     }
@@ -68,7 +68,7 @@ protected function sendStatus(int $statusCode): void
      * @param  string  $value
      * @return void
      */
-    protected function sendHeader(string $key, string $value): void
+    public function sendHeader(string $key, string $value): void
     {
         $this->swoole->header($key, $value);
     }

diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -511,9 +511,9 @@ public function send(string $body = ''): void
      * Send output
      *
      * @param  string  $content
-     * @return void
+     * @return bool False if write cannot complete, such as request ended by client
      */
-    abstract protected function write(string $content): void;
+    abstract public function write(string $content): bool;
 
     /**
      * End
@@ -523,12 +523,7 @@ abstract protected function write(string $content): void;
      * @param  string  $content
      * @return void
      */
-    protected function end(string $content = null): void
-    {
-        if (!is_null($content)) {
-            echo $content;
-        }
-    }
+    abstract public function end(string $content = null): void;
 
     /**
      * Output response
@@ -608,7 +603,7 @@ abstract protected function sendStatus(int $statusCode): void;
      * @param  string  $value
      * @return void
      */
-    abstract protected function sendHeader(string $key, string $value): void;
+    abstract public function sendHeader(string $key, string $value): void;
 
     /**
      * Send Cookie