rename

ChiragAgg5k · ChiragAgg5k · commit d386463944ff · 2026-02-09T17:26:46.000+05:30
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@ Init your first application:
 ```php
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-use Utopia\Http;
-use Utopia\Adapter\FPM\Request;
-use Utopia\Adapter\FPM\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Response;
 
 Http::get('/hello-world') // Define Route
     ->inject('request')
@@ -54,9 +54,9 @@ There are three types of hooks, init hooks, shutdown hooks and error hooks. Init
 ```php
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-use Utopia\Http;
-use Utopia\Adapter\FPM\Request;
-use Utopia\Adapter\FPM\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Response;
 
 Http::init()
     ->inject('response')
diff --git a/docs/Getting-Starting-Guide.md b/docs/Getting-Starting-Guide.md
@@ -9,9 +9,9 @@ If you’re new to Utopia, let’s get started by looking at an example of a bas
 ## Basic GET Route
 
 ```php
-use Utopia\Http;
-use Utopia\Adapter\Swoole\Request;
-use Utopia\Adapter\Swoole\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\Swoole\Request;
+use Utopia\Http\Adapter\Swoole\Response;
 use Swoole\Http\Server;
 use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
@@ -139,9 +139,9 @@ You can find the details of other status codes by visiting our [GitHub repositor
 Let's make the above example slightly advanced by adding more properties.
 
 ```php
-use Utopia\Http;
-use Utopia\Adapter\Swoole\Request;
-use Utopia\Adapter\Swoole\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Adapter\Swoole\Request;
+use Utopia\Http\Adapter\Swoole\Response;
 use Swoole\Http\Server;
 use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
