as2252258/kiri-router
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

eee

Browse Source
This commit is contained in:
xl
2024-08-29 17:01:08 +08:00
parent 337c52c744
commit c435af1156
15 changed files with 61 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Format/ArrayFormat.php
+1 -9
View File
@@ -9,21 +9,13 @@ use Psr\Http\Message\ResponseInterface;
class ArrayFormat implements IFormat
{
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/**
* @param $result
* @return ResponseInterface
*/
public function call($result): ResponseInterface
{
return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
return di(ResponseInterface::class)->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
}
src/Format/MixedFormat.php
+5 -13
View File
@@ -2,22 +2,13 @@
namespace Kiri\Router\Format;
use Kiri\Di\Inject\Container;
use Kiri;
use Kiri\Router\Constrict\Stream;
use Kiri\Router\ContentType;
use Psr\Http\Message\ResponseInterface;
class MixedFormat implements IFormat
{
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/**
* @param mixed $result
* @return ResponseInterface
@@ -27,13 +18,14 @@ class MixedFormat implements IFormat
if ($result instanceof ResponseInterface) {
return $result;
}
$response = Kiri::getDi()->get(ResponseInterface::class);
if (is_object($result)) {
return $this->response->withBody(new Stream('[object]'));
return $response->withBody(new Stream('[object]'));
}
if (is_array($result)) {
return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
return $response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
} else {
return $this->response->withBody(new Stream((string)$result));
return $response->withBody(new Stream((string)$result));
}
}
src/Format/NoBody.php
+6 -14
View File
@@ -2,22 +2,13 @@
namespace Kiri\Router\Format;
use Kiri\Di\Inject\Container;
use Kiri;
use Kiri\Router\Constrict\Stream;
use Kiri\Router\ContentType;
use Psr\Http\Message\ResponseInterface;
class NoBody implements IFormat
{
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/**
* @param $result
* @return ResponseInterface
@@ -25,19 +16,20 @@ class NoBody implements IFormat
public function call($result): ResponseInterface
{
// TODO: Implement call() method.
$response = Kiri::getDi()->get(ResponseInterface::class);
if (request()->getMethod() === 'HEAD') {
return $this->response->withBody(new Stream());
return $response->withBody(new Stream());
}
if ($result instanceof ResponseInterface) {
return $result;
}
if (is_object($result)) {
return $this->response->withBody(new Stream('[object]'));
return $response->withBody(new Stream('[object]'));
}
if (is_array($result)) {
return $this->response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
return $response->withBody(new Stream(json_encode($result, JSON_UNESCAPED_UNICODE)));
} else {
return $this->response->withBody(new Stream((string)$result));
return $response->withBody(new Stream((string)$result));
}
}
}
src/Format/OtherFormat.php
+1 -9
View File
@@ -9,21 +9,13 @@ use Psr\Http\Message\ResponseInterface;
class OtherFormat implements IFormat
{
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/**
* @param mixed $result
* @return ResponseInterface
*/
public function call(mixed $result): ResponseInterface
{
return $this->response->withBody(new Stream($result));
return di(ResponseInterface::class)->withBody(new Stream($result));
}
src/Format/VoidFormat.php
+1 -10
View File
@@ -8,15 +8,6 @@ use Psr\Http\Message\ResponseInterface;
class VoidFormat implements IFormat
{
/**
* @var ResponseInterface
*/
#[Container(ResponseInterface::class)]
public ResponseInterface $response;
/**
* @param $result
* @return ResponseInterface
@@ -24,7 +15,7 @@ class VoidFormat implements IFormat
public function call($result): ResponseInterface
{
// TODO: Implement call() method.
return $this->response;
return di(ResponseInterface::class);
}
}