chore: DI+CO improvements
This commit is contained in:
parent
3ecd8ce189
commit
97cd5e4934
4 changed files with 1734 additions and 1758 deletions
|
@ -25,11 +25,16 @@ Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
|
||||||
* @var Registry $global
|
* @var Registry $global
|
||||||
* @var Container $container
|
* @var Container $container
|
||||||
*/
|
*/
|
||||||
|
$context = new Dependency();
|
||||||
$register = new Dependency();
|
$register = new Dependency();
|
||||||
$logError = new Dependency();
|
$logError = new Dependency();
|
||||||
$queueForDeletes = new Dependency();
|
$queueForDeletes = new Dependency();
|
||||||
$queueForCertificates = new Dependency();
|
$queueForCertificates = new Dependency();
|
||||||
|
|
||||||
|
$context
|
||||||
|
->setName('context')
|
||||||
|
->setCallback(fn() => $container);
|
||||||
|
|
||||||
$register
|
$register
|
||||||
->setName('register')
|
->setName('register')
|
||||||
->setCallback(function () use (&$global): Registry {
|
->setCallback(function () use (&$global): Registry {
|
||||||
|
@ -91,7 +96,7 @@ $logError
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$container->set($context);
|
||||||
$container->set($logError);
|
$container->set($logError);
|
||||||
$container->set($register);
|
$container->set($register);
|
||||||
$container->set($queueForDeletes);
|
$container->set($queueForDeletes);
|
||||||
|
|
3461
app/init.php
3461
app/init.php
File diff suppressed because it is too large
Load diff
|
@ -36,6 +36,7 @@ use Utopia\CLI\Console;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Database\Adapter\MariaDB;
|
use Utopia\Database\Adapter\MariaDB;
|
||||||
use Utopia\Database\Adapter\MySQL;
|
use Utopia\Database\Adapter\MySQL;
|
||||||
|
use Utopia\Database\Adapter\SQL;
|
||||||
use Utopia\Database\Database;
|
use Utopia\Database\Database;
|
||||||
use Utopia\Database\Document;
|
use Utopia\Database\Document;
|
||||||
use Utopia\Database\Helpers\ID;
|
use Utopia\Database\Helpers\ID;
|
||||||
|
@ -380,6 +381,21 @@ $global->set('promiseAdapter', function () {
|
||||||
return new Swoole();
|
return new Swoole();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$global->set('db', function () {
|
||||||
|
// This is usually for our workers or CLI commands scope
|
||||||
|
$dbHost = System::getEnv('_APP_DB_HOST', '');
|
||||||
|
$dbPort = System::getEnv('_APP_DB_PORT', '');
|
||||||
|
$dbUser = System::getEnv('_APP_DB_USER', '');
|
||||||
|
$dbPass = System::getEnv('_APP_DB_PASS', '');
|
||||||
|
$dbScheme = System::getEnv('_APP_DB_SCHEMA', '');
|
||||||
|
|
||||||
|
return new PDO(
|
||||||
|
"mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4",
|
||||||
|
$dbUser,
|
||||||
|
$dbPass,
|
||||||
|
SQL::getPDOAttributes()
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
$log = new Dependency();
|
$log = new Dependency();
|
||||||
$mode = new Dependency();
|
$mode = new Dependency();
|
||||||
|
|
8
composer.lock
generated
8
composer.lock
generated
|
@ -1626,12 +1626,12 @@
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/cli.git",
|
"url": "https://github.com/utopia-php/cli.git",
|
||||||
"reference": "bedbca08f451dc96f0321014e805a1f46f76f6b9"
|
"reference": "d48b696891dee1e46df2491d192bb91cf4df8f94"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/cli/zipball/bedbca08f451dc96f0321014e805a1f46f76f6b9",
|
"url": "https://api.github.com/repos/utopia-php/cli/zipball/d48b696891dee1e46df2491d192bb91cf4df8f94",
|
||||||
"reference": "bedbca08f451dc96f0321014e805a1f46f76f6b9",
|
"reference": "d48b696891dee1e46df2491d192bb91cf4df8f94",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1669,7 +1669,7 @@
|
||||||
"issues": "https://github.com/utopia-php/cli/issues",
|
"issues": "https://github.com/utopia-php/cli/issues",
|
||||||
"source": "https://github.com/utopia-php/cli/tree/dev-coroutines"
|
"source": "https://github.com/utopia-php/cli/tree/dev-coroutines"
|
||||||
},
|
},
|
||||||
"time": "2024-06-07T18:51:16+00:00"
|
"time": "2024-06-24T13:24:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/config",
|
"name": "utopia-php/config",
|
||||||
|
|
Loading…
Reference in a new issue