Merge branch 'master' into 3.2-merge

# Conflicts:
#	src/amqp/composer.json
#	src/async-queue/composer.json
#	src/cache/composer.json
#	src/circuit-breaker/composer.json
#	src/config-apollo/composer.json
#	src/config-center/composer.json
#	src/config-etcd/composer.json
#	src/config-nacos/composer.json
#	src/config/composer.json
#	src/constants/composer.json
#	src/consul/composer.json
#	src/crontab/composer.json
#	src/dag/composer.json
#	src/database-pgsql/composer.json
#	src/database-sqlite/composer.json
#	src/database/composer.json
#	src/db-connection/composer.json
#	src/db/composer.json
#	src/devtool/composer.json
#	src/di/composer.json
#	src/elasticsearch/composer.json
#	src/etcd/composer.json
#	src/exception-handler/composer.json
#	src/filesystem/composer.json
#	src/grpc-client/composer.json
#	src/grpc-server/composer.json
#	src/http-message/composer.json
#	src/http-server/composer.json
#	src/http2-client/composer.json
#	src/json-rpc/composer.json
#	src/kafka/composer.json
#	src/logger/composer.json
#	src/metric/composer.json
#	src/migration-generator/composer.json
#	src/model-cache/composer.json
#	src/model-listener/composer.json
#	src/nacos/composer.json
#	src/nats/composer.json
#	src/nsq/composer.json
#	src/paginator/composer.json
#	src/pool/composer.json
#	src/process/composer.json
#	src/rate-limit/composer.json
#	src/reactive-x/composer.json
#	src/redis/composer.json
#	src/resource-grpc/composer.json
#	src/resource/composer.json
#	src/retry/composer.json
#	src/rpc-client/composer.json
#	src/rpc-multiplex/composer.json
#	src/rpc-server/composer.json
#	src/rpc/composer.json
#	src/scout/composer.json
#	src/server/composer.json
#	src/service-governance-consul/composer.json
#	src/service-governance-nacos/composer.json
#	src/session/composer.json
#	src/signal/composer.json
#	src/snowflake/composer.json
#	src/socket/composer.json
#	src/socketio-server/composer.json
#	src/stringable/composer.json
#	src/super-globals/composer.json
#	src/support/composer.json
#	src/swagger/composer.json
#	src/task/composer.json
#	src/testing/composer.json
#	src/tracer/composer.json
#	src/translation/composer.json
#	src/utils/composer.json
#	src/validation/composer.json
#	src/view-engine/composer.json
#	src/view/composer.json
#	src/watcher/composer.json
#	src/websocket-client/composer.json
#	src/websocket-server/composer.json

Author: limingxinleo

composer.json

@@ -22,15 +22,18 @@
         "hyperf/collection": "~3.2.0",
         "hyperf/context": "~3.2.0",
         "hyperf/contract": "~3.2.0",
+        "hyperf/coordinator": "~3.2.0",
         "hyperf/coroutine": "~3.2.0",
         "hyperf/dispatcher": "~3.2.0",
+        "hyperf/engine": "^2.0",
         "hyperf/event": "~3.2.0",
         "hyperf/exception-handler": "~3.2.0",
         "hyperf/http-message": "~3.2.0",
         "hyperf/macroable": "~3.2.0",
         "hyperf/serializer": "~3.2.0",
         "hyperf/server": "~3.2.0",
         "hyperf/stdlib": "~3.2.0",
+        "hyperf/stringable": "~3.2.0",
         "hyperf/support": "~3.2.0",
         "nikic/fast-route": "^1.3",
         "psr/container": "^1.0 || ^2.0",

src/ResponseEmitter.php

@@ -68,7 +68,7 @@ protected function buildSwooleResponse(Response $swooleResponse, ResponseInterfa
                             'isRaw', 'getValue', 'getName', 'getExpiresTime', 'getPath', 'getDomain', 'isSecure', 'isHttpOnly', 'getSameSite',
                         ])) {
                             $value = $cookie->isRaw() ? $cookie->getValue() : rawurlencode($cookie->getValue());
-                            $swooleResponse->rawcookie($cookie->getName(), $value, $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly(), (string) $cookie->getSameSite());
+                            $swooleResponse->rawcookie($cookie->getName(), $value === '' ? 'deleted' : $value, $cookie->getExpiresTime(), $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(), $cookie->isHttpOnly(), (string) $cookie->getSameSite());
                         }
                     }
                 }

tests/ResponseTest.php

@@ -241,6 +241,7 @@ public function testCookiesAndHeaders()
         $id = uniqid();
         $cookie1 = new Cookie('Name', 'Hyperf');
         $cookie2 = new Cookie('Request-Id', $id);
+        $cookie3 = new Cookie('Cleared', '');
         $swooleResponse->shouldReceive('status')->with(200, 'OK')->andReturnUsing(function ($code) {
             $this->assertSame($code, 200);
             return true;
@@ -251,17 +252,17 @@ public function testCookiesAndHeaders()
             }
             return true;
         });
-        $swooleResponse->shouldReceive('rawcookie')->withAnyArgs()->twice()->andReturnUsing(function ($name, $value, ...$args) use ($id) {
-            $this->assertTrue($name == 'Name' || $name == 'Request-Id');
-            $this->assertTrue($value == 'Hyperf' || $value == $id);
+        $swooleResponse->shouldReceive('rawcookie')->withAnyArgs()->times(3)->andReturnUsing(function ($name, $value, ...$args) use ($id) {
+            $this->assertTrue(in_array($name, ['Name', 'Request-Id', 'Cleared']));
+            $this->assertTrue(in_array($value, ['Hyperf', $id, 'deleted']));
             return true;
         });
         $swooleResponse->shouldReceive('end')->once()->andReturn(true);
 
         Context::set(PsrResponseInterface::class, $psrResponse = new \Hyperf\HttpMessage\Server\Response());
 
         $response = new Response();
-        $response = $response->withCookie($cookie1)->withCookie($cookie2)->withHeader('X-Token', 'xxx')->withStatus(200);
+        $response = $response->withCookie($cookie1)->withCookie($cookie2)->withCookie($cookie3)->withHeader('X-Token', 'xxx')->withStatus(200);
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertInstanceOf(ResponseInterface::class, $response);