feat: review comments

2024-06-27 02:31:04 +12:00 · 2022-11-17 06:36:41 +00:00 · 2022-11-17 06:36:41 +00:00 · d75831380b
parent 9165da14b7
commit d75831380b
8 changed files with 134 additions and 66 deletions
--- a/.env
+++ b/.env
@ -23,7 +23,7 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_STORAGE_CONNECTION=
+_APP_CONNECTIONS_STORAGE=
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
--- a/2
+++ b/2
@ -195,7 +195,7 @@ ENV _APP_SERVER=swoole \
    _APP_STORAGE_ANTIVIRUS=enabled \
    _APP_STORAGE_ANTIVIRUS_HOST=clamav \
    _APP_STORAGE_ANTIVIRUS_PORT=3310 \
-    _APP_STORAGE_CONNECTION= \
+    _APP_CONNECTIONS_STORAGE= \
    _APP_REDIS_HOST=redis \
    _APP_REDIS_PORT=6379 \
    _APP_DB_HOST=mariadb \
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -489,7 +489,7 @@ return [
                'question' => '',
            ],
            [
-                'name' => '_APP_STORAGE_CONNECTION',
+                'name' => '_APP_CONNECTIONS_STORAGE',
                'description' => 'A DSN representing the storage device to connect to. The DSN takes the following format <device>://<access_key>:<access_secret>@<host>:<port>/<bucket>?region=<region>. For example, for S3: \'s3://access_key:access_secret@host:port/bucket?region=us-east-1\'. To use the local filesystem, you can leave this variable empty.',
                'introduction' => '1.1.0',
                'default' => '',
--- a/app/executor.php
+++ b/app/executor.php
@ -120,7 +120,7 @@ function logError(Throwable $error, string $action, Utopia\Route $route = null)

 function getStorageDevice($root): Device
 {
-    $connection = App::getEnv('_APP_STORAGE_CONNECTION', '');
+    $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', '');

    try {
        $dsn = new DSN($connection);
--- a/app/init.php
+++ b/app/init.php
@ -965,7 +965,7 @@ App::setResource('deviceBuilds', function ($project) {

 function getDevice($root): Device
 {
-    $connection = App::getEnv('_APP_STORAGE_CONNECTION', '');
+    $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', '');

    try {
        $dsn = new DSN($connection);
--- a/composer.lock
+++ b/composer.lock
@ -115,15 +115,15 @@
        },
        {
            "name": "appwrite/php-runtimes",
-            "version": "0.11.0",
+            "version": "0.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "547fc026e11c0946846a8ac690898f5bf53be101"
+                "reference": "9d74a477ba3333cbcfac565c46fcf19606b7b603"
            },
            "require": {
                "php": ">=8.0",
-                "utopia-php/system": "0.4.*"
+                "utopia-php/system": "0.6.*"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.3",
@ -154,7 +154,7 @@
                "php",
                "runtimes"
            ],
-            "time": "2022-08-15T14:03:36+00:00"
+            "time": "2022-11-07T16:45:52+00:00"
        },
        {
            "name": "chillerlan/php-qrcode",
@ -300,16 +300,16 @@
        },
        {
            "name": "colinmollenhour/credis",
-            "version": "v1.13.1",
+            "version": "v1.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/colinmollenhour/credis.git",
-                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49"
+                "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/85df015088e00daf8ce395189de22c8eb45c8d49",
-                "reference": "85df015088e00daf8ce395189de22c8eb45c8d49",
+                "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/dccc8a46586475075fbb012d8bd523b8a938c2dc",
+                "reference": "dccc8a46586475075fbb012d8bd523b8a938c2dc",
                "shasum": ""
            },
            "require": {
@ -341,9 +341,9 @@
            "homepage": "https://github.com/colinmollenhour/credis",
            "support": {
                "issues": "https://github.com/colinmollenhour/credis/issues",
-                "source": "https://github.com/colinmollenhour/credis/tree/v1.13.1"
+                "source": "https://github.com/colinmollenhour/credis/tree/v1.14.0"
            },
-            "time": "2022-06-20T22:56:59+00:00"
+            "time": "2022-11-09T01:18:39+00:00"
        },
        {
            "name": "composer/package-versions-deprecated",
@ -693,16 +693,16 @@
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "2.4.2",
+            "version": "2.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "3148458748274be1546f8f2809a6c09fe66f44aa"
+                "reference": "67c26b443f348a51926030c83481b85718457d3d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/3148458748274be1546f8f2809a6c09fe66f44aa",
-                "reference": "3148458748274be1546f8f2809a6c09fe66f44aa",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
+                "reference": "67c26b443f348a51926030c83481b85718457d3d",
                "shasum": ""
            },
            "require": {
@ -792,7 +792,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.3"
            },
            "funding": [
                {
@ -808,7 +808,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-10-25T13:49:28+00:00"
+            "time": "2022-10-26T14:07:24+00:00"
        },
        {
            "name": "influxdb/influxdb-php",
@ -931,6 +931,72 @@
            },
            "time": "2021-02-04T16:20:16+00:00"
        },
+        {
+            "name": "laravel/pint",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/pint.git",
+                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-tokenizer": "*",
+                "ext-xml": "*",
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.11.0",
+                "illuminate/view": "^9.27",
+                "laravel-zero/framework": "^9.1.3",
+                "mockery/mockery": "^1.5.0",
+                "nunomaduro/larastan": "^2.2",
+                "nunomaduro/termwind": "^1.14.0",
+                "pestphp/pest": "^1.22.1"
+            },
+            "bin": [
+                "builds/pint"
+            ],
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "App\\": "app/",
+                    "Database\\Seeders\\": "database/seeders/",
+                    "Database\\Factories\\": "database/factories/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
+                }
+            ],
+            "description": "An opinionated code formatter for PHP.",
+            "homepage": "https://laravel.com",
+            "keywords": [
+                "format",
+                "formatter",
+                "lint",
+                "linter",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/pint/issues",
+                "source": "https://github.com/laravel/pint"
+            },
+            "time": "2022-09-13T15:07:15+00:00"
+        },
        {
            "name": "matomo/device-detector",
            "version": "6.0.0",
@ -1658,16 +1724,16 @@
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace"
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace",
-                "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
                "shasum": ""
            },
            "require": {
@ -1676,7 +1742,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -1721,7 +1787,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
            },
            "funding": [
                {
@ -1737,7 +1803,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-10T07:21:04+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "utopia-php/abuse",
@ -2176,7 +2242,7 @@
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/dsn.git",
-                "reference": "9a524236c37474fcb121dc0d9eb13a0bcead9cf6"
+                "reference": "3a723fd6c52a161099145b5d96a535895de17069"
            },
            "require": {
                "php": ">=8.0"
@ -2215,7 +2281,7 @@
                "upf",
                "utopia"
            ],
-            "time": "2022-10-26T03:49:15+00:00"
+            "time": "2022-10-26T08:51:15+00:00"
        },
        {
            "name": "utopia-php/framework",
@ -2708,23 +2774,25 @@
        },
        {
            "name": "utopia-php/system",
-            "version": "0.4.0",
+            "version": "0.6.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/system.git",
-                "reference": "67c92c66ce8f0cc925a00bca89f7a188bf9183c0"
+                "reference": "289c4327713deadc9c748b5317d248133a02f245"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/system/zipball/67c92c66ce8f0cc925a00bca89f7a188bf9183c0",
-                "reference": "67c92c66ce8f0cc925a00bca89f7a188bf9183c0",
+                "url": "https://api.github.com/repos/utopia-php/system/zipball/289c4327713deadc9c748b5317d248133a02f245",
+                "reference": "289c4327713deadc9c748b5317d248133a02f245",
                "shasum": ""
            },
            "require": {
+                "laravel/pint": "1.2.*",
                "php": ">=7.4"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.3",
+                "squizlabs/php_codesniffer": "^3.6",
                "vimeo/psalm": "4.0.1"
            },
            "type": "library",
@ -2757,9 +2825,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/system/issues",
-                "source": "https://github.com/utopia-php/system/tree/0.4.0"
+                "source": "https://github.com/utopia-php/system/tree/0.6.0"
            },
-            "time": "2021-02-04T14:14:49+00:00"
+            "time": "2022-11-07T13:51:59+00:00"
        },
        {
            "name": "utopia-php/websocket",
@ -3183,16 +3251,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.1",
+            "version": "v4.15.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
-                "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
                "shasum": ""
            },
            "require": {
@ -3233,9 +3301,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
            },
