WIP

2024-05-16 18:52:33 +12:00 · 2024-04-14 10:56:09 +02:00 · 2024-04-14 10:56:09 +02:00 · 08b3182ef3
parent 211bcf8948
commit 08b3182ef3
5 changed files with 190 additions and 104 deletions
--- a/composer.json
+++ b/composer.json
@ -52,9 +52,10 @@
        "utopia-php/cli": "0.17.*",
        "utopia-php/config": "0.2.*",
        "utopia-php/database": "dev-feat-framework-v2 as 0.49.99",
+        "utopia-php/di": "dev-main",
        "utopia-php/domains": "dev-feat-framework-v2 as 0.5.99",
        "utopia-php/dsn": "0.2.*",
-        "utopia-php/framework": "dev-feat-framework-v2 as 0.34.99",
+        "utopia-php/framework": "dev-feat-di-upgrade as 0.34.99",
        "utopia-php/image": "0.6.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.3.*",
@ -62,7 +63,7 @@
        "utopia-php/migration": "0.4.*",
        "utopia-php/orchestration": "dev-feat-framework-v2 as 0.9.99",
        "utopia-php/platform": "dev-feat-framework-v2 as 0.5.99",
-        "utopia-php/pools": "0.4.*",
+        "utopia-php/pools": "dev-feat-coroutine-support as 0.4.99",
        "utopia-php/view": "0.2.*",
        "utopia-php/queue": "dev-feat-framework-v2-v2 as 0.7.99",
        "utopia-php/registry": "0.5.*",
@ -96,5 +97,11 @@
        "platform": {
            "php": "8.3"
        }
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/di"
+        }
+    ]
 }
--- a/composer.lock
+++ b/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": "e29166ee5ac565b8a7ad696a46588abc",
+    "content-hash": "42c5379dff348d3525688891a96d1e85",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -1611,6 +1611,68 @@
            },
            "time": "2024-03-07T16:55:44+00:00"
        },
+        {
+            "name": "utopia-php/di",
+            "version": "dev-main",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/utopia-php/di.git",
+                "reference": "0bb7af5693bc131f4d2ce34d3f732d41e6637679"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/utopia-php/di/zipball/0bb7af5693bc131f4d2ce34d3f732d41e6637679",
+                "reference": "0bb7af5693bc131f4d2ce34d3f732d41e6637679",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "require-dev": {
+                "laravel/pint": "^1.2",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.5.25",
+                "swoole/ide-helper": "4.8.3"
+            },
+            "default-branch": true,
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Utopia\\": "src/",
+                    "Tests\\E2E\\": "tests/e2e"
+                }
+            },
+            "scripts": {
+                "lint": [
+                    "vendor/bin/pint --test"
+                ],
+                "format": [
+                    "vendor/bin/pint"
+                ],
+                "check": [
+                    "vendor/bin/phpstan analyse -c phpstan.neon"
+                ],
+                "test": [
+                    "vendor/bin/phpunit --configuration phpunit.xml"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "description": "A simple and lite library for managing dependency injections",
+            "keywords": [
+                "framework",
+                "http",
+                "php",
+                "upf"
+            ],
+            "support": {
+                "source": "https://github.com/utopia-php/di/tree/main",
+                "issues": "https://github.com/utopia-php/di/issues"
+            },
+            "time": "2024-04-08T22:41:41+00:00"
+        },
        {
            "name": "utopia-php/domains",
            "version": "dev-feat-framework-v2",
@ -1759,23 +1821,25 @@
        },
        {
            "name": "utopia-php/framework",
-            "version": "dev-feat-framework-v2",
+            "version": "dev-feat-di-upgrade",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/http.git",
-                "reference": "662f7f93d2cd2b6a8bfc07b5b61dbec57ac51c0c"
+                "reference": "aef4e9a7bcb3ba21b993f2daad0364657c2fe1aa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/http/zipball/662f7f93d2cd2b6a8bfc07b5b61dbec57ac51c0c",
-                "reference": "662f7f93d2cd2b6a8bfc07b5b61dbec57ac51c0c",
+                "url": "https://api.github.com/repos/utopia-php/http/zipball/aef4e9a7bcb3ba21b993f2daad0364657c2fe1aa",
+                "reference": "aef4e9a7bcb3ba21b993f2daad0364657c2fe1aa",
                "shasum": ""
            },
            "require": {
                "ext-swoole": "*",
-                "php": ">=8.0"
+                "php": ">=8.0",
+                "utopia-php/di": "dev-main"
            },
            "require-dev": {
+                "ext-xdebug": "*",
                "laravel/pint": "^1.2",
                "phpbench/phpbench": "^1.2",
                "phpstan/phpstan": "^1.10",
@ -1785,7 +1849,7 @@
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "Utopia\\Http\\": "src/Http"
+                    "Utopia\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -1801,9 +1865,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/http/issues",
-                "source": "https://github.com/utopia-php/http/tree/feat-framework-v2"
+                "source": "https://github.com/utopia-php/http/tree/feat-di-upgrade"
            },
-            "time": "2024-04-01T21:28:29+00:00"
+            "time": "2024-04-13T17:20:36+00:00"
        },
        {
            "name": "utopia-php/image",
@ -2217,16 +2281,16 @@
        },
        {
            "name": "utopia-php/pools",
-            "version": "0.4.2",
+            "version": "dev-feat-coroutine-support",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/pools.git",
-                "reference": "d2870ab74b31b7f4027799f082e85122154f8bed"
+                "reference": "ada61e5b86191644e779ea2c71cd7bf172e94fca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/pools/zipball/d2870ab74b31b7f4027799f082e85122154f8bed",
-                "reference": "d2870ab74b31b7f4027799f082e85122154f8bed",
+                "url": "https://api.github.com/repos/utopia-php/pools/zipball/ada61e5b86191644e779ea2c71cd7bf172e94fca",
+                "reference": "ada61e5b86191644e779ea2c71cd7bf172e94fca",
                "shasum": ""
            },
            "require": {
@ -2262,9 +2326,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/pools/issues",
-                "source": "https://github.com/utopia-php/pools/tree/0.4.2"
+                "source": "https://github.com/utopia-php/pools/tree/feat-coroutine-support"
            },
