From 0bd9426aa773c7e9300613624b850f9d947aa17c Mon Sep 17 00:00:00 2001 From: Binyamin Yawitz <316103+byawitz@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:13:39 -0400 Subject: [PATCH] feat: Adding `plans`, updating server and exception class --- app/controllers/general.php | 2 +- app/init2.php | 12 +++++++++--- composer.lock | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 0e35f8d599..d45d24e696 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -696,7 +696,7 @@ Http::error() } switch ($class) { - case 'Utopia\Exception': + case 'Utopia\Servers\Exception': $error = new AppwriteException(AppwriteException::GENERAL_UNKNOWN, $message, $code, $error); switch ($code) { case 400: diff --git a/app/init2.php b/app/init2.php index 2b7358d60b..bccee1b107 100644 --- a/app/init2.php +++ b/app/init2.php @@ -383,6 +383,7 @@ $global->set('promiseAdapter', function () { $log = new Dependency(); $mode = new Dependency(); $user = new Dependency(); +$plan = new Dependency(); $pools = new Dependency(); $geodb = new Dependency(); $cache = new Dependency(); @@ -399,9 +400,9 @@ $project = new Dependency(); $clients = new Dependency(); $servers = new Dependency(); $registry = new Dependency(); -$getProjectDB = new Dependency(); -$localeCodes = new Dependency(); $connections = new Dependency(); +$localeCodes = new Dependency(); +$getProjectDB = new Dependency(); $dbForProject = new Dependency(); $dbForConsole = new Dependency(); $queueForUsage = new Dependency(); @@ -413,9 +414,9 @@ $deviceForFiles = new Dependency(); $queueForEvents = new Dependency(); $queueForAudits = new Dependency(); $promiseAdapter = new Dependency(); -$requestTimestamp = new Dependency(); $deviceForBuilds = new Dependency(); $queueForDeletes = new Dependency(); +$requestTimestamp = new Dependency(); $queueForDatabase = new Dependency(); $queueForMessaging = new Dependency(); $queueForFunctions = new Dependency(); @@ -425,6 +426,10 @@ $passwordsDictionary = new Dependency(); $queueForCertificates = new Dependency(); +$plan + ->setName('plan') + ->setCallback(fn() => []); + $mode ->setName('mode') ->inject('request') @@ -1188,6 +1193,7 @@ $schema $container->set($log); $container->set($mode); $container->set($user); +$container->set($plan); $container->set($pools); $container->set($cache); $container->set($pools); diff --git a/composer.lock b/composer.lock index e65142d1f1..83c2b40509 100644 --- a/composer.lock +++ b/composer.lock @@ -2672,12 +2672,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/servers.git", - "reference": "e7eee7f82399c89adc28cf79912a9a41d7bb3233" + "reference": "4ce97c42158c20c7dcf0cdcdcf79080b879a1ee7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/servers/zipball/e7eee7f82399c89adc28cf79912a9a41d7bb3233", - "reference": "e7eee7f82399c89adc28cf79912a9a41d7bb3233", + "url": "https://api.github.com/repos/utopia-php/servers/zipball/4ce97c42158c20c7dcf0cdcdcf79080b879a1ee7", + "reference": "4ce97c42158c20c7dcf0cdcdcf79080b879a1ee7", "shasum": "" }, "require": { @@ -2735,7 +2735,7 @@ "source": "https://github.com/utopia-php/servers/tree/dev", "issues": "https://github.com/utopia-php/servers/issues" }, - "time": "2024-04-22T21:23:28+00:00" + "time": "2024-06-06T14:41:32+00:00" }, { "name": "utopia-php/storage",