diff --git a/src/Http/Adapter/Adapter.php b/src/Http/Adapter/Adapter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia\Adapter;
+namespace Utopia\Http\Adapter;
 
 abstract class Adapter
 {
diff --git a/src/Http/Adapter/FPM/Request.php b/src/Http/Adapter/FPM/Request.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Utopia\Adapter\FPM;
+namespace Utopia\Http\Adapter\FPM;
 
-use Utopia\Request as UtopiaRequest;
+use Utopia\Http\Request as UtopiaRequest;
 
 class Request extends UtopiaRequest
 {
diff --git a/src/Http/Adapter/FPM/Response.php b/src/Http/Adapter/FPM/Response.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Utopia\Adapter\FPM;
+namespace Utopia\Http\Adapter\FPM;
 
-use Utopia\Response as UtopiaResponse;
+use Utopia\Http\Response as UtopiaResponse;
 
 class Response extends UtopiaResponse
 {
diff --git a/src/Http/Adapter/FPM/Server.php b/src/Http/Adapter/FPM/Server.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Adapter\FPM;
+namespace Utopia\Http\Adapter\FPM;
 
-use Utopia\Adapter\Adapter;
-use Utopia\Http;
+use Utopia\Http\Adapter\Adapter;
+use Utopia\Http\Http;
 
 class Server extends Adapter
 {
diff --git a/src/Http/Adapter/Swoole/Request.php b/src/Http/Adapter/Swoole/Request.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Adapter\Swoole;
+namespace Utopia\Http\Adapter\Swoole;
 
 use Swoole\Http\Request as SwooleRequest;
-use Utopia\Request as UtopiaRequest;
+use Utopia\Http\Request as UtopiaRequest;
 
 class Request extends UtopiaRequest
 {
diff --git a/src/Http/Adapter/Swoole/Response.php b/src/Http/Adapter/Swoole/Response.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Adapter\Swoole;
+namespace Utopia\Http\Adapter\Swoole;
 
 use Swoole\Http\Response as SwooleResponse;
-use Utopia\Response as UtopiaResponse;
+use Utopia\Http\Response as UtopiaResponse;
 
 class Response extends UtopiaResponse
 {
diff --git a/src/Http/Adapter/Swoole/Server.php b/src/Http/Adapter/Swoole/Server.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Utopia\Adapter\Swoole;
+namespace Utopia\Http\Adapter\Swoole;
 
-use Utopia\Adapter\Adapter;
+use Utopia\Http\Adapter\Adapter;
 use Swoole\Http\Server as SwooleServer;
 use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
-use Utopia\Http;
+use Utopia\Http\Http;
 
 class Server extends Adapter
 {
diff --git a/src/Http/Exception.php b/src/Http/Exception.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 class Exception extends \Exception
 {
diff --git a/src/Http/Files.php b/src/Http/Files.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use Exception;
 
diff --git a/src/Http/Hook.php b/src/Http/Hook.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
+
+use Utopia\Validator;
 
 class Hook
 {
diff --git a/src/Http/Http.php b/src/Http/Http.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
+use Utopia\Validator;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\Telemetry\Histogram;
@@ -766,7 +767,7 @@ protected function getArguments(Hook $hook, array $values, array $requestParams)
                     throw new Exception('Model class does not exist: ' . $model, 500);
                 }
                 if (!\is_a($model, Model::class, true)) {
-                    throw new Exception('Model class is not an instance of Utopia\\Model', 500);
+                    throw new Exception('Model class is not an instance of Utopia\\Http\\Model', 500);
                 }
                 if (\is_string($value) && $value !== '') {
                     try {
diff --git a/src/Http/Model.php b/src/Http/Model.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 interface Model
 {
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 abstract class Request
 {
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use Utopia\Compression\Compression;
 
diff --git a/src/Http/Route.php b/src/Http/Route.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 class Route extends Hook
 {
@@ -162,7 +162,7 @@ public function setPathParam(string $key, int $index, string $path = ''): void
     /**
      * Get path params.
      *
-     * @param \Utopia\Request $request
+     * @param \Utopia\Http\Request $request
      * @return array
      */
     public function getPathValues(Request $request, string $path = ''): array
diff --git a/src/Http/Router.php b/src/Http/Router.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use Exception;
 
@@ -69,7 +69,7 @@ public static function setAllowOverride(bool $value): void
     /**
      * Add route to router.
      *
-     * @param \Utopia\Route $route
+     * @param \Utopia\Http\Route $route
      * @return void
      * @throws \Exception
      */
@@ -95,7 +95,7 @@ public static function addRoute(Route $route): void
     /**
      * Add route to router.
      *
-     * @param \Utopia\Route $route
+     * @param \Utopia\Http\Route $route
      * @return void
      * @throws \Exception
      */
@@ -119,7 +119,7 @@ public static function addRouteAlias(string $path, Route $route): void
      *
      * @param string $method
      * @param string $path
-     * @return \Utopia\Route|null
+     * @return \Utopia\Http\Route|null
      */
     public static function match(string $method, string $path): Route|null
     {
diff --git a/src/Http/View.php b/src/Http/View.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use Exception;
 
diff --git a/tests/HookTest.php b/tests/HookTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PHPUnit\Framework\TestCase;
 use Utopia\Validator\Numeric;
diff --git a/tests/HttpTest.php b/tests/HttpTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PHPUnit\Framework\TestCase;
-use Utopia\Adapter\FPM\Request;
-use Utopia\Adapter\FPM\Response;
-use Utopia\Tests\UtopiaRequestTest;
+use Utopia\Http\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Response;
+use Utopia\Http\Tests\UtopiaRequestTest;
 use Utopia\Validator\Text;
 use Exception;
 
diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Utopia\Tests;
+namespace Utopia\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Utopia\Http;
-use Utopia\Model;
-use Utopia\Adapter\FPM\Request;
-use Utopia\Adapter\FPM\Response;
+use Utopia\Http\Http;
+use Utopia\Http\Model;
+use Utopia\Http\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Response;
 use Utopia\Validator;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Text;
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia\Tests;
+namespace Utopia\Http\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Utopia\Adapter\FPM\Request;
+use Utopia\Http\Adapter\FPM\Request;
 
 class RequestTest extends TestCase
 {
diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PHPUnit\Framework\TestCase;
-use Utopia\Adapter\FPM\Response;
+use Utopia\Http\Adapter\FPM\Response;
 
 class ResponseTest extends TestCase
 {
@@ -24,15 +24,15 @@ public function testCanSetContentType()
         $contentType = $this->response->setContentType(Response::CONTENT_TYPE_HTML, Response::CHARSET_UTF8);
 
         // Assertions
-        $this->assertInstanceOf('Utopia\Response', $contentType);
+        $this->assertInstanceOf('Utopia\Http\Response', $contentType);
     }
 
     public function testCanSetStatus()
     {
         $status = $this->response->setStatusCode(Response::STATUS_CODE_OK);
 
         // Assertions
-        $this->assertInstanceOf('Utopia\Response', $status);
+        $this->assertInstanceOf('Utopia\Http\Response', $status);
 
         try {
             $this->response->setStatusCode(0); // Unknown status code
@@ -50,7 +50,7 @@ public function testCanGetStatus()
         $status = $this->response->setStatusCode(Response::STATUS_CODE_OK);
 
         // Assertions
-        $this->assertInstanceOf('Utopia\Response', $status);
+        $this->assertInstanceOf('Utopia\Http\Response', $status);
         $this->assertEquals(Response::STATUS_CODE_OK, $this->response->getStatusCode());
     }
 
diff --git a/tests/RouteTest.php b/tests/RouteTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PHPUnit\Framework\TestCase;
 use Utopia\Validator\Text;
diff --git a/tests/RouterBench.php b/tests/RouterBench.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PhpBench\Attributes\AfterMethods;
 use PhpBench\Attributes\Assert;
diff --git a/tests/RouterTest.php b/tests/RouterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Utopia;
+namespace Utopia\Http;
 
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/UtopiaRequestTest.php b/tests/UtopiaRequestTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Utopia\Tests;
+namespace Utopia\Http\Tests;
 
-use Utopia\Adapter\FPM\Request as UtopiaRequest;
+use Utopia\Http\Adapter\FPM\Request as UtopiaRequest;
 
 class UtopiaRequestTest extends UtopiaRequest
 {
diff --git a/tests/ViewTest.php b/tests/ViewTest.php
diff --git a/tests/e2e/ResponseTest.php b/tests/e2e/ResponseTest.php
diff --git a/tests/e2e/server.php b/tests/e2e/server.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Utopia\Adapter;`
	`3`	`+namespace Utopia\Http\Adapter;`
`4`	`4`
`5`	`5`	`abstract class Adapter`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Utopia\Adapter\FPM;`
	`3`	`+namespace Utopia\Http\Adapter\FPM;`
`4`	`4`
`5`		`-use Utopia\Request as UtopiaRequest;`
	`5`	`+use Utopia\Http\Request as UtopiaRequest;`
`6`	`6`
`7`	`7`	`class Request extends UtopiaRequest`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Utopia\Adapter\Swoole;`
	`3`	`+namespace Utopia\Http\Adapter\Swoole;`
`4`	`4`
`5`	`5`	`use Swoole\Http\Request as SwooleRequest;`
`6`		`-use Utopia\Request as UtopiaRequest;`
	`6`	`+use Utopia\Http\Request as UtopiaRequest;`
`7`	`7`
`8`	`8`	`class Request extends UtopiaRequest`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Utopia;`
	`3`	`+namespace Utopia\Http;`
`4`	`4`
`5`	`5`	`class Exception extends \Exception`
`6`	`6`	`{`