Merge branch '0.10.x' of https://github.com/appwrite/appwrite into feat-265-realtime

.travis.yml

@@ -41,6 +41,9 @@ script:
 - docker-compose exec appwrite vars
 - docker-compose exec appwrite test --debug
 
+after_failure:
+- docker-compose logs appwrite
+
 deploy:
   - provider: script
     edge: true

app/controllers/general.php

@@ -305,7 +305,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
 
         if($route) {
             Console::error('[Error] Method: '.$route->getMethod());
-            Console::error('[Error] URL: '.$route->getURL());
+            Console::error('[Error] URL: '.$route->getPath());
         }
 
         Console::error('[Error] Type: '.get_class($error));

app/controllers/mock.php

@@ -518,7 +518,7 @@ App::shutdown(function($utopia, $response, $request) {
         throw new Exception('Failed to read results', 500);
     }
 
-    $result[$route->getMethod() . ':' . $route->getURL()] = true;
+    $result[$route->getMethod() . ':' . $route->getPath()] = true;
 
     $tests = \array_merge($tests, $result);
 
@@ -526,5 +526,5 @@ App::shutdown(function($utopia, $response, $request) {
         throw new Exception('Failed to save resutls', 500);
     }
 
-    $response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getURL() . ':passed']), Response::MODEL_MOCK);
+    $response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getPath() . ':passed']), Response::MODEL_MOCK);
 }, ['utopia', 'response', 'request'], 'mock');

app/controllers/shared/api.php

@@ -43,7 +43,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
         ->setParam('{userId}', $user->getId())
         ->setParam('{userAgent}', $request->getUserAgent(''))
         ->setParam('{ip}', $request->getIP())
-        ->setParam('{url}', $request->getHostname().$route->getURL())
+        ->setParam('{url}', $request->getHostname().$route->getPath())
     ;
 
     //TODO make sure we get array here

app/init.php

@@ -168,7 +168,6 @@ $register->set('dbPool', function () { // Register DB connection
     $dbPass = App::getEnv('_APP_DB_PASS', '');
     $dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
 
-
     $pool = new PDOPool((new PDOConfig())
         ->withHost($dbHost)
         ->withPort($dbPort)
@@ -176,6 +175,9 @@ $register->set('dbPool', function () { // Register DB connection
         ->withCharset('utf8mb4')
         ->withUsername($dbUser)
         ->withPassword($dbPass)
+        ->withOptions([
+            PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
+        ])
     , 16);
 
     return $pool;

app/views/install/compose.phtml

@@ -387,7 +387,7 @@ services:
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=${_APP_DB_USER}
       - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400'
+    command: 'mysqld --innodb-flush-method=fsync'
 
   redis:
     image: redis:6.0-alpine3.12

composer.json

@@ -38,7 +38,7 @@
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.4.*",
 
-        "utopia-php/framework": "0.17.*",
+        "utopia-php/framework": "0.18.*",
         "utopia-php/abuse": "0.5.*",
         "utopia-php/analytics": "0.2.*",
         "utopia-php/audit": "0.5.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d0304d97605ec2f0be74b0d87ad7597a",
+    "content-hash": "45963af754680568d89330a4f37c40d1",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1756,16 +1756,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.17.3",
+            "version": "0.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "0274f6b3e49db2af0d702edf278ec7504dc99878"
+                "reference": "f577522a5eb8009967b893fb7ad4ee70d3f7c0db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/0274f6b3e49db2af0d702edf278ec7504dc99878",
-                "reference": "0274f6b3e49db2af0d702edf278ec7504dc99878",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/f577522a5eb8009967b893fb7ad4ee70d3f7c0db",
+                "reference": "f577522a5eb8009967b893fb7ad4ee70d3f7c0db",
                 "shasum": ""
             },
             "require": {
@@ -1799,9 +1799,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.17.3"
+                "source": "https://github.com/utopia-php/framework/tree/0.18.0"
             },
-            "time": "2021-08-03T13:57:01+00:00"
+            "time": "2021-08-19T04:58:47+00:00"
         },
         {
             "name": "utopia-php/image",

docker-compose.yml

@@ -448,7 +448,7 @@ services:
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
       - MYSQL_USER=${_APP_DB_USER}
       - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400' # add ' --query_cache_size=0' for DB tests
+    command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
     # command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
 
   # smtp:

src/Appwrite/Specification/Format/OpenAPI3.php

@@ -91,7 +91,7 @@ class OpenAPI3 extends Format
         $usedModels = [];
 
         foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
-            $url = \str_replace('/v1', '', $route->getURL());
+            $url = \str_replace('/v1', '', $route->getPath());
             $scope = $route->getLabel('scope', '');
             $hide = $route->getLabel('sdk.hide', false);
             $consumes = [$route->getLabel('sdk.request.type', 'application/json')];

src/Appwrite/Specification/Format/Swagger2.php

@@ -89,7 +89,7 @@ class Swagger2 extends Format
         $usedModels = [];
 
         foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
-            $url = \str_replace('/v1', '', $route->getURL());
+            $url = \str_replace('/v1', '', $route->getPath());
             $scope = $route->getLabel('scope', '');
             $hide = $route->getLabel('sdk.hide', false);
             $consumes = [$route->getLabel('sdk.request.type', 'application/json')];