Merge remote-tracking branch 'origin/1.1.x' into feat-usage-refactor

README-CN.md

@@ -21,6 +21,8 @@
 
 [English](README.md) | 简体中文
 
+[**我们发布了 Appwrite 1.0 版本！**](https://appwrite.io/1.0)
+
 Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面极简了从零编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
 
 Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs).

app/controllers/general.php

@@ -403,11 +403,6 @@ App::error()
         $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->match($request);
 
-        /** Delegate PDO exceptions to the global handler so the database connection can be returned to the pool */
-        if ($error instanceof PDOException) {
-            throw $error;
-        }
-
         if ($logger) {
             if ($error->getCode() >= 500 || $error->getCode() === 0) {
                 try {

app/http.php

@@ -316,13 +316,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
         Console::error('[Error] File: ' . $th->getFile());
         Console::error('[Error] Line: ' . $th->getLine());
 
-        /**
-         * Reset Database connection if PDOException was thrown.
-         */
-        if ($th instanceof PDOException) {
-            $db = null;
-        }
-
         $swooleResponse->setStatusCode(500);
 
         $output = ((App::isDevelopment())) ? [

app/workers/builds.php

@@ -183,7 +183,6 @@ class BuildsV1 extends Worker
 
             /* Also update the deployment buildTime */
             $deployment->setAttribute('buildTime', $response['duration']);
-            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
 
             Console::success("Build id: $buildId created");
 

composer.json

@@ -50,6 +50,7 @@
         "utopia-php/cli": "0.13.*",
         "utopia-php/config": "0.2.*",
         "utopia-php/database": "0.27.0",
+        "utopia-php/preloader": "0.2.*",
         "utopia-php/domains": "1.1.*",
         "utopia-php/framework": "0.22.*",
         "utopia-php/image": "0.5.*",
@@ -57,7 +58,6 @@
         "utopia-php/logger": "0.3.*",
         "utopia-php/messaging": "0.1.*",
         "utopia-php/orchestration": "0.6.*",
-        "utopia-php/preloader": "0.2.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.11.*",
         "utopia-php/swoole": "0.4.*",
@@ -93,4 +93,4 @@
             "php": "8.0"
         }
     }
-}
+}

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": "0d8c70aa8083e18082849c7ec6feb056",
+    "content-hash": "9b307ef7117f2d6ee9202e62ff9300d9",
     "packages": [
         {
             "name": "adhocore/jwt",