-            "time": "2022-09-04T07:30:47+00:00"
+            "time": "2022-11-12T15:38:23+00:00"
        },
        {
            "name": "phar-io/manifest",
@ -3582,16 +3650,16 @@
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.17",
+            "version": "9.2.18",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
-                "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
+                "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a",
                "shasum": ""
            },
            "require": {
@ -3647,7 +3715,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18"
            },
            "funding": [
                {
@ -3655,7 +3723,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-08-30T12:24:04+00:00"
+            "time": "2022-10-27T13:35:33+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@ -5065,16 +5133,16 @@
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
-                "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                "shasum": ""
            },
            "require": {
@ -5089,7 +5157,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -5127,7 +5195,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
            },
            "funding": [
                {
@ -5143,20 +5211,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.26.0",
+            "version": "v1.27.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
-                "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                "shasum": ""
            },
            "require": {
@ -5171,7 +5239,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "1.26-dev"
+                    "dev-main": "1.27-dev"
                },
                "thanks": {
                    "name": "symfony/polyfill",
@ -5210,7 +5278,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
            },
            "funding": [
                {
@ -5226,7 +5294,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-24T11:49:31+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
        },
        {
            "name": "textalk/websocket",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -131,7 +131,7 @@ services:
      - _APP_STORAGE_ANTIVIRUS
      - _APP_STORAGE_ANTIVIRUS_HOST
      - _APP_STORAGE_ANTIVIRUS_PORT
-      - _APP_STORAGE_CONNECTION
+      - _APP_CONNECTIONS_STORAGE
      - _APP_FUNCTIONS_SIZE_LIMIT
      - _APP_FUNCTIONS_TIMEOUT
      - _APP_FUNCTIONS_BUILD_TIMEOUT
@ -284,7 +284,7 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_STORAGE_CONNECTION
+      - _APP_CONNECTIONS_STORAGE
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG
      - _APP_EXECUTOR_SECRET
@ -452,7 +452,7 @@ services:
      - OPEN_RUNTIMES_NETWORK
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG
-      - _APP_STORAGE_CONNECTION
+      - _APP_CONNECTIONS_STORAGE
      - DOCKERHUB_PULL_USERNAME
      - DOCKERHUB_PULL_PASSWORD

--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@ -285,7 +285,7 @@ abstract class Worker
     */
    public function getDevice($root): Device
    {
-        $connection = App::getEnv('_APP_STORAGE_CONNECTION', '');
+        $connection = App::getEnv('_APP_CONNECTIONS_STORAGE', '');

        try {
            $dsn = new DSN($connection);