Finish fixing phpstan errors

.github/workflows/php-stan-qality.yml

@@ -0,0 +1,16 @@
+name: "PHP Stan - CodeQL"
+
+on: [pull_request]
+jobs:
+  lint:
+    name: CodeQL
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Check out the repo
+      uses: actions/checkout@v2
+
+    - name: Run CodeQL
+      run: |
+        docker run --rm -v $PWD:/app composer sh -c \
+        "composer install --profile --ignore-platform-reqs && composer check"

app/cli.php

@@ -23,6 +23,8 @@ use Utopia\Queue\Connection;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
 
+/** @var Utopia\Registry\Registry $register */
+
 // overwriting runtimes to be architectur agnostic for CLI
 Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
 
@@ -57,6 +59,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
     $maxAttempts = 5;
     $attempts = 0;
     $ready = false;
+    $dbForConsole = null;
 
     do {
         $attempts++;
@@ -90,6 +93,8 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
         }
     } while ($attempts < $maxAttempts && !$ready);
 
+    /** @var Utopia\Database\Database $dbForConsole */
+
     if (!$ready) {
         throw new Exception("Console is not ready yet. Please try again later.");
     }

app/controllers/api/account.php

@@ -144,7 +144,7 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, Doc
         ->trigger();
 };
 
-
+// @phpstan-ignore class.notFound
 $createSession = function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails) {
     $roles = Authorization::getRoles();
     $isPrivilegedUser = Auth::isPrivilegedUser($roles);
@@ -581,13 +581,14 @@ App::delete('/v1/account/sessions')
                     ->setDocument($session)
                     ->trigger();
             }
+
+            $queueForEvents
+                ->setParam('userId', $user->getId())
+                ->setParam('sessionId', $session->getId()); // TODO: Trigger for all sessions
         }
 
         $dbForProject->purgeCachedDocument('users', $user->getId());
 
-        $queueForEvents
-            ->setParam('userId', $user->getId())
-            ->setParam('sessionId', $session->getId());
 
         $response->noContent();
     });
@@ -825,6 +826,7 @@ App::post('/v1/account/sessions/email')
     ->inject('queueForEvents')
     ->inject('queueForMails')
     ->inject('hooks')
