Merge branch '0.7.x' of github.com:appwrite/appwrite into swoole-and-functions

app/controllers/general.php

@@ -413,7 +413,6 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
 
     $response->dynamic(new Document($output),
         $utopia->isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_LOCALE);
-        
 }, ['error', 'utopia', 'request', 'response', 'layout', 'project']);
 
 App::get('/manifest.json')

app/controllers/web/console.php

@@ -387,8 +387,7 @@ App::get('/console/version')
             
             if ($version && isset($version['version'])) {
                 return $response->json(['version' => $version['version']]);
-            }
+            } else {
-            else {
                 throw new Exception('Failed to check for a newer version', 500);
             }
         } catch (\Throwable $th) {

src/Appwrite/Auth/OAuth2/Box.php

@@ -9,9 +9,14 @@ use Appwrite\Auth\OAuth2;
 
 class Box extends OAuth2
 {
-
+    /**
+     * @var string
+     */
     private $endpoint = 'https://account.box.com/api/oauth2/';
 
+    /**
+     * @var string
+     */
     private $resourceEndpoint = 'https://api.box.com/2.0/';
 
     /**
@@ -19,6 +24,9 @@ class Box extends OAuth2
      */
     protected $user = [];
 
+    /**
+     * @var array
+     */
     protected $scopes = [
         'manage_app_users',    
     ];
@@ -148,5 +156,4 @@ class Box extends OAuth2
 
         return $this->user;
     }
-
 }

src/Appwrite/Database/Document.php

@@ -219,7 +219,7 @@ class Document extends ArrayObject
     {
         $array = parent::getArrayCopy();
 
-        $output = array();
+        $output = [];
 
         foreach ($array as $key => &$value) {
             if (!empty($whitelist) && !\in_array($key, $whitelist)) { // Export only whitelisted fields

src/Appwrite/Docker/Env.php

@@ -16,7 +16,6 @@ class Env
      */
     public function __construct(string $data)
     {
-
         $data = explode("\n", $data);
 
         foreach ($data as &$row) {

src/Appwrite/Storage/Storage.php

@@ -13,7 +13,7 @@ class Storage
      *
      * @var array
      */
-    public static $devices = array();
+    public static $devices = [];
 
     /**
      * Set Device.

src/Appwrite/Utopia/Response.php

@@ -238,8 +238,7 @@ class Response extends SwooleResponse
             if (!$document->isSet($key)) {
                 if (!is_null($rule['default'])) {
                     $document->setAttribute($key, $rule['default']);
-                }
+                } else {
-                else {
                     throw new Exception('Model '.$model->getName().' is missing response key: '.$key);
                 }
             }

tests/e2e/Services/Health/HealthBase.php

@@ -6,5 +6,4 @@ use Tests\E2E\Client;
 
 trait HealthBase
 {
-   
 }

tests/e2e/Services/Projects/ProjectsBase.php

@@ -6,5 +6,4 @@ use Tests\E2E\Client;
 
 trait ProjectsBase
 {
-    
 }

tests/unit/Network/Validators/OriginTest.php

@@ -60,6 +60,5 @@ class OriginTest extends TestCase
 
         $this->assertEquals($validator->isValid('appwrite-windows://com.company.appname'), false);
         $this->assertEquals($validator->getDescription(), 'Invalid Origin. Register your new client (com.company.appname) as a new Windows platform on your project console dashboard');
-
     }
 }