This commit is contained in:
2021-09-10 11:07:59 +08:00
parent 8e928c9c24
commit efbf2075f4
6 changed files with 12 additions and 11 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ use Server\Constrict\Response;
use Server\Constrict\ResponseInterface; use Server\Constrict\ResponseInterface;
use Server\ServerManager; use Server\ServerManager;
use Swoole\WebSocket\Server; use Swoole\WebSocket\Server;
use Server\Message\Response as Par7Response; use Protocol\Message\Response as Par7Response;
if (!function_exists('make')) { if (!function_exists('make')) {
+1 -1
View File
@@ -11,7 +11,7 @@ use Protocol\Message\Uploaded;
use Psr\Http\Message\StreamInterface; use Psr\Http\Message\StreamInterface;
use Psr\Http\Message\UploadedFileInterface; use Psr\Http\Message\UploadedFileInterface;
use Psr\Http\Message\UriInterface; use Psr\Http\Message\UriInterface;
use Server\Message\Response; use Protocol\Message\Response;
class Request implements RequestInterface class Request implements RequestInterface
+2 -2
View File
@@ -8,8 +8,8 @@ use Http\Context\Context;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
use Kiri\Kiri; use Kiri\Kiri;
use Psr\Http\Message\StreamInterface; use Psr\Http\Message\StreamInterface;
use Server\Message\Request as RequestMessage; use Protocol\Message\ServerRequest as RequestMessage;
use Server\Message\Response as Psr7Response; use Protocol\Message\Response as Psr7Response;
use Server\ServerManager; use Server\ServerManager;
use Server\SInterface\DownloadInterface; use Server\SInterface\DownloadInterface;
+5 -4
View File
@@ -23,17 +23,18 @@ class ResponseEmitter implements Emitter
/** /**
* @param mixed $response * @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())) { if (is_array($emitter->getHeaders())) {
foreach ($emitter->getHeaders() as $name => $values) { foreach ($emitter->getHeaders() as $name => $values) {
$response->header($name, implode(';', $values)); $response->header($name, implode(';', $values));
} }
} }
if (is_array($emitter->getCookies())) { if (is_array($this->request->getCookieParams())) {
foreach ($emitter->getCookies() as $name => $cookie) { foreach ($this->request->getCookieParams() as $name => $cookie) {
$response->cookie($name, ...$cookie); $response->cookie($name, ...$cookie);
} }
} }
+1 -1
View File
@@ -4,7 +4,7 @@ namespace Server\Constrict;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
use Server\Message\Response; use Protocol\Message\Response;
use Server\SInterface\DownloadInterface; use Server\SInterface\DownloadInterface;
/** /**
+2 -2
View File
@@ -9,7 +9,7 @@ use Http\Route\Node;
use Kiri\Core\Help; use Kiri\Core\Help;
use Server\Constant; use Server\Constant;
use Server\Events\OnAfterRequest; use Server\Events\OnAfterRequest;
use Server\Message\Response as MsgResponse; use Protocol\Message\Response as MsgResponse;
use Server\Constrict\RequestInterface; use Server\Constrict\RequestInterface;
use Server\Constrict\ResponseInterface; use Server\Constrict\ResponseInterface;
use Server\SInterface\OnClose; use Server\SInterface\OnClose;
@@ -70,7 +70,7 @@ class Http extends \Server\Abstracts\Http implements OnClose, OnConnect
* @return ResponseInterface * @return ResponseInterface
* @throws Exception * @throws Exception
*/ */
private function transferToResponse(mixed $responseData): mixed private function transferToResponse(mixed $responseData): ResponseInterface
{ {
$interface = $this->response->withStatus(200); $interface = $this->response->withStatus(200);
if (!$interface->hasContentType()) { if (!$interface->hasContentType()) {