Framework V2

.github/workflows/bench.yml

@@ -13,10 +13,10 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.1'
 
     - name: Install dependencies
-      run: composer install --prefer-dist
+      run: composer install --prefer-dist --ignore-platform-reqs
 
     - name: Run Benchmarks
       run: composer bench -- --progress=plain

.github/workflows/lint.yml

@@ -13,10 +13,10 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.1'
 
     - name: Install dependencies
-      run: composer install --prefer-dist
+      run: composer install --prefer-dist --ignore-platform-reqs
 
     - name: Run Linter
       run: composer lint

.github/workflows/test.yml

@@ -13,13 +13,16 @@ jobs:
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.0'
+        php-version: '8.1'
 
     - name: Setup Docker
       run: docker-compose up -d --build
 
     - name: Wait for Server to be ready
       run: sleep 10
 
-    - name: Run Tests
-      run: docker compose exec web vendor/bin/phpunit --configuration phpunit.xml
+    - name: Run FPM Tests
+      run: docker compose exec fpm vendor/bin/phpunit --configuration phpunit.xml
+
+    - name: Run Swoole Tests
+      run: docker compose exec swoole vendor/bin/phpunit --configuration phpunit.xml

Dockerfile.swoole

@@ -0,0 +1,29 @@
+FROM composer:2.0 AS step0
+
+
+ARG TESTING=true
+
+ENV TESTING=$TESTING
+
+WORKDIR /usr/local/src/
+
+COPY composer.* /usr/local/src/
+
+RUN composer install --ignore-platform-reqs --optimize-autoloader \
+    --no-plugins --no-scripts --prefer-dist \
+    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
+
+FROM appwrite/base:0.2.2 as final
+LABEL maintainer="team@appwrite.io"
+
+WORKDIR /usr/src/code
+
+COPY ./src /usr/src/code/src
+COPY ./tests /usr/src/code/tests
+COPY ./phpunit.xml /usr/src/code/phpunit.xml
+COPY ./phpbench.json /usr/src/code/phpbench.json
+COPY --from=step0 /usr/local/src/vendor /usr/src/code/vendor
+
+EXPOSE 80
+
+CMD ["php", "tests/e2e/server_swoole.php"]

README.md

@@ -21,11 +21,12 @@ Init your first application:
 ```php
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-use Utopia\App;
-use Utopia\Request;
-use Utopia\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Request;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\FPM\Server;
 
-App::get('/hello-world') // Define Route
+Http::get('/hello-world') // Define Route
     ->inject('request')
     ->inject('response')
     ->action(
@@ -38,13 +39,78 @@ App::get('/hello-world') // Define Route
         }
     );
 
-App::setMode(App::MODE_TYPE_PRODUCTION); // Define Mode
+Http::setMode(Http::MODE_TYPE_PRODUCTION); // Define Mode
 
-$app        = new App('America/New_York');
-$request    = new Request();
-$response   = new Response();
+$http        = new Http(new Server(), 'America/New_York');
+$http->run();
+```
+
+### Server Adapters
+
+Library now supports server adapters and currently there are two servers implemented. You can use the PHP FPM server or the swoole server.
+
+**Use PHP FPM server**
+
+```php
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Response;
+use Utopia\Http\Adapter\FPM\Server;
+
+Http::get('/hello-world') // Define Route
+    ->inject('request')
+    ->inject('response')
+    ->action(
+        function($request, $response) {
+            $response
+              ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
+              ->addHeader('Expires', '0')
+              ->addHeader('Pragma', 'no-cache')
+              ->json(['Hello' => 'World']);
+        }
+    );
+
+Http::setMode(Http::MODE_TYPE_PRODUCTION); // Define Mode
+
+$http        = new Http(new Server(), 'America/New_York');
+$http->run(new Request(), new Response());
+```
+
+**Using swoole server**
+
+```php
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\Swoole\Request;
+use Utopia\Http\Adapter\Swoole\Response;
+use Utopia\Http\Adapter\Swoole\Server;
+
+Http::get('/hello-world') // Define Route
+    ->inject('request')
+    ->inject('response')
+    ->action(
+        function($request, $response) {
+            $response
+              ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
+              ->addHeader('Expires', '0')
+              ->addHeader('Pragma', 'no-cache')
+              ->json(['Hello' => 'World']);
+        }
+    );
+
+Http::setMode(Http::MODE_TYPE_PRODUCTION); // Define Mode
+
+$server = new Server('0.0.0.0', '80');
 
-$app->run($request, $response);
+$server->onRequest(function (Request $request, Response $response) use ($server) {
+    $http = new Http($server, 'UTC');
+    $http->run($request, $response);
+});
+
+$server->start();
 ```
 
 ### Hooks
@@ -54,17 +120,18 @@ There are three types of hooks, init hooks, shutdown hooks and error hooks. Init
 ```php
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-use Utopia\App;
-use Utopia\Request;
-use Utopia\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Request;
+use Utopia\Http\Response;
+use Utopia\Http\Adapter\FPM\Server;
 
-App::init()
+Http::init()
     ->inject('response')
     ->action(function($response) {
         $response->addHeader('content-type', 'application/json');
     });
 
-App::error()
+Http::error()
     ->inject('error')
     ->inject('response')
     ->action(function($error, $response) {
@@ -73,7 +140,7 @@ App::error()
             ->send('Error occurred ' . $error);
     });
 
-App::get('/hello-world') // Define Route
+Http::get('/hello-world') // Define Route
     ->inject('request')
     ->inject('response')
     ->action(
@@ -86,13 +153,10 @@ App::get('/hello-world') // Define Route
         }
     );
 
-App::setMode(App::MODE_TYPE_PRODUCTION); // Define Mode
-
-$app        = new App('America/New_York');
-$request    = new Request();
-$response   = new Response();
+Http::setMode(Http::MODE_TYPE_PRODUCTION); // Define Mode
 
-$app->run($request, $response);
+$http        = new Http(new Server(), 'America/New_York');
+$http->run();
 ```
 
 ## System Requirements

composer.json

@@ -11,7 +11,7 @@
     "minimum-stability": "stable",
     "autoload": {
         "psr-4": {
-            "Utopia\\": "src/"
+            "Utopia\\Http\\": "src/Http"
         }
     },
     "scripts": {
@@ -22,11 +22,13 @@
         "bench": "vendor/bin/phpbench run --report=benchmark"
     },
     "require": {
-        "php": ">=8.0"
+        "php": ">=8.0",
+        "ext-swoole": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.25",
         "laravel/pint": "^1.2",
+        "swoole/ide-helper": "4.8.3",
         "phpstan/phpstan": "^1.10",
         "phpbench/phpbench": "^1.2"
     }