-            "time": "2022-11-22T07:55:45+00:00"
+            "time": "2024-04-10T21:34:22+00:00"
        },
        {
            "name": "utopia-php/queue",
@ -2935,16 +2999,16 @@
        },
        {
            "name": "laravel/pint",
-            "version": "v1.15.0",
+            "version": "v1.15.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/pint.git",
-                "reference": "c52de679b3ac01207016c179d7ce173e4be128c4"
+                "reference": "5f288b5e79938cc72f5c298d384e639de87507c6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/c52de679b3ac01207016c179d7ce173e4be128c4",
-                "reference": "c52de679b3ac01207016c179d7ce173e4be128c4",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/5f288b5e79938cc72f5c298d384e639de87507c6",
+                "reference": "5f288b5e79938cc72f5c298d384e639de87507c6",
                "shasum": ""
            },
            "require": {
@ -2955,13 +3019,13 @@
                "php": "^8.1.0"
            },
            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.49.0",
-                "illuminate/view": "^10.43.0",
-                "larastan/larastan": "^2.8.1",
+                "friendsofphp/php-cs-fixer": "^3.52.1",
+                "illuminate/view": "^10.48.4",
+                "larastan/larastan": "^2.9.2",
                "laravel-zero/framework": "^10.3.0",
-                "mockery/mockery": "^1.6.7",
+                "mockery/mockery": "^1.6.11",
                "nunomaduro/termwind": "^1.15.1",
-                "pestphp/pest": "^2.33.6"
+                "pestphp/pest": "^2.34.5"
            },
            "bin": [
                "builds/pint"
@ -2997,7 +3061,7 @@
                "issues": "https://github.com/laravel/pint/issues",
                "source": "https://github.com/laravel/pint"
            },
