mirror of
https://github.com/appwrite/appwrite.git
synced 2026-05-26 13:51:13 +00:00
d2230f8fe7
Raises `phpstan.neon` level from 3 to 4 and fixes the 549 new errors
that level 4 surfaces across 157 files. Fixes are root-cause — no
`@phpstan-ignore`, no `@var` casts, no baseline entries, no widened
types. A handful of latent bugs were fixed along the way:
- `app/controllers/general.php`: path-traversal guard was negating
`\substr(...)` before the strict comparison (`!\substr(...) === $base`
was always `false === $base`). Rewritten as `\substr(...) !== $base`.
- `src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php`
and `.../TablesDB/Logs/XList.php`: were importing the raw Matomo
`DeviceDetector` (whose `getDevice()` returns `?int`) but treating the
result as an array with `deviceName/deviceBrand/deviceModel` keys.
Swapped to `Appwrite\Detector\Detector`, matching the wrapper already
used a few lines below for `$os`/`$client`.
- `src/Appwrite/Platform/Modules/Functions/Workers/Builds.php`: a match
key was checking `$resourceKey === 'functions'` when `$resourceKey`
is `'functionId'|'siteId'` — always false. Switched to the intended
`$resource->getCollection() === 'functions'` check.
- `src/Appwrite/OpenSSL/OpenSSL.php`: `encrypt()` return type tightened
to `string|false` to match `openssl_encrypt`; this lets callers'
`=== false` error handling remain meaningful.
- `app/controllers/api/messaging.php`: removed a dead
`array_key_exists('from', [])` branch in the Msg91 provider (empty
array literal; branch was unreachable).
Large cleanup categories across the 549 fixes:
- Removed redundant `?? default` on array offsets and expressions that
PHPStan now knows are non-nullable.
- Removed unreachable statements (mostly `return;` after `throw` or
`markTestSkipped()`).
- Removed redundant `is_array`/`is_string`/`is_bool`/`instanceof` checks
on already-narrowed types.
- Added `default =>` arms (or throwing arms) to non-exhaustive matches
on `string`/`mixed` input.
- Removed dead `$document === false` branches where method return types
were tightened to non-nullable `Document`.
- Removed unused properties (`$version` on Etsy/Zoom OAuth2, `$paths` on
Installer State, `$source` on MigrationsWorker, `$account2` on two
GraphQL auth tests), unused traits (`ApiVectorsDB`, `DatabaseFixture`),
and an unused `cleanupStaleExecutions` task method.
- Replaced `assertTrue(true)` and redundant `assertIsArray`/`assertIsString`/
`assertNotNull` assertions with `addToAssertionCount(1)` or
`assertNotEmpty` where the runtime type was already known.
156 lines
5.0 KiB
PHP
156 lines
5.0 KiB
PHP
<?php
|
|
|
|
require_once __DIR__ . '/init.php';
|
|
$registerWorkerMessageResources = require __DIR__ . '/init/worker/message.php';
|
|
|
|
use Appwrite\Certificates\LetsEncrypt;
|
|
use Appwrite\Platform\Appwrite;
|
|
use Swoole\Runtime;
|
|
use Utopia\Console;
|
|
use Utopia\Database\Document;
|
|
use Utopia\Database\Validator\Authorization;
|
|
use Utopia\Logger\Log;
|
|
use Utopia\Logger\Logger;
|
|
use Utopia\Platform\Service;
|
|
use Utopia\Pools\Group;
|
|
use Utopia\Queue\Adapter\Swoole;
|
|
use Utopia\Queue\Broker\Pool as BrokerPool;
|
|
use Utopia\Queue\Server;
|
|
use Utopia\System\System;
|
|
|
|
Runtime::enableCoroutine();
|
|
require_once __DIR__ . '/init/span.php';
|
|
|
|
global $container;
|
|
$container->set('pools', function ($register) {
|
|
return $register->get('pools');
|
|
}, ['register']);
|
|
|
|
$container->set('authorization', function () {
|
|
$authorization = new Authorization();
|
|
$authorization->disable();
|
|
|
|
return $authorization;
|
|
}, []);
|
|
|
|
$container->set('project', fn () => new Document([]), []);
|
|
|
|
$container->set('log', fn () => new Log(), []);
|
|
|
|
$container->set('consumer', function (Group $pools) {
|
|
return new BrokerPool(consumer: $pools->get('consumer'));
|
|
}, ['pools']);
|
|
|
|
$container->set('consumerDatabases', function (BrokerPool $consumer) {
|
|
return $consumer;
|
|
}, ['consumer']);
|
|
|
|
$container->set('consumerMigrations', function (BrokerPool $consumer) {
|
|
return $consumer;
|
|
}, ['consumer']);
|
|
|
|
$container->set('consumerStatsUsage', function (BrokerPool $consumer) {
|
|
return $consumer;
|
|
}, ['consumer']);
|
|
|
|
$container->set('certificates', function () {
|
|
$email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
|
|
if (empty($email)) {
|
|
throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
|
|
}
|
|
|
|
return new LetsEncrypt($email);
|
|
}, []);
|
|
|
|
$platform = new Appwrite();
|
|
$args = $_SERVER['argv'] ?? [];
|
|
|
|
if (! isset($args[1])) {
|
|
Console::error('Missing worker name');
|
|
Console::exit(1);
|
|
}
|
|
|
|
\array_shift($args);
|
|
$workerName = $args[0];
|
|
|
|
if (\str_starts_with($workerName, 'databases')) {
|
|
$queueName = System::getEnv('_APP_QUEUE_NAME', 'database_db_main');
|
|
} else {
|
|
$queueName = System::getEnv('_APP_QUEUE_NAME', 'v1-' . strtolower($workerName));
|
|
}
|
|
|
|
/** @var \Utopia\Pools\Group $pools */
|
|
$pools = $container->get('pools');
|
|
|
|
$adapter = new Swoole(
|
|
$pools->get('consumer')->pop()->getResource(),
|
|
System::getEnv('_APP_WORKERS_NUM', 1),
|
|
$queueName
|
|
);
|
|
|
|
$worker = new Server($adapter, $container);
|
|
|
|
try {
|
|
$worker->init()->action(function () use ($worker, $registerWorkerMessageResources) {
|
|
$registerWorkerMessageResources($worker->getContainer());
|
|
});
|
|
|
|
$container->set('bus', function ($register) use ($worker) {
|
|
return $register->get('bus')->setResolver(
|
|
fn (string $name) => $worker->getContainer()->get($name)
|
|
);
|
|
}, ['register']);
|
|
|
|
$platform->setWorker($worker);
|
|
$platform->init(Service::TYPE_WORKER, [
|
|
'workerName' => strtolower($workerName),
|
|
]);
|
|
} catch (\Throwable $e) {
|
|
Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
|
|
Console::exit(1);
|
|
}
|
|
|
|
$worker
|
|
->error()
|
|
->inject('error')
|
|
->inject('logger')
|
|
->inject('log')
|
|
->inject('project')
|
|
->inject('authorization')
|
|
->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project, Authorization $authorization) use ($queueName) {
|
|
$version = System::getEnv('_APP_VERSION', 'UNKNOWN');
|
|
|
|
if ($logger) {
|
|
$log->setNamespace('appwrite-worker');
|
|
$log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
|
|
$log->setVersion($version);
|
|
$log->setType(Log::TYPE_ERROR);
|
|
$log->setMessage($error->getMessage());
|
|
$log->setAction('appwrite-queue-' . $queueName);
|
|
$log->addTag('verboseType', get_class($error));
|
|
$log->addTag('code', $error->getCode());
|
|
$log->addTag('projectId', $project->getId());
|
|
$log->addExtra('file', $error->getFile());
|
|
$log->addExtra('line', $error->getLine());
|
|
$log->addExtra('trace', $error->getTraceAsString());
|
|
$log->addExtra('roles', $authorization->getRoles());
|
|
|
|
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
|
|
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
|
|
|
|
try {
|
|
$responseCode = $logger->addLog($log);
|
|
Console::info('Error log pushed with status code: ' . $responseCode);
|
|
} catch (Throwable $th) {
|
|
Console::error('Error pushing log: ' . $th->getMessage());
|
|
}
|
|
}
|
|
|
|
Console::error('[Error] Type: ' . get_class($error));
|
|
Console::error('[Error] Message: ' . $error->getMessage());
|
|
Console::error('[Error] File: ' . $error->getFile());
|
|
Console::error('[Error] Line: ' . $error->getLine());
|
|
});
|
|
|
|
$worker->start();
|