migration updates

Author: ChiragAgg5k

composer.json

@@ -18,9 +18,10 @@
         "php": ">=8.0",
         "ext-json": "*",
         "ext-redis": "*",
+        "utopia-php/cli": "0.22.0",
         "utopia-php/framework": "0.34.*",
-        "utopia-php/cli": "0.15.*",
-        "utopia-php/queue": "0.14.*"
+        "utopia-php/queue": "0.14.*",
+        "utopia-php/validators": "0.1.*"
     },
     "require-dev": {
         "phpunit/phpunit": "9.*",

composer.lock

@@ -3,11 +3,11 @@
 namespace Utopia\Platform;
 
 use Exception;
-use Utopia\App;
 use Utopia\CLI\CLI;
+use Utopia\Http\Http;
+use Utopia\Http\Route;
 use Utopia\Queue\Adapter\Swoole;
 use Utopia\Queue\Server;
-use Utopia\Route;
 
 abstract class Platform
 {
@@ -82,16 +82,16 @@ protected function initHttp(array $services): void
                 /** @var Action $action */
                 switch ($action->getType()) {
                     case Action::TYPE_INIT:
-                        $hook = App::init();
+                        $hook = Http::init();
                         break;
                     case Action::TYPE_ERROR:
-                        $hook = App::error();
+                        $hook = Http::error();
                         break;
                     case Action::TYPE_OPTIONS:
-                        $hook = App::options();
+                        $hook = Http::options();
                         break;
                     case Action::TYPE_SHUTDOWN:
-                        $hook = App::shutdown();
+                        $hook = Http::shutdown();
                         break;
                     case Action::TYPE_DEFAULT:
                     default:
@@ -100,7 +100,7 @@ protected function initHttp(array $services): void
                         if ($httpMethod === null || $httpPath === null) {
                             throw new Exception('HTTP method and path must be set for default actions');
                         }
-                        $hook = App::addRoute($httpMethod, $httpPath);
+                        $hook = Http::addRoute($httpMethod, $httpPath);
                         break;
                 }
 
@@ -125,10 +125,7 @@ protected function initHttp(array $services): void
                                 $option['description'],
                                 $option['optional'],
                                 $option['injections'],
-                                $option['skipValidation'],
-                                $option['deprecated'],
-                                $option['example'],
-                                $option['model'],
+                                $option['skipValidation']
                             );
                             break;
                         case 'injection':

src/Platform/Platform.php

@@ -2,8 +2,8 @@
 
 namespace Utopia\Tests;
 
+use Utopia\Http\Response;
 use Utopia\Platform\Action;
-use Utopia\Response;
 
 class TestActionInit extends Action
 {

tests/Platform/TestActionInit.php

@@ -20,7 +20,7 @@ public function testCLISetup(): void
     {
         ob_start();
 
-        $cli = new CLI(['test.php', 'build', '--email=me@example.com', '--list=item1', '--list=item2']); // Mock command request
+        $cli = new CLI(null, ['test.php', 'build', '--email=me@example.com', '--list=item1', '--list=item2']); // Mock command request
 
         $platform = new TestPlatform();
         $platform->setCli($cli);

tests/e2e/CLITest.php

@@ -2,9 +2,8 @@
 
 require_once __DIR__.'/../../vendor/autoload.php';
 
-use Utopia\App;
-use Utopia\Request;
-use Utopia\Response;
+use Utopia\Http\Adapter\FPM\Server;
+use Utopia\Http\Http;
 use Utopia\Tests\TestPlatform;
 
 ini_set('memory_limit', '512M');
@@ -16,8 +15,6 @@
 $platform = new TestPlatform();
 $platform->init('http');
 
-$request = new Request();
-$response = new Response();
-
-$app = new App('UTC');
-$app->run($request, $response);
+$server = new Server();
+$http = new Http($server, 'UTC');
+$http->start();