* [MOD] Code refactoring by enforcing type checks (WIP)

* [MOD] Update dependencies

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2021-01-17 14:56:56 +01:00
parent 41703b50f9
commit 8e96ec4285
173 changed files with 1265 additions and 1092 deletions

View File

@@ -81,7 +81,7 @@ final class UserSettingsManagerController extends ControllerBase implements Exte
/**
* @return DataTab
*/
private function getUserPreferences()
private function getUserPreferences(): DataTab
{
$template = clone $this->view;
$template->setBase('usersettings');
@@ -90,8 +90,16 @@ final class UserSettingsManagerController extends ControllerBase implements Exte
$userData = $this->session->getUserData();
$userPreferences = $userData->getPreferences();
$template->assign('langs', SelectItemAdapter::factory(Language::getAvailableLanguages())->getItemsFromArraySelected([$userPreferences->getLang() ?: $this->configData->getSiteLang()]));
$template->assign('themes', SelectItemAdapter::factory($this->theme->getThemesAvailable())->getItemsFromArraySelected([$userPreferences->getTheme() ?: $this->configData->getSiteTheme()]));
$template->assign('langs',
SelectItemAdapter::factory(
Language::getAvailableLanguages()
)->getItemsFromArraySelected([$userPreferences->getLang() ?: $this->configData->getSiteLang()])
);
$template->assign('themes',
SelectItemAdapter::factory(
$this->theme->getThemesAvailable()
)->getItemsFromArraySelected([$userPreferences->getTheme() ?: $this->configData->getSiteTheme()])
);
$template->assign('userPreferences', $userPreferences);
$template->assign('route', 'userSettingsGeneral/save');