From ce76fb58b1e82c65c93a3cca8a1305d83562480b Mon Sep 17 00:00:00 2001
From: Jake Barnby <jakeb994@gmail.com>
Date: Thu, 20 Oct 2022 12:12:09 +1300
Subject: [PATCH] Update request/response extensions for framework changes

---
 src/Appwrite/Utopia/Request.php  | 56 +++++++-------------------------
 src/Appwrite/Utopia/Response.php | 12 +++++--
 2 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index 275f998ce5..e7745fa8db 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -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
     {
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index db42ff4879..4ac5f676e0 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -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
     {