-            "time": "2024-03-26T16:40:24+00:00"
+            "time": "2024-04-02T14:28:47+00:00"
        },
        {
            "name": "matthiasmullie/minify",
@ -3413,28 +3477,35 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "version": "5.4.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
                "shasum": ""
            },
            "require": {
+                "doctrine/deprecations": "^1.1",
                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7",
                "webmozart/assert": "^1.9.1"
            },
            "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+                "mockery/mockery": "~1.3.5",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^5.13"
            },
            "type": "library",
            "extra": {
@ -3458,15 +3529,15 @@
                },
                {
                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "email": "opensource@ijaap.nl"
                }
            ],
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
            "support": {
                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
            },
-            "time": "2021-10-19T17:43:47+00:00"
+            "time": "2024-04-09T21:13:58+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
@ -3597,16 +3668,16 @@
        },
        {
            "name": "phpstan/phpdoc-parser",
-            "version": "1.27.0",
+            "version": "1.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
                "shasum": ""
            },
            "require": {
@ -3638,9 +3709,9 @@
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
            },
-            "time": "2024-03-21T13:14:53+00:00"
+            "time": "2024-04-03T18:51:33+00:00"
        },
        {
            "name": "phpstan/phpstan",
@ -5532,7 +5603,7 @@
        },
        {
            "package": "utopia-php/framework",
-            "version": "dev-feat-framework-v2",
+            "version": "dev-feat-di-upgrade",
            "alias": "0.34.99",
            "alias_normalized": "0.34.99.0"
        },
@ -5548,6 +5619,12 @@
            "alias": "0.5.99",
            "alias_normalized": "0.5.99.0"
        },
+        {
+            "package": "utopia-php/pools",
+            "version": "dev-feat-coroutine-support",
+            "alias": "0.4.99",
+            "alias_normalized": "0.4.99.0"
+        },
        {
            "package": "utopia-php/queue",
            "version": "dev-feat-framework-v2-v2",
@ -5567,10 +5644,12 @@
        "utopia-php/analytics": 20,
        "utopia-php/audit": 20,
        "utopia-php/database": 20,
+        "utopia-php/di": 20,
        "utopia-php/domains": 20,
        "utopia-php/framework": 20,
        "utopia-php/orchestration": 20,
        "utopia-php/platform": 20,
+        "utopia-php/pools": 20,
        "utopia-php/queue": 20,
        "utopia-php/storage": 20
    },
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -188,54 +188,54 @@ services:
      - _APP_MESSAGE_PUSH_TEST_DSN
      - _APP_CONSOLE_COUNTRIES_DENYLIST
      
-  appwrite-realtime:
-    entrypoint: realtime
-    <<: *x-logging
-    container_name: appwrite-realtime
-    image: appwrite-dev
-    restart: unless-stopped
-    ports:
-      - 9505:80
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=appwrite"
-      - "traefik.http.services.appwrite_realtime.loadbalancer.server.port=80"
-      #ws
-      - traefik.http.routers.appwrite_realtime_ws.entrypoints=appwrite_web
-      - traefik.http.routers.appwrite_realtime_ws.rule=PathPrefix(`/v1/realtime`)
-      - traefik.http.routers.appwrite_realtime_ws.service=appwrite_realtime
-      # wss
-      - traefik.http.routers.appwrite_realtime_wss.entrypoints=appwrite_websecure
-      - traefik.http.routers.appwrite_realtime_wss.rule=PathPrefix(`/v1/realtime`)
-      - traefik.http.routers.appwrite_realtime_wss.service=appwrite_realtime
-      - traefik.http.routers.appwrite_realtime_wss.tls=true
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - mariadb
-      - redis
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPTIONS_ABUSE
-      - _APP_OPTIONS_ROUTER_PROTECTION
-      - _APP_OPENSSL_KEY_V1
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
+  # appwrite-realtime:
+  #   entrypoint: realtime
+  #   <<: *x-logging
+  #   container_name: appwrite-realtime
+  #   image: appwrite-dev
+  #   restart: unless-stopped
+  #   ports:
+  #     - 9505:80
+  #   labels:
+  #     - "traefik.enable=true"
+  #     - "traefik.constraint-label-stack=appwrite"
+  #     - "traefik.docker.network=appwrite"
+  #     - "traefik.http.services.appwrite_realtime.loadbalancer.server.port=80"
+  #     #ws
+  #     - traefik.http.routers.appwrite_realtime_ws.entrypoints=appwrite_web
+  #     - traefik.http.routers.appwrite_realtime_ws.rule=PathPrefix(`/v1/realtime`)
+  #     - traefik.http.routers.appwrite_realtime_ws.service=appwrite_realtime
+  #     # wss
+  #     - traefik.http.routers.appwrite_realtime_wss.entrypoints=appwrite_websecure
+  #     - traefik.http.routers.appwrite_realtime_wss.rule=PathPrefix(`/v1/realtime`)
+  #     - traefik.http.routers.appwrite_realtime_wss.service=appwrite_realtime
+  #     - traefik.http.routers.appwrite_realtime_wss.tls=true
+  #   networks:
+  #     - appwrite
+  #   volumes:
+  #     - ./app:/usr/src/code/app
+  #     - ./src:/usr/src/code/src
+  #   depends_on:
+  #     - mariadb
+  #     - redis
+  #   environment:
+  #     - _APP_ENV
+  #     - _APP_WORKER_PER_CORE
+  #     - _APP_OPTIONS_ABUSE
+  #     - _APP_OPTIONS_ROUTER_PROTECTION
+  #     - _APP_OPENSSL_KEY_V1
+  #     - _APP_REDIS_HOST
+  #     - _APP_REDIS_PORT
+  #     - _APP_REDIS_USER
+  #     - _APP_REDIS_PASS
+  #     - _APP_DB_HOST
+  #     - _APP_DB_PORT
+  #     - _APP_DB_SCHEMA
+  #     - _APP_DB_USER
+  #     - _APP_DB_PASS
+  #     - _APP_USAGE_STATS
+  #     - _APP_LOGGING_PROVIDER
+  #     - _APP_LOGGING_CONFIG

  appwrite-worker-audits:
    entrypoint: worker-audits
