diff --git a/function.php b/function.php index 3c6539a6..47dfd191 100644 --- a/function.php +++ b/function.php @@ -24,7 +24,7 @@ use Server\Constrict\Response; use Server\Constrict\ResponseInterface; use Server\ServerManager; use Swoole\WebSocket\Server; -use Server\Message\Response as Par7Response; +use Protocol\Message\Response as Par7Response; if (!function_exists('make')) { diff --git a/http-server/Constrict/Request.php b/http-server/Constrict/Request.php index cdf0a8f5..9ae58e42 100644 --- a/http-server/Constrict/Request.php +++ b/http-server/Constrict/Request.php @@ -11,7 +11,7 @@ use Protocol\Message\Uploaded; use Psr\Http\Message\StreamInterface; use Psr\Http\Message\UploadedFileInterface; use Psr\Http\Message\UriInterface; -use Server\Message\Response; +use Protocol\Message\Response; class Request implements RequestInterface diff --git a/http-server/Constrict/Response.php b/http-server/Constrict/Response.php index e16758a4..c9be9a22 100644 --- a/http-server/Constrict/Response.php +++ b/http-server/Constrict/Response.php @@ -8,8 +8,8 @@ use Http\Context\Context; use JetBrains\PhpStorm\Pure; use Kiri\Kiri; use Psr\Http\Message\StreamInterface; -use Server\Message\Request as RequestMessage; -use Server\Message\Response as Psr7Response; +use Protocol\Message\ServerRequest as RequestMessage; +use Protocol\Message\Response as Psr7Response; use Server\ServerManager; use Server\SInterface\DownloadInterface; diff --git a/http-server/Constrict/ResponseEmitter.php b/http-server/Constrict/ResponseEmitter.php index d144f39b..0be500f1 100644 --- a/http-server/Constrict/ResponseEmitter.php +++ b/http-server/Constrict/ResponseEmitter.php @@ -23,17 +23,18 @@ class ResponseEmitter implements Emitter /** * @param mixed $response - * @param \Server\Message\Response|ResponseInterface $emitter + * @param \Protocol\Message\Response|ResponseInterface $emitter + * @throws \Exception */ - public function sender(mixed $response, ResponseInterface|\Server\Message\Response $emitter): void + public function sender(mixed $response, ResponseInterface|\Protocol\Message\Response $emitter): void { if (is_array($emitter->getHeaders())) { foreach ($emitter->getHeaders() as $name => $values) { $response->header($name, implode(';', $values)); } } - if (is_array($emitter->getCookies())) { - foreach ($emitter->getCookies() as $name => $cookie) { + if (is_array($this->request->getCookieParams())) { + foreach ($this->request->getCookieParams() as $name => $cookie) { $response->cookie($name, ...$cookie); } } diff --git a/http-server/Constrict/ResponseInterface.php b/http-server/Constrict/ResponseInterface.php index a266b919..9c094f16 100644 --- a/http-server/Constrict/ResponseInterface.php +++ b/http-server/Constrict/ResponseInterface.php @@ -4,7 +4,7 @@ namespace Server\Constrict; use JetBrains\PhpStorm\Pure; -use Server\Message\Response; +use Protocol\Message\Response; use Server\SInterface\DownloadInterface; /** diff --git a/http-server/Service/Http.php b/http-server/Service/Http.php index 060a2d6f..c00e4ad5 100644 --- a/http-server/Service/Http.php +++ b/http-server/Service/Http.php @@ -9,7 +9,7 @@ use Http\Route\Node; use Kiri\Core\Help; use Server\Constant; use Server\Events\OnAfterRequest; -use Server\Message\Response as MsgResponse; +use Protocol\Message\Response as MsgResponse; use Server\Constrict\RequestInterface; use Server\Constrict\ResponseInterface; use Server\SInterface\OnClose; @@ -70,7 +70,7 @@ class Http extends \Server\Abstracts\Http implements OnClose, OnConnect * @return ResponseInterface * @throws Exception */ - private function transferToResponse(mixed $responseData): mixed + private function transferToResponse(mixed $responseData): ResponseInterface { $interface = $this->response->withStatus(200); if (!$interface->hasContentType()) {