Move resource ownership into utopia-php/di

Author: ChiragAgg5k

README.md

@@ -8,7 +8,7 @@
 
 Utopia HTTP is a PHP MVC based framework with minimal must-have features for professional, simple, advanced and secure web development. This library is maintained by the [Appwrite team](https://appwrite.io).
 
-Utopia HTTP is dependency-free. Any extra features, such as authentication or caching are available as standalone models in order to keep the framework core clean, light, and easy to learn.
+Utopia HTTP keeps routing and request lifecycle concerns separate from resource wiring by relying on the standalone Utopia DI package for dependency injection.
 
 ## Getting Started
 
@@ -23,11 +23,14 @@ Init your first application in `src/server.php`:
 ```php
 require_once __DIR__.'/../vendor/autoload.php';
 
+use Utopia\DI\Container;
 use Utopia\Http\Http;
 use Utopia\Http\Request;
 use Utopia\Http\Response;
 use Utopia\Http\Adapter\FPM\Server;
 
+$container = new Container();
+
 Http::get('/hello-world') // Define Route
     ->inject('request')
     ->inject('response')
@@ -43,7 +46,7 @@ Http::get('/hello-world') // Define Route
 
 Http::setMode(Http::MODE_TYPE_PRODUCTION);
 
-$http = new Http(new Server(), 'America/New_York');
+$http = new Http(new Server(), 'America/New_York', $container);
 $http->start();
 ```
 
@@ -66,10 +69,13 @@ The library supports server adapters to be able to run on any PHP setup. You cou
 #### Use PHP FPM server
 
 ```php
+use Utopia\DI\Container;
 use Utopia\Http\Http;
 use Utopia\Http\Response;
 use Utopia\Http\Adapter\FPM\Server;
 
+$container = new Container();
+
 Http::get('/')
     ->inject('response')
     ->action(
@@ -78,7 +84,7 @@ Http::get('/')
         }
     );
 
-$http = new Http(new Server(), 'America/New_York');
+$http = new Http(new Server(), 'America/New_York', $container);
 $http->start();
 ```
 
@@ -87,11 +93,14 @@ $http->start();
 #### Using Swoole server
 
 ```php
+use Utopia\DI\Container;
 use Utopia\Http\Http;
 use Utopia\Http\Request;
 use Utopia\Http\Response;
 use Utopia\Http\Adapter\Swoole\Server;
 
+$container = new Container();
+
 Http::get('/')
     ->inject('request')
     ->inject('response')
@@ -101,7 +110,7 @@ Http::get('/')
         }
     );
 
-$http = new Http(new Server('0.0.0.0', '80'), 'America/New_York');
+$http = new Http(new Server('0.0.0.0', '80'), 'America/New_York', $container);
 $http->start();
 ```
 
@@ -210,17 +219,19 @@ Groups are designed to be actions that run during the lifecycle of requests to e
 
 Resources allow you to prepare dependencies for requests such as database connection or the user who sent the request. A new instance of a resource is created for every request.
 
-Define a resource:
+Define a resource on the DI container:
 
 ```php
-Http::setResource('timing', function() {
+$container->setResource('timing', function() {
     return \microtime(true);
 });
 ```
 
 Inject resource into endpoint action:
 
 ```php
+$http = new Http(new Server(), 'America/New_York', $container);
+
 Http::get('/')
     ->inject('timing')
     ->inject('response')
@@ -248,7 +259,7 @@ To learn more about architecture and features for this library, check out more i
 
 ## System Requirements
 
-Utopia HTTP requires PHP 8.1 or later. We recommend using the latest PHP version whenever possible.
+Utopia HTTP requires PHP 8.2 or later. We recommend using the latest PHP version whenever possible.
 
 ## More from Utopia
 

docs/Getting-Starting-Guide.md

@@ -33,7 +33,7 @@ Http::get('/')
 $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) {
    $request = new Request($swooleRequest);
    $response = new Response($swooleResponse);
-   $http = new Http('America/Toronto');
+   $http = new Http($server, 'America/Toronto');
    $http->run($request, $response);
 });
 
@@ -281,7 +281,6 @@ Http::shutdown(function($request) {
 # Running Locally
 If you have PHP and Composer installed on your device, you can run Utopia apps locally by downloading the `utopia-php/http` dependency using `composer require utopia-php/http` command.
 
-> Utopia HTTP requires PHP 8.1 or later. We recommend using the latest PHP version whenever possible.
+> Utopia HTTP requires PHP 8.2 or later. We recommend using the latest PHP version whenever possible.
 
 Wonderful! 😄  You’re all set to create a basic demo app using the Utopia HTTP. If you have any issues or questions feel free to reach out to us on our [Discord Server](https://appwrite.io/discord).
-

src/Http/Adapter/FPM/Server.php

@@ -3,7 +3,6 @@
 namespace Utopia\Http\Adapter\FPM;
 
 use Utopia\Http\Adapter;
-use Utopia\Http\Http;
 
 class Server extends Adapter
 {
@@ -16,10 +15,10 @@ public function onRequest(callable $callback)
         $request = new Request();
         $response = new Response();
 
-        Http::setResource('fpmRequest', fn () => $request);
-        Http::setResource('fpmResponse', fn () => $response);
-
-        call_user_func($callback, $request, $response, 'fpm');
+        call_user_func($callback, $request, $response, 'fpm', [
+            'fpmRequest' => $request,
+            'fpmResponse' => $response,
+        ]);
     }
 
     public function onStart(callable $callback)

src/Http/Adapter/Swoole/Server.php

@@ -7,7 +7,6 @@
 use Swoole\Coroutine\Http\Server as SwooleServer;
 use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
-use Utopia\Http\Http;
 
 use function Swoole\Coroutine\run;
 
@@ -29,10 +28,10 @@ public function onRequest(callable $callback)
         $this->server->handle('/', function (SwooleRequest $request, SwooleResponse $response) use ($callback) {
             $context = \strval(Coroutine::getCid());
 
-            Http::setResource('swooleRequest', fn () => $request, [], $context);
-            Http::setResource('swooleResponse', fn () => $response, [], $context);
-
-            call_user_func($callback, new Request($request), new Response($response), $context);
+            call_user_func($callback, new Request($request), new Response($response), $context, [
+                'swooleRequest' => $request,
+                'swooleResponse' => $response,
+            ]);
         });
     }