@ -933,7 +933,7 @@ services:
      - MYSQL_DATABASE=${_APP_DB_SCHEMA}
      - MYSQL_USER=${_APP_DB_USER}
      - MYSQL_PASSWORD=${_APP_DB_PASS}
-    command: "mysqld --innodb-flush-method=fsync" # add ' --query_cache_size=0' for DB tests
+    command: "mysqld --innodb-flush-method=fsync --max-connections=10000" # 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:
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@ -3,10 +3,10 @@
 namespace Appwrite\Utopia;

 use Appwrite\Utopia\Request\Filter;
-use Utopia\Http\Adapter\Swoole\Request as SwooleRequest;
+use Utopia\Http\Adapter\Swoole\Request as HttpRequest;
 use Utopia\Http\Route;

-class Request extends SwooleRequest
+class Request extends HttpRequest
 {
    /**
     * @var array<Filter>
@ -17,9 +17,9 @@ class Request extends SwooleRequest
    /**
     * Request constructor.
     */
-    public function __construct(SwooleRequest $request)
+    public function __construct(HttpRequest $request)
    {
-        parent::__construct($request->getSwooleRequest());
+        parent::__construct($request->swoole);
    }

    /**
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@ -104,13 +104,13 @@ use Appwrite\Utopia\Response\Model\Webhook;
 use Exception;
 // Keep last
 use Utopia\Database\Document;
-use Utopia\Http\Adapter\Swoole\Response as SwooleResponse;
+use Utopia\Http\Adapter\Swoole\Response as HttpResponse;

 /**
 * @method int getStatusCode()
 * @method Response setStatusCode(int $code = 200)
 */
-class Response extends SwooleResponse
+class Response extends HttpResponse
 {
    // General
    public const MODEL_NONE = 'none';
@ -312,10 +312,8 @@ class Response extends SwooleResponse
     *
     * @param float $time
     */
-    public function __construct(SwooleResponse $response)
+    public function __construct(HttpResponse $response)
    {
-        parent::__construct($response->getSwooleResponse());
-
        $this
            // General
            ->setModel(new None())
@ -459,6 +457,8 @@ class Response extends SwooleResponse
            ->setModel(new MigrationFirebaseProject())
            // Tests (keep last)
            ->setModel(new Mock());
+
+            parent::__construct($response->swoole);
    }

    /**