chore: downgrade utopia-php/http to version 0.34.* and update related tests

Author: lohanidamodar

composer.json

@@ -19,7 +19,7 @@
         "ext-json": "*",
         "ext-redis": "*",
         "utopia-php/servers": "0.3.*",
-        "utopia-php/http": "1.2.*",
+        "utopia-php/http": "0.34.*",
         "utopia-php/cli": "0.23.*",
         "utopia-php/queue": "0.16.*"
     },

composer.lock

@@ -6,30 +6,13 @@
 
 class MockResponse extends Response
 {
-    public function end(string $content = null): void
+    public function end(?string $content = null): void
     {
         if (! is_null($content)) {
             echo $content;
         }
     }
 
-    public function send(string $body = ''): void
-    {
-        $this->sent = true;
-        $this->end($body);
-    }
-
-    public function chunk(string $body = '', bool $end = false): void
-    {
-        if ($end) {
-            $this->sent = true;
-        }
-        $this->write($body);
-        if ($end) {
-            $this->end();
-        }
-    }
-
     public function write(string $content): bool
     {
         if (! is_null($content)) {
@@ -39,7 +22,7 @@ public function write(string $content): bool
         return true;
     }
 
-    protected function sendStatus(int $statusCode, string $reason): void
+    protected function sendStatus(int $statusCode): void
     {
         // TODO: Implement sendStatus() method.
     }

tests/Platform/MockResponse.php

@@ -5,7 +5,6 @@
 use PHPUnit\Framework\TestCase;
 use Utopia\DI\Container;
 use Utopia\Http\Adapter\FPM\Request;
-use Utopia\Http\Adapter\FPM\Response;
 use Utopia\Http\Adapter\FPM\Server;
 use Utopia\Http\Http;
 
@@ -23,10 +22,8 @@ public function setUp(): void
         $platform = new TestPlatform();
         $platform->init('http');
 
-        $server = new Server();
-        $this->http = new Http($server, new Container(), 'UTC');
-        $this->http->setRequestClass(Request::class);
-        $this->http->setResponseClass(Response::class);
+        $server = new Server(new Container());
+        $this->http = new Http($server, 'UTC');
     }
 
     public function tearDown(): void
@@ -39,83 +36,74 @@ public function testRootAction()
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
-        $context = new Container();
-        $context->set('response', fn () => new MockResponse());
-        $context->set('request', fn () => new Request());
+        $request = new Request();
+        $response = new MockResponse();
 
         \ob_start();
-        $this->http->run($context);
-        $response = \ob_get_contents();
+        $this->http->run($request, $response);
+        $result = \ob_get_contents();
         \ob_end_clean();
 
-        $this->assertEquals('Hello World!', $response);
+        $this->assertEquals('Hello World!', $result);
     }
 
     public function testChunkedAction()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/chunked';
 
-        $res = new MockResponse();
-        $context = new Container();
-        $context->set('response', fn () => $res);
-        $context->set('request', fn () => new Request());
+        $request = new Request();
+        $response = new MockResponse();
 
         \ob_start();
-        $this->http->run($context);
-        $response = \ob_get_contents();
+        $this->http->run($request, $response);
+        $result = \ob_get_contents();
         \ob_end_clean();
 
-        $this->assertEquals('Hello World!', $response);
+        $this->assertEquals('Hello World!', $result);
     }
 
     public function testRedirectAction()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/redirect';
 
-        $res = new MockResponse();
-        $context = new Container();
-        $context->set('response', fn () => $res);
-        $context->set('request', fn () => new Request());
+        $request = new Request();
+        $response = new MockResponse();
 
-        $this->http->run($context);
+        $this->http->run($request, $response);
 
-        $this->assertEquals('/', $res->getHeaders()['Location']);
+        $this->assertEquals('/', $response->getHeaders()['Location']);
     }
 
     public function testHook()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/';
 
-        $res = new MockResponse();
-        $context = new Container();
-        $context->set('response', fn () => $res);
-        $context->set('request', fn () => new Request());
+        $request = new Request();
+        $response = new MockResponse();
 
         \ob_start();
-        $this->http->run($context);
-        $response = \ob_get_contents();
+        $this->http->run($request, $response);
+        $result = \ob_get_contents();
         \ob_end_clean();
 
-        $this->assertEquals('Hello World!', $response);
-        $this->assertEquals('init-called', $res->getHeaders()['x-init']);
+        $this->assertEquals('Hello World!', $result);
+        $this->assertEquals('init-called', $response->getHeaders()['x-init']);
 
         $_SERVER['REQUEST_METHOD'] = 'GET';
         $_SERVER['REQUEST_URI'] = '/chunked';
 
-        $res1 = new MockResponse();
-        $context = new Container();
-        $context->set('response', fn () => $res1);
-        $context->set('request', fn () => new Request());
+        $request1 = new Request();
+        $response1 = new MockResponse();
 
         \ob_start();
-        $this->http->run($context);
-        $response = \ob_get_contents();
+        $this->http->run($request1, $response1);
+        $result = \ob_get_contents();
         \ob_end_clean();
 
-        $this->assertEquals('Hello World!', $response);
-        $this->assertEquals('', ($res1->getHeaders()['x-init'] ?? ''));
+        $this->assertEquals('Hello World!', $result);
+        $this->assertEquals('', ($response1->getHeaders()['x-init'] ?? ''));
     }
 }