+    // @phpstan-ignore class.notFound
     ->action(function (string $email, string $password, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Hooks $hooks) {
         $email = \strtolower($email);
         $protocol = $request->getProtocol();
@@ -955,6 +957,7 @@ App::post('/v1/account/sessions/anonymous')
     ->inject('dbForProject')
     ->inject('geodb')
     ->inject('queueForEvents')
+    // @phpstan-ignore class.notFound
     ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents) {
         $protocol = $request->getProtocol();
         $roles = Authorization::getRoles();
@@ -1252,6 +1255,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->inject('dbForProject')
     ->inject('geodb')
     ->inject('queueForEvents')
+    // @phpstan-ignore class.notFound
     ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Document $user, Database $dbForProject, Reader $geodb, Event $queueForEvents) use ($oauthDefaultSuccess) {
         $protocol = $request->getProtocol();
         $callback = $protocol . '://' . $request->getHostname() . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId();
@@ -1389,6 +1393,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
         }
 
         $sessions = $user->getAttribute('sessions', []);
+        $session = null;
         $current = Auth::sessionVerify($sessions, Auth::$secret);
 
         if ($current) { // Delete current session of new one.
@@ -1658,6 +1663,8 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
         }
 
+        /** @var Utopia\Database\Document $session */
+
         if (isset($sessionUpgrade) && $sessionUpgrade) {
             foreach ($user->getAttribute('targets', []) as $target) {
                 if ($target->getAttribute('providerType') !== MESSAGE_TYPE_PUSH) {
@@ -2554,6 +2561,7 @@ App::get('/v1/account/logs')
     ->inject('locale')
     ->inject('geodb')
     ->inject('dbForProject')
+    // @phpstan-ignore class.notFound
     ->action(function (array $queries, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject) {
 
         try {

app/controllers/api/avatars.php

@@ -52,7 +52,6 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
 
     $image = new Image(\file_get_contents($path));
     $image->crop((int) $width, (int) $height);
-    $output = (empty($output)) ? $type : $output;
     $data = $image->output($output, $quality);
     $response
         ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
@@ -271,7 +270,6 @@ App::get('/v1/avatars/image')
         }
 
         $image->crop((int) $width, (int) $height);
-        $output = (empty($output)) ? $type : $output;
         $data = $image->output($output, $quality);
 
         $response
@@ -416,7 +414,6 @@ App::get('/v1/avatars/favicon')
 
         $image = new Image($data);
         $image->crop((int) $width, (int) $height);
-        $output = (empty($output)) ? $type : $output;
         $data = $image->output($output, $quality);
 
         $response

app/controllers/api/databases.php

@@ -381,7 +381,7 @@ function updateAttribute(
                 size: $size,
                 required: $required,
                 default: $default,
-                formatOptions: $options ?? null,
+                formatOptions: $options,
                 newKey: $newKey ?? null
             );
         } catch (TruncateException) {
@@ -603,6 +603,7 @@ App::get('/v1/databases/:databaseId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $databaseId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = $dbForProject->getDocument('databases', $databaseId);
@@ -942,6 +943,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $databaseId, string $collectionId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
@@ -1067,8 +1069,6 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
         // Map aggregate permissions into the multiple permissions they represent.
         $permissions = Permission::aggregate($permissions);
 
-        $enabled ??= $collection->getAttribute('enabled', true);
-
         $collection = $dbForProject->updateDocument('database_' . $database->getInternalId(), $collectionId, $collection
             ->setAttribute('name', $name)
             ->setAttribute('$permissions', $permissions)
@@ -3296,6 +3296,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $databaseId, string $collectionId, string $documentId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));

app/controllers/api/functions.php

@@ -817,8 +817,6 @@ App::put('/v1/functions/:functionId')
             $runtime = $function->getAttribute('runtime');
         }
 
-        $enabled ??= $function->getAttribute('enabled', true);
-
         $repositoryId = $function->getAttribute('repositoryId', '');
         $repositoryInternalId = $function->getAttribute('repositoryInternalId', '');
 
@@ -1733,6 +1731,7 @@ App::post('/v1/functions/:functionId/executions')
     ->inject('queueForUsage')
     ->inject('queueForFunctions')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForConsole, Document $user, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb) {
         $async = \strval($async) === 'true' || \strval($async) === '1';
 
@@ -1840,7 +1839,7 @@ App::post('/v1/functions/:functionId/executions')
         $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
         $headers['x-appwrite-trigger'] = 'http';
         $headers['x-appwrite-user-id'] = $user->getId() ?? '';
-        $headers['x-appwrite-user-jwt'] = $jwt ?? '';
+        $headers['x-appwrite-user-jwt'] = $jwt;
         $headers['x-appwrite-country-code'] = '';
         $headers['x-appwrite-continent-code'] = '';
         $headers['x-appwrite-continent-eu'] = 'false';
@@ -1957,7 +1956,7 @@ App::post('/v1/functions/:functionId/executions')
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
+                'APPWRITE_FUNCTION_DATA' => $body,
                 'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
             ]);

app/controllers/api/health.php

@@ -134,11 +134,11 @@ App::get('/v1/health/cache')
 
         foreach ($configs as $key => $config) {
             foreach ($config as $database) {
+                $checkStart = \microtime(true);
+
                 try {
                     $adapter = $pools->get($database)->pop()->getResource();
 
-                    $checkStart = \microtime(true);
-
                     if ($adapter->ping()) {
                         $output[] = new Document([
                             'name' => $key . " ($database)",
@@ -191,11 +191,11 @@ App::get('/v1/health/queue')
 
         foreach ($configs as $key => $config) {
             foreach ($config as $database) {
+                $checkStart = \microtime(true);
+
                 try {
                     $adapter = $pools->get($database)->pop()->getResource();
 
-                    $checkStart = \microtime(true);
-
                     if ($adapter->ping()) {
                         $output[] = new Document([
                             'name' => $key . " ($database)",
@@ -248,11 +248,11 @@ App::get('/v1/health/pubsub')
 
         foreach ($configs as $key => $config) {
             foreach ($config as $database) {
+                $checkStart = \microtime(true);
+
                 try {
                     $adapter = $pools->get($database)->pop()->getResource();
 
-                    $checkStart = \microtime(true);
-
                     if ($adapter->ping()) {
                         $output[] = new Document([
                             'name' => $key . " ($database)",

app/controllers/api/locale.php

@@ -25,6 +25,7 @@ App::get('/v1/locale')
     ->inject('response')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (Request $request, Response $response, Locale $locale, Reader $geodb) {
         $eu = Config::getParam('locale-eu');
         $currencies = Config::getParam('locale-currencies');
@@ -210,6 +211,7 @@ App::get('/v1/locale/continents')
     ->action(function (Response $response, Locale $locale) {
         $list = Config::getParam('locale-continents');
 
+        $output = [];
         foreach ($list as $value) {
             $output[] = new Document([
                 'name' => $locale->getText('continents.' . strtolower($value)),

app/controllers/api/messaging.php

@@ -899,6 +899,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $providerId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
         $provider = $dbForProject->getDocument('providers', $providerId);
 
@@ -2031,6 +2032,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $topicId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
         $topic = $dbForProject->getDocument('topics', $topicId);
 
@@ -2399,6 +2401,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $subscriberId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
         $subscriber = $dbForProject->getDocument('subscribers', $subscriberId);
 
@@ -2932,9 +2935,8 @@ App::post('/v1/messaging/messages/push')
             $host = System::getEnv('_APP_DOMAIN', 'localhost');
             $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
 
-            $scheduleTime = $currentScheduledAt ?? $scheduledAt;
-            if (!\is_null($scheduleTime)) {
-                $expiry = (new \DateTime($scheduleTime))->add(new \DateInterval('P15D'))->format('U');
+            if (!\is_null($scheduledAt)) {
+                $expiry = (new \DateTime($scheduledAt))->add(new \DateInterval('P15D'))->format('U');
             } else {
                 $expiry = (new \DateTime())->add(new \DateInterval('P15D'))->format('U');
             }
@@ -3081,6 +3083,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $messageId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
         $message = $dbForProject->getDocument('messages', $messageId);
 

app/controllers/api/project.php

@@ -276,8 +276,6 @@ App::get('/v1/project/usage')
             'buildsStorageTotal' => $total[METRIC_BUILDS_STORAGE],
             'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
             'executionsBreakdown' => $executionsBreakdown,
-            'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
-            'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
             'bucketsBreakdown' => $bucketsBreakdown,
             'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
             'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,

app/controllers/api/storage.php

@@ -257,10 +257,6 @@ App::put('/v1/storage/buckets/:bucketId')
 
         $permissions ??= $bucket->getPermissions();
         $maximumFileSize ??= $bucket->getAttribute('maximumFileSize', (int) System::getEnv('_APP_STORAGE_LIMIT', 0));
-        $allowedFileExtensions ??= $bucket->getAttribute('allowedFileExtensions', []);
-        $enabled ??= $bucket->getAttribute('enabled', true);
-        $encryption ??= $bucket->getAttribute('encryption', true);
-        $antivirus ??= $bucket->getAttribute('antivirus', true);
 
         /**
          * Map aggregate permissions into the multiple permissions they represent,
@@ -581,8 +577,8 @@ App::post('/v1/storage/buckets/:bucketId/files')
             if ($bucket->getAttribute('encryption', true) && $fileSize <= APP_STORAGE_READ_BUFFER) {
                 $openSSLVersion = '1';
                 $openSSLCipher = OpenSSL::CIPHER_AES_128_GCM;
-                $openSSLTag = \bin2hex($tag);
-                $openSSLIV = \bin2hex($iv);
+                $openSSLTag = '';
+                $openSSLIV = '';
             }
 
             if ($file->isEmpty()) {
@@ -1666,7 +1662,7 @@ App::get('/v1/storage/usage')
         ];
 
         $total = [];
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
             foreach ($metrics as $metric) {
                 $result =  $dbForProject->findOne('stats', [
                     Query::equal('metric', [$metric]),
@@ -1751,7 +1747,7 @@ App::get('/v1/storage/:bucketId/usage')
         ];
 
 
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
             foreach ($metrics as $metric) {
                 $result =  $dbForProject->findOne('stats', [
                     Query::equal('metric', [$metric]),

app/controllers/api/teams.php

@@ -454,7 +454,7 @@ App::post('/v1/teams/:teamId/memberships')
             }
         } elseif (!empty($phone)) {
             $invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
-            if (!empty($invitee) && !empty($email) && $invitee->getAttribute('email', '') !== $email) {
+            if (!empty($invitee) && $invitee->getAttribute('email', '') !== $email) {
                 throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
             }
         }
@@ -950,6 +950,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->inject('project')
     ->inject('geodb')
     ->inject('queueForEvents')
+    // @phpstan-ignore class.notFound
     ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $queueForEvents) {
         $protocol = $request->getProtocol();
 
@@ -1145,6 +1146,7 @@ App::get('/v1/teams/:teamId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $teamId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $team = $dbForProject->getDocument('teams', $teamId);

app/controllers/api/users.php

@@ -775,6 +775,7 @@ App::get('/v1/users/:userId/logs')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (string $userId, array $queries, Response $response, Database $dbForProject, Locale $locale, Reader $geodb) {
 
         $user = $dbForProject->getDocument('users', $userId);
@@ -1780,6 +1781,7 @@ App::post('/v1/users/:userId/sessions')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
+    // @phpstan-ignore class.notFound
     ->action(function (string $userId, Request $request, Response $response, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents) {
         $user = $dbForProject->getDocument('users', $userId);
         if ($user->isEmpty()) {

app/controllers/api/vcs.php

@@ -82,10 +82,6 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
             }
 
-            if (empty($repositoryName)) {
-                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
-            }
-
             $isAuthorized = !$external;
 
             if (!$isAuthorized && !empty($providerPullRequestId)) {

app/controllers/general.php

@@ -44,6 +44,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
+// @phpstan-ignore class.notFound
 function router(App $utopia, Database $dbForConsole, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Reader $geodb)
 {
     $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
@@ -242,7 +243,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
+                'APPWRITE_FUNCTION_DATA' => $body,
                 'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
             ]);
@@ -450,6 +451,7 @@ App::init()
     ->inject('queueForUsage')
     ->inject('queueForEvents')
     ->inject('queueForCertificates')
+    // @phpstan-ignore class.notFound
     ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates) {
         /*
         * Appwrite Router
@@ -667,6 +669,7 @@ App::options()
     ->inject('queueForEvents')
     ->inject('queueForUsage')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
         /*
         * Appwrite Router
@@ -954,6 +957,7 @@ App::get('/robots.txt')
     ->inject('queueForEvents')
     ->inject('queueForUsage')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
@@ -979,6 +983,7 @@ App::get('/humans.txt')
     ->inject('queueForEvents')
     ->inject('queueForUsage')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');

app/controllers/mock.php

@@ -229,6 +229,8 @@ App::get('/v1/mock/github/callback')
             throw new Exception(Exception::PROJECT_NOT_FOUND, $error);
         }
 
+        $installation = new Document();
+
         if (!empty($providerInstallationId)) {
             $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
             $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');

app/controllers/shared/api/auth.php

@@ -35,6 +35,7 @@ App::init()
     ->inject('request')
     ->inject('project')
     ->inject('geodb')
+    // @phpstan-ignore class.notFound
     ->action(function (App $utopia, Request $request, Document $project, Reader $geodb) {
         $denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
         if (!empty($denylist && $project->getId() === 'console')) {

app/http.php

@@ -26,6 +26,8 @@ use Utopia\Pools\Group;
 use Utopia\Swoole\Files;
 use Utopia\System\System;
 
+/** @var Utopia\Registry\Registry $register */
+
 $http = new Server(
     host: "0.0.0.0",
     port: System::getEnv('PORT', 80),
@@ -71,12 +73,12 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
         $attempts = 0;
         $max = 10;
         $sleep = 1;
+        $dbForConsole = null;
 
         do {
             try {
                 $attempts++;
                 $dbForConsole = $app->getResource('dbForConsole');
-                /** @var Utopia\Database\Database $dbForConsole */
                 break; // leave the do-while if successful
             } catch (\Throwable $e) {
                 Console::warning("Database not ready. Retrying connection ({$attempts})...");
@@ -87,6 +89,8 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
             }
         } while ($attempts < $max);
 
+        /** @var Utopia\Database\Database $dbForConsole */
+
         Console::success('[Setup] - Server database init started...');
 
         try {

app/init.php

@@ -781,7 +781,7 @@ $register->set('logger', function () {
         };
     }
 
-    if (empty($providerName) || empty($providerConfig)) {
+    if (empty($providerName)) {
         return;
     }
 
@@ -1028,6 +1028,7 @@ $register->set('smtp', function () {
     return $mail;
 });
 $register->set('geodb', function () {
+    // @phpstan-ignore class.notFound
     return new Reader(__DIR__ . '/assets/dbip/dbip-country-lite-2024-09.mmdb');
 });
 $register->set('passwordsDictionary', function () {

app/realtime.php

@@ -266,7 +266,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     $attempts = 0;
     $start = time();
 
-    Timer::tick(5000, function () use ($server, $register, $realtime, $stats, $logError) {
+    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
         /**
          * Sending current connections to project channels on the console project every 5 seconds.
          */

app/worker.php

@@ -36,6 +36,8 @@ use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
 
+/** @var Utopia\Registry\Registry $register */
+
 Authorization::disable();
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
@@ -272,7 +274,6 @@ Server::setResource('deviceForCache', function (Document $project) {
     return getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
 }, ['project']);
 
-
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');

composer.json

@@ -14,7 +14,8 @@
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/pint --test",
         "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark"
+        "bench": "vendor/bin/phpbench run --report=benchmark",
+        "check": "./vendor/bin/phpstan analyse --level 1 -c phpstan.neon app src tests"
     },
     "autoload": {
         "psr-4": {
@@ -88,7 +89,8 @@
         "swoole/ide-helper": "5.1.2",
         "textalk/websocket": "1.5.7",
         "laravel/pint": "^1.14",
-        "phpbench/phpbench": "^1.2"
+        "phpbench/phpbench": "^1.2",
+        "phpstan/phpstan": "1.12.*"
     },
     "provide": {
         "ext-phpiredis": "*"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b6820da26239716cf14a445697902a03",
+    "content-hash": "95bd5ac66d795d804215b495ba0221e9",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -2069,16 +2069,16 @@
         },
         {
             "name": "utopia-php/logger",
-            "version": "0.6.0",
+            "version": "0.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/logger.git",
-                "reference": "a2d1daeeb8f61fdec6d851950d9a021a3d05c9f9"
+                "reference": "7e8ff512c6f04577aba1df67c7b9628971946f9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/logger/zipball/a2d1daeeb8f61fdec6d851950d9a021a3d05c9f9",
-                "reference": "a2d1daeeb8f61fdec6d851950d9a021a3d05c9f9",
+                "url": "https://api.github.com/repos/utopia-php/logger/zipball/7e8ff512c6f04577aba1df67c7b9628971946f9c",
+                "reference": "7e8ff512c6f04577aba1df67c7b9628971946f9c",
                 "shasum": ""
             },
             "require": {
@@ -2117,9 +2117,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/logger/issues",
-                "source": "https://github.com/utopia-php/logger/tree/0.6.0"
+                "source": "https://github.com/utopia-php/logger/tree/0.6.1"
             },
-            "time": "2024-05-23T13:37:54+00:00"
+            "time": "2024-09-20T14:02:12+00:00"
         },
         {
             "name": "utopia-php/messaging",
@@ -3314,16 +3314,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.17.3",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "9d77be916e145864f10788bb94531d03e1f7b482"
+                "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/9d77be916e145864f10788bb94531d03e1f7b482",
-                "reference": "9d77be916e145864f10788bb94531d03e1f7b482",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/35c00c05ec43e6b46d295efc0f4386ceb30d50d9",
+                "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9",
                 "shasum": ""
             },
             "require": {
@@ -3376,7 +3376,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-09-03T15:00:28+00:00"
+            "time": "2024-09-24T17:22:50+00:00"
         },
         {
             "name": "matthiasmullie/minify",
@@ -4185,16 +4185,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.30.1",
+            "version": "1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e"
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e",
-                "reference": "51b95ec8670af41009e2b2b56873bad96682413e",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
+                "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4",
                 "shasum": ""
             },
             "require": {
@@ -4226,9 +4226,67 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0"
             },
-            "time": "2024-09-07T20:13:05+00:00"
+            "time": "2024-09-26T07:23:32+00:00"
+        },
+        {
+            "name": "phpstan/phpstan",
+            "version": "1.12.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpstan.git",
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2|^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan-shim": "*"
+            },
+            "bin": [
+                "phpstan",
+                "phpstan.phar"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPStan - PHP Static Analysis Tool",
+            "keywords": [
+                "dev",
+                "static analysis"
+            ],
+            "support": {
+                "docs": "https://phpstan.org/user-guide/getting-started",
+                "forum": "https://github.com/phpstan/phpstan/discussions",
+                "issues": "https://github.com/phpstan/phpstan/issues",
+                "security": "https://github.com/phpstan/phpstan/security/policy",
+                "source": "https://github.com/phpstan/phpstan-src"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/ondrejmirtes",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/phpstan",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-09-26T12:45:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5865,16 +5923,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111"
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111",
-                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
+                "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee",
                 "shasum": ""
             },
             "require": {
@@ -5938,7 +5996,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.4"
+                "source": "https://github.com/symfony/console/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -5954,7 +6012,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-15T22:48:53+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -6025,16 +6083,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.1.2",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c"
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c",
-                "reference": "92a91985250c251de9b947a14bb2c9390b1a562c",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a",
+                "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a",
                 "shasum": ""
             },
             "require": {
@@ -6071,7 +6129,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.2"
+                "source": "https://github.com/symfony/filesystem/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -6087,7 +6145,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T10:03:55+00:00"
+            "time": "2024-09-17T09:16:35+00:00"
         },
         {
             "name": "symfony/finder",
@@ -6536,16 +6594,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.1.3",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca"
+                "reference": "5c03ee6369281177f07f7c68252a280beccba847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca",
-                "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca",
+                "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847",
+                "reference": "5c03ee6369281177f07f7c68252a280beccba847",
                 "shasum": ""
             },
             "require": {
@@ -6577,7 +6635,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.3"
+                "source": "https://github.com/symfony/process/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -6593,7 +6651,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:44:47+00:00"
+            "time": "2024-09-19T21:48:23+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6680,16 +6738,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.4",
+            "version": "v7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
-                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306",
+                "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306",
                 "shasum": ""
             },
             "require": {
@@ -6747,7 +6805,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.4"
+                "source": "https://github.com/symfony/string/tree/v7.1.5"
             },
             "funding": [
                 {
@@ -6763,7 +6821,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-12T09:59:40+00:00"
+            "time": "2024-09-20T08:28:38+00:00"
         },
         {
             "name": "textalk/websocket",

phpstan.neon

@@ -0,0 +1,5 @@
+parameters:
+  scanDirectories:
+    - vendor/swoole/ide-helper
+  excludePaths:
+    - tests/resources

src/Appwrite/Auth/Hash/Scrypt.php

@@ -25,6 +25,7 @@ class Scrypt extends Hash
     {
         $options = $this->getOptions();
 
+        // @phpstan-ignore function.notFound
         return \scrypt($password, $options['salt'], $options['costCpu'], $options['costMemory'], $options['costParallel'], $options['length']);
     }
 

src/Appwrite/Auth/Hash/Scryptmodified.php

@@ -61,7 +61,10 @@ class Scryptmodified extends Hash
         $saltSeparatorBytes = \base64_decode($options['saltSeparator']);
 
         $password = mb_convert_encoding($password, 'UTF-8');
+
+        // @phpstan-ignore function.notFound
         $derivedKey = \scrypt($password, $saltBytes . $saltSeparatorBytes, 16384, 8, 1, 64);
+
         $derivedKey = \hex2bin($derivedKey);
 
         return $derivedKey;

src/Appwrite/Event/Func.php

@@ -170,16 +170,6 @@ class Func extends Event
         return $this;
     }
 
-    /**
-     * Returns set custom data for the function event.
-     *
-     * @return string
-     */
-    public function getData(): string
-    {
-        return $this->data;
-    }
-
     /**
      * Sets JWT for the function event.
      *

src/Appwrite/GraphQL/Resolvers.php

@@ -25,7 +25,7 @@ class Resolvers
         ?Route $route,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $route, $args, $context, $info) {
+            function (callable $resolve, callable $reject) use ($utopia, $route, $args) {
                 /** @var App $utopia */
                 /** @var Response $response */
                 /** @var Request $request */
@@ -96,7 +96,7 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -127,7 +127,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -163,7 +163,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -195,7 +195,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -225,7 +225,7 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);

src/Appwrite/GraphQL/Schema.php

@@ -156,6 +156,7 @@ class Schema
         $offset = 0;
 
         while (!empty($attrs = $attributes($limit, $offset))) {
+            $databaseId = '';
             foreach ($attrs as $attr) {
                 if ($attr['status'] !== 'available') {
                     continue;

src/Appwrite/Migration/Version/V20.php

@@ -453,7 +453,7 @@ class V20 extends Migration
                 Query::equal('period', ['1d']),
             ]);
 
-            $value = $query ?? 0;
+            $value = $query;
             $this->createInfMetric($to, $value);
         }
 

src/Appwrite/Platform/Workers/Builds.php

@@ -197,6 +197,7 @@ class Builds extends Action
         $isVcsEnabled = !empty($providerRepositoryId);
         $owner = '';
         $repositoryName = '';
+        $providerInstallationId = '';
 
         if ($isVcsEnabled) {
             $installation = $dbForConsole->getDocument('installations', $installationId);
@@ -359,7 +360,7 @@ class Builds extends Action
                     $providerCommitHash = \trim($stdout);
                     $authorUrl = "https://github.com/$cloneOwner";
 
-                    $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
+                    $deployment->setAttribute('providerCommitHash', $providerCommitHash);
                     $deployment->setAttribute('providerCommitAuthorUrl', $authorUrl);
                     $deployment->setAttribute('providerCommitAuthor', 'Appwrite');
                     $deployment->setAttribute('providerCommitMessage', "Create '" . $function->getAttribute('name', '') . "' function");

src/Appwrite/Platform/Workers/Databases.php

@@ -199,7 +199,7 @@ class Databases extends Action
         }
 
         if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
-            $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
+            $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $options['relatedCollection']);
         }
 
         $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);

src/Appwrite/Platform/Workers/Deletes.php

@@ -756,7 +756,7 @@ class Deletes extends Action
             Query::equal('resourceType', ['function']),
             Query::equal('resourceInternalId', [$functionInternalId]),
             Query::equal('projectInternalId', [$project->getInternalId()])
-        ], $dbForConsole, function (Document $document) use ($project, $dbForConsole) {
+        ], $dbForConsole, function (Document $document) use ($dbForConsole) {
             $this->deleteRule($dbForConsole, $document);
         });
 

src/Appwrite/Platform/Workers/Functions.php

@@ -442,8 +442,8 @@ class Functions extends Action
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
-                'APPWRITE_FUNCTION_EVENT_DATA' => $body ?? '',
+                'APPWRITE_FUNCTION_DATA' => $body,
+                'APPWRITE_FUNCTION_EVENT_DATA' => $body,
                 'APPWRITE_FUNCTION_EVENT' => $headers['x-appwrite-event'] ?? '',
                 'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
@@ -605,7 +605,7 @@ class Functions extends Action
         );
 
         if (!empty($error)) {
-            throw new Exception($error, $errorCode);
+            throw new Exception($error, $errorCode ?? 0);
         }
     }
 }

src/Appwrite/Platform/Workers/Messaging.php

@@ -346,32 +346,34 @@ class Messaging extends Action
         $dbForProject->updateDocument('messages', $message->getId(), $message);
 
         // Delete any attachments that were downloaded to local storage
-        if ($provider->getAttribute('type') === MESSAGE_TYPE_EMAIL) {
-            if ($deviceForFiles->getType() === Storage::DEVICE_LOCAL) {
-                return;
-            }
-
-            $data = $message->getAttribute('data');
-            $attachments = $data['attachments'] ?? [];
-
-            foreach ($attachments as $attachment) {
-                $bucketId = $attachment['bucketId'];
-                $fileId = $attachment['fileId'];
-
-                $bucket = $dbForProject->getDocument('buckets', $bucketId);
-                if ($bucket->isEmpty()) {
-                    throw new \Exception('Storage bucket with the requested ID could not be found');
+        foreach ($providers as $provider) {
+            if ($provider->getAttribute('type') === MESSAGE_TYPE_EMAIL) {
+                if ($deviceForFiles->getType() === Storage::DEVICE_LOCAL) {
+                    return;
                 }
 
-                $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
-                if ($file->isEmpty()) {
-                    throw new \Exception('Storage file with the requested ID could not be found');
-                }
+                $data = $message->getAttribute('data');
+                $attachments = $data['attachments'] ?? [];
 
-                $path = $file->getAttribute('path', '');
+                foreach ($attachments as $attachment) {
+                    $bucketId = $attachment['bucketId'];
+                    $fileId = $attachment['fileId'];
 
-                if ($this->getLocalDevice($project)->exists($path)) {
-                    $this->getLocalDevice($project)->delete($path);
+                    $bucket = $dbForProject->getDocument('buckets', $bucketId);
+                    if ($bucket->isEmpty()) {
+                        throw new \Exception('Storage bucket with the requested ID could not be found');
+                    }
+
+                    $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                    if ($file->isEmpty()) {
+                        throw new \Exception('Storage file with the requested ID could not be found');
+                    }
+
+                    $path = $file->getAttribute('path', '');
+
+                    if ($this->getLocalDevice($project)->exists($path)) {
+                        $this->getLocalDevice($project)->delete($path);
+                    }
                 }
             }
         }

src/Appwrite/Platform/Workers/Webhooks.php

@@ -202,7 +202,7 @@ class Webhooks extends Action
         $template->setParam('{{webhook}}', $webhook->getAttribute('name'));
         $template->setParam('{{project}}', $project->getAttribute('name'));
         $template->setParam('{{url}}', $webhook->getAttribute('url'));
-        $template->setParam('{{error}}', $curlError ??  'The server returned ' . $statusCode . ' status code');
+        $template->setParam('{{error}}', 'The server returned ' . $statusCode . ' status code');
         $template->setParam('{{path}}', "/console/project-$projectId/settings/webhooks/$webhookId");
         $template->setParam('{{attempts}}', $attempts);
 

src/Appwrite/Promises/Promise.php

@@ -12,7 +12,7 @@ abstract class Promise
 
     private mixed $result;
 
-    public function __construct(?callable $executor = null)
+    final public function __construct(?callable $executor = null)
     {
         if (\is_null($executor)) {
             return;

src/Appwrite/Promises/Swoole.php

@@ -6,11 +6,6 @@ use Swoole\Coroutine\Channel;
 
 class Swoole extends Promise
 {
-    public function __construct(?callable $executor = null)
-    {
-        parent::__construct($executor);
-    }
-
     protected function execute(
         callable $executor,
         callable $resolve,

src/Appwrite/Specification/Format/OpenAPI3.php

@@ -103,10 +103,6 @@ class OpenAPI3 extends Format
             $output['components']['securitySchemes']['Key']['x-appwrite'] = ['demo' => '<YOUR_API_KEY>'];
         }
 
-        if (isset($output['securityDefinitions']['JWT'])) {
-            $output['securityDefinitions']['JWT']['x-appwrite'] = ['demo' => '<YOUR_JWT>'];
-        }
-
         if (isset($output['components']['securitySchemes']['Locale'])) {
             $output['components']['securitySchemes']['Locale']['x-appwrite'] = ['demo' => 'en'];
         }
@@ -239,7 +235,6 @@ class OpenAPI3 extends Format
 
             if ($route->getLabel('sdk.response.code', 500) === 204) {
                 $temp['responses'][(string)$route->getLabel('sdk.response.code', '500')]['description'] = 'No content';
-                unset($temp['responses'][(string)$route->getLabel('sdk.response.code', '500')]['schema']);
             }
 
             if ((!empty($scope))) { //  && 'public' != $scope
@@ -287,7 +282,7 @@ class OpenAPI3 extends Format
                     $validator = $validator->getValidator();
                 }
 
-                switch ((!empty($validator)) ? \get_class($validator) : '') {
+                switch (get_class($validator)) {
                     case 'Utopia\Database\Validator\UID':
                     case 'Utopia\Validator\Text':
                         $node['schema']['type'] = $validator->getType();

src/Appwrite/Specification/Format/Swagger2.php

@@ -286,7 +286,7 @@ class Swagger2 extends Format
                     $validator = $validator->getValidator();
                 }
 
-                $validatorClass = (!empty($validator)) ? \get_class($validator) : '';
+                $validatorClass = \get_class($validator);
                 if ($validatorClass === 'Utopia\Validator\AnyOf') {
                     $validator = $param['validator']->getValidators()[0];
                     $validatorClass = \get_class($validator);

src/Appwrite/Utopia/Response.php

@@ -650,6 +650,10 @@ class Response extends SwooleResponse
                             $ruleType = $rule['type'];
                         }
 
+                        if (!isset($ruleType)) {
+                            continue;
+                        }
+
                         if (!array_key_exists($ruleType, $this->models)) {
                             throw new Exception('Missing model for rule: ' . $ruleType);
                         }

src/Appwrite/Vcs/Comment.php

@@ -67,15 +67,21 @@ class Comment
             ];
         }
 
+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
+        $hostname = System::getEnv('_APP_DOMAIN');
+
+        $lastFunctionId = '';
+        $lastProjectId = '';
+
         foreach ($projects as $projectId => $project) {
+            $lastProjectId = $projectId;
+
             $text .= "**{$project['name']}** `{$projectId}`\n\n";
             $text .= "| Function | ID | Status | Action |\n";
             $text .= "| :- | :-  | :-  | :- |\n";
 
-            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $hostname = System::getEnv('_APP_DOMAIN');
-
             foreach ($project['functions'] as $functionId => $function) {
+                $lastFunctionId = $functionId;
                 if ($function['status'] === 'waiting' || $function['status'] === 'processing' || $function['status'] === 'building') {
                     $text .= "**Your function deployment is in progress. Please check back in a few minutes for the updated status.**\n\n";
                 } elseif ($function['status'] === 'ready') {
@@ -115,9 +121,11 @@ class Comment
 
             $text .= "\n\n";
         }
-        $functionUrl = $protocol . '://' . $hostname . '/console/project-' . $projectId . '/functions/function-' . $functionId;
+
+        $functionUrl = $protocol . '://' . $hostname . '/console/project-' . $lastProjectId . '/functions/function-' . $lastFunctionId;
         $text .= "Only deployments on the production branch are activated automatically. If you'd like to activate this deployment, navigate to [your deployments]($functionUrl). Learn more about Appwrite [Function deployments](https://appwrite.io/docs/functions).\n\n";
 
+
         $tip = $this->tips[array_rand($this->tips)];
         $text .= "> **💡 Did you know?** \n " . $tip . "\n\n";
 

tests/e2e/Services/Functions/FunctionsCustomServerTest.php

@@ -766,6 +766,7 @@ class FunctionsCustomServerTest extends Scope
             'x-appwrite-project' => $this->getProject()['$id']
         ];
         $id = '';
+        $largeTag = [];
         while (!feof($handle)) {
             $curlFile = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, $chunkSize)), $mimeType, 'php-large-fx.tar.gz');
             $headers['content-range'] = 'bytes ' . ($counter * $chunkSize) . '-' . min(((($counter * $chunkSize) + $chunkSize) - 1), $size - 1) . '/' . $size;

tests/e2e/Services/GraphQL/MessagingTest.php

@@ -560,7 +560,7 @@ class MessagingTest extends Scope
         $apiKey = $emailDSN->getPassword();
         $domain = $emailDSN->getUser();
 
-        if (empty($to) || empty($from) || empty($apiKey) || empty($domain) || empty($isEuRegion)) {
+        if (empty($to) || empty($fromName) || empty($fromEmail) || empty($apiKey) || empty($domain) || empty($isEuRegion)) {
             $this->markTestSkipped('Email provider not configured');
         }
 

tests/e2e/Services/GraphQL/StorageClientTest.php

@@ -183,7 +183,7 @@ class StorageClientTest extends Scope
     /**
      * @depends testCreateFile
      * @param $file
-     * @return array
+     * @return void
      * @throws \Exception
      */
     public function testGetFileDownload($file)

tests/e2e/Services/GraphQL/StorageServerTest.php

@@ -232,7 +232,7 @@ class StorageServerTest extends Scope
     /**
      * @depends testCreateFile
      * @param $file
-     * @return array
+     * @return void
      * @throws \Exception
      */
     public function testGetFileDownload($file)

tests/e2e/Services/Messaging/MessagingBase.php

@@ -1429,7 +1429,7 @@ trait MessagingBase
         $authKey = $smsDSN->getPassword();
         $templateId = $smsDSN->getParam('templateId');
 
-        if (empty($to) || empty($from) || empty($senderId) || empty($authKey)) {
+        if (empty($to) || empty($senderId) || empty($authKey)) {
             $this->markTestSkipped('SMS provider not configured');
         }
 

tests/e2e/Services/Storage/StorageBase.php

@@ -96,6 +96,7 @@ trait StorageBase
             'content-type' => 'multipart/form-data',
             'x-appwrite-project' => $this->getProject()['$id']
         ];
+        $largeFile = [];
         $id = '';
         while (!feof($handle)) {
             $curlFile = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(@fread($handle, $chunkSize)), $mimeType, 'large-file.mp4');