mirror of
https://github.com/nuxsmin/sysPass.git
synced 2026-03-06 08:34:16 +01:00
feat: Installer refactoring to inject all dependencies at build time.
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
@@ -27,11 +27,11 @@ use PHPMailer\PHPMailer\PHPMailer;
|
||||
use Psr\Container\ContainerInterface;
|
||||
use SP\Core\Acl\Acl;
|
||||
use SP\Core\Acl\Actions;
|
||||
use SP\Core\Application;
|
||||
use SP\Core\Context\ContextFactory;
|
||||
use SP\Core\Context\ContextInterface;
|
||||
use SP\Core\Crypt\CryptPKI;
|
||||
use SP\Core\Crypt\CSRF;
|
||||
use SP\Core\Exceptions\SPException;
|
||||
use SP\Core\Language;
|
||||
use SP\Core\LanguageInterface;
|
||||
use SP\Core\MimeTypes;
|
||||
@@ -42,6 +42,9 @@ use SP\Domain\Config\ConfigInterface;
|
||||
use SP\Domain\Config\In\ConfigDataInterface;
|
||||
use SP\Domain\Config\Services\ConfigBackupService;
|
||||
use SP\Domain\Config\Services\ConfigFileService;
|
||||
use SP\Domain\Install\DatabaseSetupInterface;
|
||||
use SP\Domain\Install\In\InstallDataFactory;
|
||||
use SP\Domain\Install\Services\MysqlSetupBuilder;
|
||||
use SP\Domain\Providers\MailerInterface;
|
||||
use SP\Domain\Providers\MailProviderInterface;
|
||||
use SP\Http\Client;
|
||||
@@ -50,8 +53,8 @@ use SP\Http\RequestInterface;
|
||||
use SP\Infrastructure\Database\Database;
|
||||
use SP\Infrastructure\Database\DatabaseConnectionData;
|
||||
use SP\Infrastructure\Database\DatabaseInterface;
|
||||
use SP\Infrastructure\Database\DBStorageInterface;
|
||||
use SP\Infrastructure\Database\MySQLHandler;
|
||||
use SP\Infrastructure\Database\DbStorageInterface;
|
||||
use SP\Infrastructure\Database\MysqlHandler;
|
||||
use SP\Infrastructure\File\FileCache;
|
||||
use SP\Infrastructure\File\FileHandler;
|
||||
use SP\Infrastructure\File\XmlHandler;
|
||||
@@ -75,11 +78,11 @@ use function DI\factory;
|
||||
use function DI\get;
|
||||
|
||||
return [
|
||||
RequestInterface::class => create(Request::class)
|
||||
RequestInterface::class => create(Request::class)
|
||||
->constructor(\Klein\Request::createFromGlobals(), autowire(CryptPKI::class)),
|
||||
ContextInterface::class =>
|
||||
ContextInterface::class =>
|
||||
static fn() => ContextFactory::getForModule(APP_MODULE),
|
||||
ConfigInterface::class => create(ConfigFileService::class)
|
||||
ConfigInterface::class => create(ConfigFileService::class)
|
||||
->constructor(
|
||||
create(XmlHandler::class)
|
||||
->constructor(create(FileHandler::class)->constructor(CONFIG_FILE)),
|
||||
@@ -87,84 +90,91 @@ return [
|
||||
get(ContextInterface::class),
|
||||
autowire(ConfigBackupService::class)->lazy()
|
||||
),
|
||||
ConfigDataInterface::class =>
|
||||
ConfigDataInterface::class =>
|
||||
static fn(ConfigInterface $config) => $config->getConfigData(),
|
||||
DBStorageInterface::class => create(MySQLHandler::class)
|
||||
->constructor(factory([DatabaseConnectionData::class, 'getFromConfig'])),
|
||||
Actions::class =>
|
||||
DatabaseConnectionData::class => factory([DatabaseConnectionData::class, 'getFromConfig']),
|
||||
DbStorageInterface::class => autowire(MysqlHandler::class),
|
||||
Actions::class =>
|
||||
static fn() => new Actions(
|
||||
new FileCache(Actions::ACTIONS_CACHE_FILE),
|
||||
new XmlHandler(new FileHandler(ACTIONS_FILE))
|
||||
),
|
||||
MimeTypesInterface::class =>
|
||||
MimeTypesInterface::class =>
|
||||
static fn() => new MimeTypes(
|
||||
new FileCache(MimeTypes::MIME_CACHE_FILE),
|
||||
new XmlHandler(new FileHandler(MIMETYPES_FILE))
|
||||
),
|
||||
Acl::class => autowire(Acl::class)
|
||||
Acl::class => autowire(Acl::class)
|
||||
->constructorParameter('actions', get(Actions::class)),
|
||||
ThemeInterface::class => autowire(Theme::class)
|
||||
ThemeInterface::class => autowire(Theme::class)
|
||||
->constructorParameter('module', APP_MODULE)
|
||||
->constructorParameter(
|
||||
'fileCache',
|
||||
create(FileCache::class)->constructor(Theme::ICONS_CACHE_FILE)
|
||||
),
|
||||
TemplateInterface::class => autowire(Template::class),
|
||||
DatabaseAuthInterface::class => autowire(DatabaseAuth::class),
|
||||
BrowserAuthInterface::class => autowire(BrowserAuth::class),
|
||||
LdapAuthInterface::class => autowire(LdapAuth::class)
|
||||
TemplateInterface::class => autowire(Template::class),
|
||||
DatabaseAuthInterface::class => autowire(DatabaseAuth::class),
|
||||
BrowserAuthInterface::class => autowire(BrowserAuth::class),
|
||||
LdapAuthInterface::class => autowire(LdapAuth::class)
|
||||
->constructorParameter(
|
||||
'ldap',
|
||||
factory([Ldap::class, 'factory'])
|
||||
->parameter('ldapParams', factory([LdapParams::class, 'getFrom']))
|
||||
factory([Ldap::class, 'factory'])->parameter('ldapParams', factory([LdapParams::class, 'getFrom']))
|
||||
),
|
||||
AuthProviderInterface::class => static function (
|
||||
ContainerInterface $c,
|
||||
ConfigDataInterface $configData
|
||||
) {
|
||||
$provider = new AuthProvider($c->get(Application::class), $c->get(DatabaseAuthInterface::class));
|
||||
AuthProviderInterface::class =>
|
||||
static function (ContainerInterface $c, ConfigDataInterface $configData) {
|
||||
/** @var AuthProvider $provider */
|
||||
$provider = autowire(AuthProvider::class);
|
||||
|
||||
if ($configData->isLdapEnabled()) {
|
||||
$provider->withLdapAuth($c->get(LdapAuthInterface::class));
|
||||
}
|
||||
if ($configData->isLdapEnabled()) {
|
||||
$provider->withLdapAuth($c->get(LdapAuthInterface::class));
|
||||
}
|
||||
|
||||
if ($configData->isAuthBasicEnabled()) {
|
||||
$provider->withBrowserAuth($c->get(BrowserAuthInterface::class));
|
||||
}
|
||||
if ($configData->isAuthBasicEnabled()) {
|
||||
$provider->withBrowserAuth($c->get(BrowserAuthInterface::class));
|
||||
}
|
||||
|
||||
return $provider;
|
||||
},
|
||||
Logger::class => create(Logger::class)
|
||||
return $provider;
|
||||
},
|
||||
Logger::class => create(Logger::class)
|
||||
->constructor('syspass'),
|
||||
\GuzzleHttp\Client::class => create(GuzzleHttp\Client::class)
|
||||
\GuzzleHttp\Client::class => create(GuzzleHttp\Client::class)
|
||||
->constructor(factory([Client::class, 'getOptions'])),
|
||||
CSRF::class => autowire(CSRF::class),
|
||||
LanguageInterface::class => autowire(Language::class),
|
||||
DatabaseInterface::class => autowire(Database::class),
|
||||
MailProviderInterface::class => autowire(MailProvider::class),
|
||||
MailerInterface::class => autowire(PhpMailerWrapper::class)->constructor(
|
||||
CSRF::class => autowire(CSRF::class),
|
||||
LanguageInterface::class => autowire(Language::class),
|
||||
DatabaseInterface::class => autowire(Database::class),
|
||||
MailProviderInterface::class => autowire(MailProvider::class),
|
||||
MailerInterface::class => autowire(PhpMailerWrapper::class)->constructor(
|
||||
create(PHPMailer::class)->constructor(true)
|
||||
),
|
||||
'SP\Domain\Account\*ServiceInterface' => autowire('SP\Domain\Account\Services\*Service'),
|
||||
'SP\Domain\Account\In\*RepositoryInterface' => autowire('SP\Infrastructure\Account\Repositories\*Repository'),
|
||||
'SP\Domain\Category\*ServiceInterface' => autowire('SP\Domain\Category\Services\*Service'),
|
||||
'SP\Domain\Category\In\*RepositoryInterface' => autowire('SP\Infrastructure\Category\Repositories\*Repository'),
|
||||
'SP\Domain\Client\*ServiceInterface' => autowire('SP\Domain\Client\Services\*Service'),
|
||||
'SP\Domain\Client\In\*RepositoryInterface' => autowire('SP\Infrastructure\Client\Repositories\*Repository'),
|
||||
'SP\Domain\Tag\*ServiceInterface' => autowire('SP\Domain\Tag\Services\*Service'),
|
||||
'SP\Domain\Tag\In\*RepositoryInterface' => autowire('SP\Infrastructure\Tag\Repositories\*Repository'),
|
||||
'SP\Domain\User\*ServiceInterface' => autowire('SP\Domain\User\Services\*Service'),
|
||||
'SP\Domain\User\In\*RepositoryInterface' => autowire('SP\Infrastructure\User\Repositories\*Repository'),
|
||||
'SP\Domain\Auth\*ServiceInterface' => autowire('SP\Domain\Auth\Services\*Service'),
|
||||
'SP\Domain\Auth\In\*RepositoryInterface' => autowire('SP\Infrastructure\Auth\Repositories\*Repository'),
|
||||
'SP\Domain\CustomField\*ServiceInterface' => autowire('SP\Domain\CustomField\Services\*Service'),
|
||||
'SP\Domain\CustomField\In\*RepositoryInterface' => autowire(
|
||||
DatabaseSetupInterface::class => static function (RequestInterface $request) {
|
||||
$installData = InstallDataFactory::buildFromRequest($request);
|
||||
|
||||
if ($installData->getBackendType() === 'mysql') {
|
||||
return MysqlSetupBuilder::build($installData);
|
||||
}
|
||||
|
||||
throw new SPException(__u('Unimplemented'), SPException::ERROR, __u('Wrong backend type'));
|
||||
},
|
||||
'SP\Domain\Account\*ServiceInterface' => autowire('SP\Domain\Account\Services\*Service'),
|
||||
'SP\Domain\Account\In\*RepositoryInterface' => autowire('SP\Infrastructure\Account\Repositories\*Repository'),
|
||||
'SP\Domain\Category\*ServiceInterface' => autowire('SP\Domain\Category\Services\*Service'),
|
||||
'SP\Domain\Category\In\*RepositoryInterface' => autowire('SP\Infrastructure\Category\Repositories\*Repository'),
|
||||
'SP\Domain\Client\*ServiceInterface' => autowire('SP\Domain\Client\Services\*Service'),
|
||||
'SP\Domain\Client\In\*RepositoryInterface' => autowire('SP\Infrastructure\Client\Repositories\*Repository'),
|
||||
'SP\Domain\Tag\*ServiceInterface' => autowire('SP\Domain\Tag\Services\*Service'),
|
||||
'SP\Domain\Tag\In\*RepositoryInterface' => autowire('SP\Infrastructure\Tag\Repositories\*Repository'),
|
||||
'SP\Domain\User\*ServiceInterface' => autowire('SP\Domain\User\Services\*Service'),
|
||||
'SP\Domain\User\In\*RepositoryInterface' => autowire('SP\Infrastructure\User\Repositories\*Repository'),
|
||||
'SP\Domain\Auth\*ServiceInterface' => autowire('SP\Domain\Auth\Services\*Service'),
|
||||
'SP\Domain\Auth\In\*RepositoryInterface' => autowire('SP\Infrastructure\Auth\Repositories\*Repository'),
|
||||
'SP\Domain\CustomField\*ServiceInterface' => autowire('SP\Domain\CustomField\Services\*Service'),
|
||||
'SP\Domain\CustomField\In\*RepositoryInterface' => autowire(
|
||||
'SP\Infrastructure\CustomField\Repositories\*Repository'
|
||||
),
|
||||
'SP\Domain\Export\*ServiceInterface' => autowire('SP\Domain\Export\Services\*Service'),
|
||||
'SP\Domain\Import\*ServiceInterface' => autowire('SP\Domain\Import\Services\*Service'),
|
||||
'SP\Domain\Install\*ServiceInterface' => autowire('SP\Domain\Install\Services\*Service'),
|
||||
'SP\Domain\Crypt\*ServiceInterface' => autowire('SP\Domain\Crypt\Services\*Service'),
|
||||
'SP\Domain\Export\*ServiceInterface' => autowire('SP\Domain\Export\Services\*Service'),
|
||||
'SP\Domain\Import\*ServiceInterface' => autowire('SP\Domain\Import\Services\*Service'),
|
||||
'SP\Domain\Install\*ServiceInterface' => autowire('SP\Domain\Install\Services\*Service'),
|
||||
'SP\Domain\Crypt\*ServiceInterface' => autowire('SP\Domain\Crypt\Services\*Service'),
|
||||
'SP\Domain\Plugin\*ServiceInterface' => autowire('SP\Domain\Plugin\Services\*Service'),
|
||||
'SP\Domain\ItemPreset\*ServiceInterface' => autowire('SP\Domain\ItemPreset\Services\*Service'),
|
||||
'SP\Domain\ItemPreset\In\*RepositoryInterface' => autowire(
|
||||
|
||||
Reference in New Issue
Block a user