CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-07 15:36:19 +12:00
Code Issues Projects Releases Wiki Activity

Update request/response extensions for framework changes

Browse source
This commit is contained in:
Jake Barnby 2022-10-20 12:12:09 +13:00
parent f54aa1f4c2
commit ce76fb58b1
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
2 changed files with 20 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/Appwrite/Utopia/Request.php
View file

@ -9,53 +9,20 @@ use Utopia\Swoole\Request as UtopiaRequest;
class Request extends UtopiaRequest
{
/**
* @var Filter
*/
private static $filter = null;
private static ?Filter $filter = null;
private static ?Route $route = null;
/**
* @var Route
*/
private static $route = null;
/**
* Request constructor.
*/
public function __construct(SwooleRequest $request)
{
parent::__construct($request);
}
public function clone(): Request
{
return new self($this->swoole);
}
/**
* Get Params
*
* Get all params of current method
*
* @return array
* @inheritdoc
*/
public function getParams(): array
{
$requestParameters = [];
switch ($this->getMethod()) {
case self::METHOD_GET:
$requestParameters = (!empty($this->swoole->get)) ? $this->swoole->get : [];
break;
case self::METHOD_POST:
case self::METHOD_PUT:
case self::METHOD_PATCH:
case self::METHOD_DELETE:
$requestParameters = $this->generateInput();
break;
default:
$requestParameters = (!empty($this->swoole->get)) ? $this->swoole->get : [];
}
$requestParameters = parent::getParams();
if (self::hasFilter() && self::hasRoute()) {
$endpointIdentifier = self::getRoute()->getLabel('sdk.namespace', 'unknown') . '.' . self::getRoute()->getLabel('sdk.method', 'unknown');
@ -65,15 +32,14 @@ class Request extends UtopiaRequest
return $requestParameters;
}
/**
* Function to set a response filter
*
* @param $filter the response filter to set
* @param Filter|null $filter Filter the response filter to set
*
* @return void
*/
public static function setFilter(?Filter $filter)
public static function setFilter(?Filter $filter): void
{
self::$filter = $filter;
}
@ -81,7 +47,7 @@ class Request extends UtopiaRequest
/**
* Return the currently set filter
*
* @return Filter
* @return Filter|null
*/
public static function getFilter(): ?Filter
{
@ -101,19 +67,19 @@ class Request extends UtopiaRequest
/**
* Function to set a request route
*
* @param Route $route the request route to set
* @param Route|null $route the request route to set
*
* @return void
*/
public static function setRoute(?Route $route)
public static function setRoute(?Route $route): void
{
self::$route = $route;
}
/**
* Return the currently get route
* Return the current route
*
* @return Route
* @return Route|null
*/
public static function getRoute(): ?Route
{

12
src/Appwrite/Utopia/Response.php
View file

@ -375,7 +375,9 @@ class Response extends SwooleResponse
/**
* Get Model Object
*
* @param string $key
* @return Model
* @throws Exception
*/
public function getModel(string $key): Model
{
@ -415,6 +417,7 @@ class Response extends SwooleResponse
* @param string $model
*
* return void
* @throws Exception
*/
public function dynamic(Document $document, string $model): void
{
@ -427,11 +430,11 @@ class Response extends SwooleResponse
switch ($this->getContentType()) {
case self::CONTENT_TYPE_JSON:
$this->json(!empty($output) ? $output : new stdClass());
$this->json(!empty($output) ? $output : new \stdClass());
break;
case self::CONTENT_TYPE_YAML:
$this->yaml(!empty($output) ? $output : new stdClass());
$this->yaml(!empty($output) ? $output : new \stdClass());
break;
case self::CONTENT_TYPE_NULL:
@ -441,7 +444,7 @@ class Response extends SwooleResponse
if ($model === self::MODEL_NONE) {
$this->noContent();
} else {
$this->json(!empty($output) ? $output : new stdClass());
$this->json(!empty($output) ? $output : new \stdClass());
}
break;
}
@ -454,6 +457,8 @@ class Response extends SwooleResponse
* @param string $model
*
* return array
* @return array
* @throws Exception
*/
public function output(Document $document, string $model): array
{
@ -553,6 +558,7 @@ class Response extends SwooleResponse
* @param array $data
*
* @return void
* @throws Exception
*/
public function yaml(array $data): void
{