Compatible with swoole version 6.0 (#32)

Co-authored-by: 10470 <[email protected]> Co-authored-by: 李铭昕 <[email protected]>
hyperf · Dec 17, 2024 · 90be814 · 90be814
1 parent f041150
commit 90be814
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         php-version: [ '8.1', '8.2', '8.3' ]
-        swoole-version: [ 'v5.0.3', 'v5.1.2', 'master' ]
+        swoole-version: [ 'v5.0.3', 'v5.1.6', 'v6.0.0', 'master' ]
         exclude:
           - php-version: '8.3'
             swoole-version: 'v5.0.3'

diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -52,7 +52,11 @@ private function decodeHeaders(array $headers): array
         $result = [];
         foreach ($headers as $name => $header) {
             // The key of header is lower case.
-            $result[$name][] = $header;
+            if (is_array($header)) {
+                $result[$name] = $header;
+            } else {
+                $result[$name][] = $header;
+            }
         }
         if ($this->set_cookie_headers) {
             $result['set-cookie'] = $this->set_cookie_headers;

diff --git a/src/Signal.php b/src/Signal.php
@@ -19,6 +19,6 @@ class Signal implements SignalInterface
 {
     public static function wait(int $signo, float $timeout = -1): bool
     {
-        return System::waitSignal($signo, $timeout);
+        return System::waitSignal($signo, $timeout) !== false;
     }
 }
diff --git a/tests/Cases/ClientTest.php b/tests/Cases/ClientTest.php
@@ -138,18 +138,27 @@ public function testGuzzleClientWithCookies()
     public function testServerHeaders()
     {
         $this->runInCoroutine(function () {
-            // Co Client Won't support to get multi response headers.
             $client = new Client('127.0.0.1', 9501);
             $response = $client->request('GET', '/header');
-            $this->assertSame($response->body, implode(',', $response->headers['x-id']));
+            if (SWOOLE_VERSION_ID >= 60000) {
+                $this->assertSame($response->body, $response->headers['x-id'][1]);
+            } else {
+                // Co Client Won't support to get multi response headers.
+                $this->assertSame($response->body, implode(',', $response->headers['x-id']));
+            }
 
             $client = new GuzzleHttp\Client([
                 'base_uri' => 'http://127.0.0.1:9501/',
                 'handler' => GuzzleHttp\HandlerStack::create(new CoroutineHandler()),
             ]);
 
             $response = $client->get('/header');
-            $this->assertSame((string) $response->getBody(), $response->getHeaderLine('x-id'));
+            if (SWOOLE_VERSION_ID >= 60000) {
+                $this->assertSame((string) $response->getBody(), $response->getHeader('x-id')[1]);
+            } else {
+                // Co Client Won't support to get multi response headers.
+                $this->assertSame((string) $response->getBody(), $response->getHeaderLine('x-id'));
+            }
 
             // When Swoole version > 4.5, The native curl support to get multi response headers.
             if (SWOOLE_VERSION_ID >= 40600) {