diff --git a/app/controllers/general.php b/app/controllers/general.php index 5a9a2febe..15e58cec9 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -21,6 +21,7 @@ use Utopia\CLI\Console; use Utopia\Database\Document; use Utopia\Database\Query; use Utopia\Database\Validator\Authorization; +use Appwrite\Utopia\Request\Filters\V12; Config::setParam('domainVerification', false); Config::setParam('cookieDomain', 'localhost'); @@ -37,6 +38,26 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons /** @var Utopia\Locale\Locale $locale */ /** @var array $clients */ + /* + * Request format + */ + $route = $utopia->match($request); + Request::setRoute($route); + + $requestFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', '')); + if ($requestFormat) { + switch($requestFormat) { + // TODO: For some reason console is still on 0.11. We dont want this filter logic in console, console uses 0.12 SDK + case version_compare ($requestFormat , '0.11.0', '<=') : + Request::setFilter(new V12()); + break; + default: + Request::setFilter(null); + } + } else { + Request::setFilter(null); + } + $domain = $request->getHostname(); $domains = Config::getParam('domains', []); if (!array_key_exists($domain, $domains)) { @@ -87,8 +108,6 @@ App::init(function ($utopia, $request, $response, $console, $project, $dbForCons $locale->setDefault($localeParam); } - $route = $utopia->match($request); - if ($project->isEmpty()) { throw new Exception('Project not found', 404); } diff --git a/app/http.php b/app/http.php index 7df9b963e..a73daa256 100644 --- a/app/http.php +++ b/app/http.php @@ -2,7 +2,6 @@ require_once __DIR__.'/../vendor/autoload.php'; -use Appwrite\Utopia\Request\Filters\V12; use Appwrite\Utopia\Response; use Swoole\Process; use Swoole\Http\Server; @@ -187,26 +186,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo Authorization::cleanRoles(); Authorization::setRole('role:all'); - /* - * Request format - */ - $route = $app->match($request); - Request::setRoute($route); - - $requestFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', '')); - if ($requestFormat) { - switch($requestFormat) { - // TODO: For some reason console is still on 0.11. We dont want this filter logic in console, console uses 0.12 SDK - case version_compare ($requestFormat , '0.11.0', '<=') : - Request::setFilter(new V12()); - break; - default: - Request::setFilter(null); - } - } else { - Request::setFilter(null); - } - $app->run($request, $response); } catch (\Throwable $th) { $version = App::getEnv('_APP_VERSION', 'UNKNOWN'); diff --git a/composer.json b/composer.json index 83d7d4fdb..fd744ed37 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "appwrite/php-clamav": "1.1.*", "appwrite/php-runtimes": "0.6.*", - "utopia-php/framework": "0.19.*", + "utopia-php/framework": "dev-fix-get-args-after-init", "utopia-php/logger": "0.1.*", "utopia-php/abuse": "0.7.*", "utopia-php/analytics": "0.2.*", @@ -66,7 +66,12 @@ "adhocore/jwt": "1.1.2", "slickdeals/statsd": "3.1.0" }, - "repositories": [], + "repositories": [ + { + "type": "git", + "url": "https://github.com/utopia-php/framework" + } + ], "require-dev": { "appwrite/sdk-generator": "0.16.3", "phpunit/phpunit": "9.5.10", diff --git a/tests/e2e/Services/Health/HealthCustomServerTest.php b/tests/e2e/Services/Health/HealthCustomServerTest.php index f7483d797..a15e456e5 100644 --- a/tests/e2e/Services/Health/HealthCustomServerTest.php +++ b/tests/e2e/Services/Health/HealthCustomServerTest.php @@ -158,7 +158,7 @@ class HealthCustomServerTest extends Scope $this->assertEquals(200, $response['headers']['status-code']); $this->assertIsInt($response['body']['size']); - $this->assertLessThan(160, $response['body']['size']); + $this->assertLessThan(200, $response['body']['size']); /** * Test for FAILURE