chore: Move interfaces into Domain

Signed-off-by: Rubén D <nuxsmin@syspass.org>
2026-03-17 22:06:47 +01:00 · 2023-11-26 13:00:30 +01:00
parent 27d951954e
commit c0e876bd42
107 changed files with 162 additions and 180 deletions
--- a/app/modules/api/Init.php
+++ b/app/modules/api/Init.php
@@ -30,8 +30,8 @@ use SP\Core\Application;
 use SP\Core\Exceptions\InitializationException;
 use SP\Core\HttpModuleBase;
 use SP\Core\Language;
-use SP\Core\LanguageInterface;
 use SP\Core\ProvidersHelper;
+use SP\Domain\Core\LanguageInterface;
 use SP\Domain\Upgrade\Services\UpgradeAppService;
 use SP\Domain\Upgrade\Services\UpgradeDatabaseService;
 use SP\Domain\Upgrade\Services\UpgradeUtil;
@@ -151,4 +151,4 @@ final class Init extends HttpModuleBase
            throw new InitializationException(__u('Updating needed'));
        }
    }
-}
+}
--- a/app/modules/cli/Init.php
+++ b/app/modules/cli/Init.php
@@ -26,9 +26,9 @@ namespace SP\Modules\Cli;

 use SP\Core\Application;
 use SP\Core\Language;
-use SP\Core\LanguageInterface;
 use SP\Core\ModuleBase;
 use SP\Core\ProvidersHelper;
+use SP\Domain\Core\LanguageInterface;
 use SP\Util\VersionUtil;
 use Symfony\Component\Console\Application as ConsoleApplication;
 use Symfony\Component\Console\Input\InputInterface;
@@ -103,4 +103,4 @@ final class Init extends ModuleBase
            $this->output
        );
    }
-}
+}
--- a/app/modules/web/Controllers/ConfigLdap/ImportController.php
+++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php
@@ -37,7 +37,7 @@ use SP\Core\Exceptions\CheckException;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Exceptions\ValidationException;
 use SP\Core\PhpExtensionChecker;
-use SP\Core\UI\ThemeInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Import\Ports\LdapImportServiceInterface;
 use SP\Domain\Import\Services\LdapImportParams;
 use SP\Http\JsonResponse;
--- a/app/modules/web/Controllers/ConfigManager/IndexController.php
+++ b/app/modules/web/Controllers/ConfigManager/IndexController.php
@@ -30,7 +30,6 @@ use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use SP\Core\Acl\Acl;
 use SP\Core\Acl\AclActionsInterface;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Crypt\CryptSessionHandler;
 use SP\Core\Events\Event;
@@ -42,6 +41,7 @@ use SP\Core\Language;
 use SP\Domain\Account\Ports\AccountServiceInterface;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigServiceInterface;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\File\MimeType;
 use SP\Domain\Core\File\MimeTypesInterface;
 use SP\Domain\Crypt\Services\TemporaryMasterPassService;
--- a/app/modules/web/Controllers/ControllerBase.php
+++ b/app/modules/web/Controllers/ControllerBase.php
@@ -37,11 +37,11 @@ use SP\Core\Exceptions\FileNotFoundException;
 use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\PhpExtensionChecker;
-use SP\Core\UI\ThemeInterface;
 use SP\DataModel\ProfileData;
 use SP\Domain\Auth\Services\AuthException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigFileService;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\User\Services\UserLoginResponse;
 use SP\Http\RequestInterface;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
--- a/app/modules/web/Controllers/Helpers/LayoutHelper.php
+++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php
@@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers;

 use SP\Core\Acl\Acl;
 use SP\Core\Acl\AclActionsInterface;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Crypt\CryptPKIInterface;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Language;
-use SP\Core\UI\ThemeInterface;
+use SP\Domain\Core\AppInfoInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Install\Services\InstallerService;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Http\RequestInterface;
--- a/app/modules/web/Controllers/SimpleControllerBase.php
+++ b/app/modules/web/Controllers/SimpleControllerBase.php
@@ -32,9 +32,9 @@ use SP\Core\Events\EventDispatcher;
 use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\PhpExtensionChecker;
-use SP\Core\UI\ThemeInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigFileService;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Http\Request;
 use SP\Modules\Web\Controllers\Traits\WebControllerTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
--- a/app/modules/web/Controllers/Status/CheckNotices.php
+++ b/app/modules/web/Controllers/Status/CheckNotices.php
@@ -25,8 +25,8 @@
 namespace SP\Modules\Web\Controllers\Status;


-use SP\Core\AppInfoInterface;
 use SP\Core\Exceptions\CheckException;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use Throwable;
@@ -82,4 +82,4 @@ final class CheckNotices extends StatusBase
            return $this->returnJsonResponseException($e);
        }
    }
-}
+}
--- a/app/modules/web/Controllers/Status/StatusController.php
+++ b/app/modules/web/Controllers/Status/StatusController.php
@@ -24,8 +24,8 @@

 namespace SP\Modules\Web\Controllers\Status;

-use SP\Core\AppInfoInterface;
 use SP\Core\Exceptions\CheckException;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Util\VersionUtil;
@@ -93,4 +93,4 @@ final class StatusController extends StatusBase
            return $this->returnJsonResponseException($e);
        }
    }
-}
+}
--- a/app/modules/web/Init.php
+++ b/app/modules/web/Init.php
@@ -46,10 +46,10 @@ use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\Core\HttpModuleBase;
 use SP\Core\Language;
-use SP\Core\LanguageInterface;
 use SP\Core\ProvidersHelper;
-use SP\Core\UI\ThemeInterface;
 use SP\DataModel\ItemPreset\SessionTimeout;
+use SP\Domain\Core\LanguageInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Crypt\Ports\SecureSessionServiceInterface;
 use SP\Domain\Crypt\Services\SecureSessionService;
 use SP\Domain\ItemPreset\Ports\ItemPresetInterface;
--- a/app/modules/web/themes/material-blue/views/account/account-editpass.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-editpass.inc
@@ -24,13 +24,12 @@

 /**
 * @var callable $_getvar
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
--- a/app/modules/web/themes/material-blue/views/account/account-history.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-history.inc
@@ -30,10 +30,10 @@
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;

 /** @var AccountExtData $accountData */
--- a/app/modules/web/themes/material-blue/views/account/account-link.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-link.inc
@@ -24,13 +24,12 @@

 /**
 * @var callable $_getvar
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
--- a/app/modules/web/themes/material-blue/views/account/account-permissions.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-permissions.inc
@@ -24,14 +24,13 @@

 /**
 * @var callable $_getvar
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 * @var AccountPrivate $accountPrivate
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\DataModel\ItemPreset\AccountPrivate;
 use SP\Domain\Account\Services\AccountAcl;
--- a/app/modules/web/themes/material-blue/views/account/account-request.inc
+++ b/app/modules/web/themes/material-blue/views/account/account-request.inc
@@ -24,13 +24,12 @@

 /**
 * @var callable $_getvar
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
--- a/app/modules/web/themes/material-blue/views/account/account.inc
+++ b/app/modules/web/themes/material-blue/views/account/account.inc
@@ -24,16 +24,16 @@

 /**
 * @var callable $_getvar
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;

 $accountData = $_getvar('accountData');
--- a/app/modules/web/themes/material-blue/views/account/actions.inc
+++ b/app/modules/web/themes/material-blue/views/account/actions.inc
@@ -30,10 +30,10 @@
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\Action\DataGridActionInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/account/details.inc
+++ b/app/modules/web/themes/material-blue/views/account/details.inc
@@ -23,14 +23,13 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var callable $_getvar
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
--- a/app/modules/web/themes/material-blue/views/account/files-list.inc
+++ b/app/modules/web/themes/material-blue/views/account/files-list.inc
@@ -23,15 +23,15 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var callable $_getvar
 * @var ConfigDataInterface $configData
 * @var FileData $file
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\FileData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\Html;

 ?>
--- a/app/modules/web/themes/material-blue/views/account/files.inc
+++ b/app/modules/web/themes/material-blue/views/account/files.inc
@@ -23,14 +23,13 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var callable $_getvar
 * @var AccountExtData $accountData
 * @var AccountAcl $accountAcl
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
--- a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc
+++ b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc
@@ -28,8 +28,8 @@
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;

 ?>

--- a/app/modules/web/themes/material-blue/views/account/search-header.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-header.inc
@@ -23,14 +23,13 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var callable $_getvar
 * @var ConfigDataInterface $configData
 * @var AccountSearchItem $account
 * @var DataGridTab $data
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Account\Services\AccountSearchItem;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Html\DataGrid\DataGridTab;
--- a/app/modules/web/themes/material-blue/views/account/search-index.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-index.inc
@@ -30,9 +30,9 @@
 * @var DataGrid $data
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Account\Services\AccountSearchItem;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\DataGrid;

 if (!isset($data)) {
--- a/app/modules/web/themes/material-blue/views/account/search-rows.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc
@@ -34,9 +34,9 @@
 */

 use SP\Core\Acl\AclActionsInterface;
-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Account\Services\AccountSearchItem;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\Action\DataGridActionBase;
 use SP\Html\DataGrid\DataGridTab;
 use SP\Util\DateUtil;
--- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
+++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc
@@ -30,9 +30,9 @@
 * @var DataGrid $data
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Account\Services\AccountSearchItem;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\DataGrid;
 use SP\Mvc\View\Components\SelectItem;

--- a/app/modules/web/themes/material-blue/views/account/viewpass.inc
+++ b/app/modules/web/themes/material-blue/views/account/viewpass.inc
@@ -30,10 +30,10 @@
 * @var ConfigDataInterface $configData
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Services\AccountAcl;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;

 ?>
 <div id="box-popup" class="box-password-view">
--- a/app/modules/web/themes/material-blue/views/common/aux-customfields.inc
+++ b/app/modules/web/themes/material-blue/views/common/aux-customfields.inc
@@ -29,7 +29,7 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Domain\CustomField\Services\CustomFieldItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/common/datatabs.inc
+++ b/app/modules/web/themes/material-blue/views/common/datatabs.inc
@@ -29,7 +29,7 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\DataTab;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/common/debug.inc
+++ b/app/modules/web/themes/material-blue/views/common/debug.inc
@@ -28,7 +28,7 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/config/accounts.inc
+++ b/app/modules/web/themes/material-blue/views/config/accounts.inc
@@ -23,14 +23,14 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/backup.inc
+++ b/app/modules/web/themes/material-blue/views/config/backup.inc
@@ -23,14 +23,13 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var callable $_getRoute
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/encryption.inc
+++ b/app/modules/web/themes/material-blue/views/config/encryption.inc
@@ -23,14 +23,14 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/general-auth.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-auth.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/general-events.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-events.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/general-proxy.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-proxy.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/config/general-site.inc
+++ b/app/modules/web/themes/material-blue/views/config/general-site.inc
@@ -23,13 +23,12 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/config/general.inc
+++ b/app/modules/web/themes/material-blue/views/config/general.inc
@@ -23,14 +23,14 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/config/import.inc
+++ b/app/modules/web/themes/material-blue/views/config/import.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/info.inc
+++ b/app/modules/web/themes/material-blue/views/config/info.inc
@@ -23,7 +23,7 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
@@ -34,7 +34,6 @@
    <i class="material-icons">info</i>
    <?php

-    use SP\Core\UI\ThemeIconsInterface;
    use SP\Domain\Config\Ports\ConfigDataInterface;
    use SP\Domain\Install\Services\InstallerService;
    use SP\Html\Html;
--- a/app/modules/web/themes/material-blue/views/config/ldap.inc
+++ b/app/modules/web/themes/material-blue/views/config/ldap.inc
@@ -23,13 +23,12 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/config/mail.inc
+++ b/app/modules/web/themes/material-blue/views/config/mail.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc
+++ b/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/config/wiki.inc
+++ b/app/modules/web/themes/material-blue/views/config/wiki.inc
@@ -23,13 +23,12 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/error/error-database.inc
+++ b/app/modules/web/themes/material-blue/views/error/error-database.inc
@@ -23,11 +23,11 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/error/error-maintenance.inc
+++ b/app/modules/web/themes/material-blue/views/error/error-maintenance.inc
@@ -27,7 +27,7 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
+++ b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc
@@ -24,13 +24,12 @@

 /**
 * @var SP\Html\DataGrid\DataGridTab $data
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc
@@ -31,8 +31,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
 use SP\Html\DataGrid\Action\DataGridActionType;
--- a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc
+++ b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc
@@ -24,14 +24,14 @@

 /**
 * @var SP\Html\DataGrid\DataGridTab $data
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $tabs = $_getvar('tabs');
--- a/app/modules/web/themes/material-blue/views/install/index.inc
+++ b/app/modules/web/themes/material-blue/views/install/index.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc
@@ -23,7 +23,7 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
@@ -34,7 +34,6 @@
 * @var SelectItem $tag
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\AuthTokenData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/category.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/category.inc
@@ -24,15 +24,15 @@

 /**
 * @var  CategoryData $category
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\CategoryData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $category = $_getvar('category');
--- a/app/modules/web/themes/material-blue/views/itemshow/client.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/client.inc
@@ -24,15 +24,15 @@

 /**
 * @var ClientData $client
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\ClientData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $client = $_getvar('client');
--- a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc
@@ -24,13 +24,12 @@

 /**
 * @var CustomFieldDefinitionData $field
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\CustomFieldDefinitionData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
--- a/app/modules/web/themes/material-blue/views/itemshow/file.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/file.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\FileData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $fileData = $_getvar('fileData');
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc
@@ -24,13 +24,12 @@

 /**
 * @var Password $password
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\ItemPreset\Password;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc
@@ -23,13 +23,12 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc
@@ -24,13 +24,12 @@

 /**
 * @var AccountPrivate $private
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\ItemPreset\AccountPrivate;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\ItemPreset\SessionTimeout;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $sessionTimeout = $_getvar('sessionTimeout');
--- a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Account\Models\ItemPreset;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\PublicLinkListData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/results.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/results.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/itemshow/tag.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/tag.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\TagData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $tag = $_getvar('tag');
--- a/app/modules/web/themes/material-blue/views/itemshow/user.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user.inc
@@ -24,15 +24,15 @@

 /**
 * @var UserData $user
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\UserData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc
@@ -31,10 +31,10 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\UserGroupData;
 use SP\DataModel\UserToUserGroupData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;

--- a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc
@@ -24,13 +24,12 @@

 /**
 * @var UserData $user
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\UserData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc
+++ b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc
@@ -31,10 +31,10 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\ProfileData;
 use SP\DataModel\UserProfileData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $profile = $_getvar('profile');
--- a/app/modules/web/themes/material-blue/views/login/index.inc
+++ b/app/modules/web/themes/material-blue/views/login/index.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/main/update.inc
+++ b/app/modules/web/themes/material-blue/views/main/update.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/main/upgrade.inc
+++ b/app/modules/web/themes/material-blue/views/main/upgrade.inc
@@ -23,7 +23,7 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
@@ -34,7 +34,6 @@
        <div id="page-title">
            <h1><?php

-                use SP\Core\UI\ThemeIconsInterface;
                use SP\Domain\Config\Ports\ConfigDataInterface;
                use SP\Mvc\View\TemplateInterface;
                use SP\Util\VersionUtil;
--- a/app/modules/web/themes/material-blue/views/notification/notification.inc
+++ b/app/modules/web/themes/material-blue/views/notification/notification.inc
@@ -30,9 +30,9 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\NotificationData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\Components\SelectItem;
 use SP\Mvc\View\TemplateInterface;
 use SP\Util\DateUtil;
--- a/app/modules/web/themes/material-blue/views/plugin/plugin.inc
+++ b/app/modules/web/themes/material-blue/views/plugin/plugin.inc
@@ -25,13 +25,12 @@
 /**
 * @var  PluginModel $plugin
 * @var  PluginInterface $pluginInfo
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Infrastructure\Plugin\Repositories\PluginModel;
 use SP\Mvc\View\TemplateInterface;
--- a/app/modules/web/themes/material-blue/views/upgrade/index.inc
+++ b/app/modules/web/themes/material-blue/views/upgrade/index.inc
@@ -24,10 +24,9 @@

 /**
 * @var TemplateInterface $this
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/userpassreset/request.inc
+++ b/app/modules/web/themes/material-blue/views/userpassreset/request.inc
@@ -24,7 +24,7 @@

 /** @var $icons ThemeIconsInterface */

-use SP\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;

 ?>

--- a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc
+++ b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc
@@ -29,8 +29,8 @@
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 ?>
--- a/app/modules/web/themes/material-blue/views/usersettings/general.inc
+++ b/app/modules/web/themes/material-blue/views/usersettings/general.inc
@@ -24,13 +24,12 @@

 /**
 * @var UserPreferencesData $userPreferences
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\DataModel\UserPreferencesData;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Mvc\View\Components\SelectItem;
--- a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc
+++ b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc
@@ -23,14 +23,14 @@
 */

 /**
- * @var ThemeIconsInterface $icons
+ * @var \SP\Domain\Core\UI\ThemeIconsInterface $icons
 * @var ConfigDataInterface $configData
 * @var callable $_getvar
 * @var TemplateInterface $this
 */

-use SP\Core\UI\ThemeIconsInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Mvc\View\TemplateInterface;

 $header = $_getvar('header');
--- a/lib/SP/Core/Definitions/CoreDefinitions.php
+++ b/lib/SP/Core/Definitions/CoreDefinitions.php
@@ -46,15 +46,11 @@ use SP\Core\Crypt\RequestBasedPasswordInterface;
 use SP\Core\Crypt\UuidCookie;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Language;
-use SP\Core\LanguageInterface;
 use SP\Core\MimeTypes;
 use SP\Core\ProvidersHelper;
 use SP\Core\UI\Theme;
 use SP\Core\UI\ThemeContext;
-use SP\Core\UI\ThemeContextInterface;
 use SP\Core\UI\ThemeIcons;
-use SP\Core\UI\ThemeIconsInterface;
-use SP\Core\UI\ThemeInterface;
 use SP\Domain\Auth\Ports\LdapActionsInterface;
 use SP\Domain\Auth\Ports\LdapAuthInterface;
 use SP\Domain\Auth\Ports\LdapConnectionInterface;
@@ -63,6 +59,10 @@ use SP\Domain\Config\Ports\ConfigInterface;
 use SP\Domain\Config\Services\ConfigBackupService;
 use SP\Domain\Config\Services\ConfigFileService;
 use SP\Domain\Core\File\MimeTypesInterface;
+use SP\Domain\Core\LanguageInterface;
+use SP\Domain\Core\UI\ThemeContextInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Install\Adapters\InstallDataFactory;
 use SP\Domain\Install\Services\DatabaseSetupInterface;
 use SP\Domain\Install\Services\MysqlSetupBuilder;
--- a/lib/SP/Core/Language.php
+++ b/lib/SP/Core/Language.php
@@ -26,6 +26,7 @@ namespace SP\Core;

 use SP\Core\Context\ContextInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\LanguageInterface;
 use SP\Http\RequestInterface;

 use function SP\logger;
--- a/lib/SP/Core/ModuleBase.php
+++ b/lib/SP/Core/ModuleBase.php
@@ -25,7 +25,7 @@
 namespace SP\Core;

 use SP\Core\Context\ContextInterface;
-use SP\Core\Events\EventDispatcher;
+use SP\Core\Events\EventDispatcherInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigFileService;

@@ -36,25 +36,23 @@ use SP\Domain\Config\Services\ConfigFileService;
 */
 abstract class ModuleBase
 {
-    protected ConfigFileService   $config;
-    protected ConfigDataInterface $configData;
-    protected ContextInterface    $context;
-    private EventDispatcher       $eventDispatcher;
-    private ProvidersHelper       $providersHelper;
+    protected ConfigFileService      $config;
+    protected ConfigDataInterface    $configData;
+    protected ContextInterface       $context;
+    private EventDispatcherInterface $eventDispatcher;

    /**
     * Module constructor.
     *
-     * @param  \SP\Core\Application  $application
-     * @param  \SP\Core\ProvidersHelper  $providersHelper
+     * @param Application $application
+     * @param ProvidersHelper $providersHelper
     */
-    public function __construct(Application $application, ProvidersHelper $providersHelper)
+    public function __construct(Application $application, private readonly ProvidersHelper $providersHelper)
    {
        $this->config = $application->getConfig();
        $this->configData = $this->config->getConfigData();
        $this->context = $application->getContext();
        $this->eventDispatcher = $application->getEventDispatcher();
-        $this->providersHelper = $providersHelper;
    }

    abstract public function initialize(string $controller): void;
--- a/lib/SP/Core/PhpExtensionChecker.php
+++ b/lib/SP/Core/PhpExtensionChecker.php
@@ -26,6 +26,8 @@ namespace SP\Core;

 use SP\Core\Exceptions\CheckException;

+use function SP\logger;
+
 /**
 * Class PhpExtensionChecker
 *
@@ -99,16 +101,15 @@ final class PhpExtensionChecker
     * Checks if the extension is installed
     *
     * @param string $extension
-     * @param bool   $exception Throws an exception if the extension is not available
+     * @param bool $exception Throws an exception if the extension is not available
     *
     * @return bool
-     * @throws \SP\Core\Exceptions\CheckException
+     * @throws CheckException
     */
    public function checkIsAvailable(
        string $extension,
        bool   $exception = false
-    ): bool
-    {
+    ): bool {
        $result = in_array(strtolower($extension), $this->available, true);

        if (!$result && $exception) {
@@ -251,7 +252,7 @@ final class PhpExtensionChecker
    /**
     * @throws CheckException
     */
-    public function checkMandatory()
+    public function checkMandatory(): void
    {
        $missing = array_filter(
            self::EXTENSIONS,
@@ -281,4 +282,4 @@ final class PhpExtensionChecker
            ARRAY_FILTER_USE_KEY
        );
    }
-}
+}
--- a/lib/SP/Core/UI/Theme.php
+++ b/lib/SP/Core/UI/Theme.php
@@ -27,6 +27,9 @@ namespace SP\Core\UI;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\InvalidClassException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\UI\ThemeContextInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Util\FileUtil;

--- a/lib/SP/Core/UI/ThemeContext.php
+++ b/lib/SP/Core/UI/ThemeContext.php
@@ -25,6 +25,7 @@
 namespace SP\Core\UI;

 use Directory;
+use SP\Domain\Core\UI\ThemeContextInterface;
 use SP\Util\FileUtil;

 /**
--- a/lib/SP/Core/UI/ThemeIcons.php
+++ b/lib/SP/Core/UI/ThemeIcons.php
@@ -27,6 +27,8 @@ namespace SP\Core\UI;
 use SP\Core\Context\ContextBase;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\InvalidClassException;
+use SP\Domain\Core\UI\ThemeContextInterface;
+use SP\Domain\Core\UI\ThemeIconsInterface;
 use SP\Html\Assets\FontIcon;
 use SP\Html\Assets\IconInterface;
 use SP\Infrastructure\File\FileCacheInterface;
--- a/lib/SP/Domain/Auth/Services/LoginService.php
+++ b/lib/SP/Domain/Auth/Services/LoginService.php
@@ -36,14 +36,14 @@ use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\InvalidArgumentException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
-use SP\Core\LanguageInterface;
-use SP\Core\UI\ThemeInterface;
 use SP\DataModel\UserLoginData;
 use SP\DataModel\UserPreferencesData;
 use SP\Domain\Auth\Ports\LdapAuthInterface;
 use SP\Domain\Auth\Ports\LoginServiceInterface;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\LanguageInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface;
 use SP\Domain\Security\Ports\TrackServiceInterface;
 use SP\Domain\User\Ports\UserPassRecoverServiceInterface;
--- a/lib/SP/Domain/Config/Services/ConfigFileService.php
+++ b/lib/SP/Domain/Config/Services/ConfigFileService.php
@@ -26,7 +26,6 @@ namespace SP\Domain\Config\Services;

 use Defuse\Crypto\Exception\EnvironmentIsBrokenException;
 use Exception;
-use SP\Core\AppInfoInterface;
 use SP\Core\Context\ContextInterface;
 use SP\Core\Exceptions\ConfigException;
 use SP\Core\Exceptions\SPException;
@@ -34,10 +33,12 @@ use SP\Domain\Config\Adapters\ConfigData;
 use SP\Domain\Config\Ports\ConfigBackupServiceInterface;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigInterface;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Infrastructure\File\FileCacheInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\XmlFileStorageInterface;
 use SP\Util\PasswordUtil;
+
 use function SP\logger;
 use function SP\processException;

--- a/lib/SP/Domain/Core/AppInfoInterface.php
+++ b/lib/SP/Domain/Core/AppInfoInterface.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core;
+namespace SP\Domain\Core;


 /**
@@ -41,4 +41,4 @@ interface AppInfoInterface
    public const APP_UPDATES_URL = 'https://api.github.com/repos/nuxsmin/sysPass/releases/latest';
    public const APP_NOTICES_URL = 'https://api.github.com/repos/nuxsmin/sysPass/issues?milestone=none&state=open&labels=Notices';
    public const APP_ISSUES_URL = 'https://github.com/nuxsmin/sysPass/issues';
-}
+}
--- a/lib/SP/Domain/Core/ItemsTypeInterface.php
+++ b/lib/SP/Domain/Core/ItemsTypeInterface.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core;
+namespace SP\Domain\Core;

 /**
 * Interface ItemsTypeInterface para la definición de tipos de elementos
@@ -41,4 +41,4 @@ interface ItemsTypeInterface
    public const ITEM_PROFILES = 7;
    public const ITEM_ACCOUNTS = 8;
    public const ITEM_ACCOUNTS_USER = 58;
-}
+}
--- a/lib/SP/Domain/Core/LanguageInterface.php
+++ b/lib/SP/Domain/Core/LanguageInterface.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core;
+namespace SP\Domain\Core;


 /**
@@ -58,4 +58,4 @@ interface LanguageInterface
     * Restablecer el lenguaje global para las traducciones
     */
    public function unsetAppLocales(): void;
-}
+}
--- a/lib/SP/Domain/Core/UI/ThemeContextInterface.php
+++ b/lib/SP/Domain/Core/UI/ThemeContextInterface.php
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core\UI;
+namespace SP\Domain\Core\UI;

 use Directory;

--- a/lib/SP/Domain/Core/UI/ThemeIconsInterface.php
+++ b/lib/SP/Domain/Core/UI/ThemeIconsInterface.php
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core\UI;
+namespace SP\Domain\Core\UI;

 use SP\Core\Context\ContextInterface;
 use SP\Html\Assets\IconInterface;
--- a/lib/SP/Domain/Core/UI/ThemeInterface.php
+++ b/lib/SP/Domain/Core/UI/ThemeInterface.php
@@ -22,7 +22,7 @@
 * along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
 */

-namespace SP\Core\UI;
+namespace SP\Domain\Core\UI;

 /**
 * Interface ThemeInterface
--- a/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php
+++ b/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php
@@ -26,7 +26,6 @@ namespace SP\Domain\Crypt\Services;

 use Defuse\Crypto\Exception\CryptoException;
 use Exception;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\Hash;
@@ -37,6 +36,7 @@ use SP\DataModel\Dto\ConfigRequest;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigServiceInterface;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface;
 use SP\Domain\Notification\Ports\MailServiceInterface;
 use SP\Domain\User\Ports\UserServiceInterface;
--- a/lib/SP/Domain/Export/Services/BackupFiles.php
+++ b/lib/SP/Domain/Export/Services/BackupFiles.php
@@ -24,9 +24,9 @@

 namespace SP\Domain\Export\Services;

-use SP\Core\AppInfoInterface;
 use SP\Core\Exceptions\CheckException;
 use SP\Core\PhpExtensionChecker;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Export\Ports\BackupFilesInterface;
 use SP\Infrastructure\File\ArchiveHandler;
 use SP\Infrastructure\File\ArchiveHandlerInterface;
--- a/lib/SP/Domain/Export/Services/FileBackupService.php
+++ b/lib/SP/Domain/Export/Services/FileBackupService.php
@@ -27,7 +27,6 @@ namespace SP\Domain\Export\Services;

 use Exception;
 use PDO;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventDispatcherInterface;
@@ -39,6 +38,7 @@ use SP\Core\Exceptions\SPException;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Ports\ConfigInterface;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Export\Ports\BackupFilesInterface;
 use SP\Domain\Export\Ports\FileBackupServiceInterface;
 use SP\Infrastructure\Common\Repositories\Query;
--- a/lib/SP/Domain/Export/Services/XmlExportService.php
+++ b/lib/SP/Domain/Export/Services/XmlExportService.php
@@ -28,7 +28,6 @@ use DOMDocument;
 use DOMElement;
 use DOMXPath;
 use Exception;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Crypt\Hash;
@@ -45,6 +44,7 @@ use SP\Domain\Client\Ports\ClientServiceInterface;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Export\Ports\XmlExportServiceInterface;
 use SP\Domain\Tag\Ports\TagServiceInterface;
 use SP\Infrastructure\File\ArchiveHandler;
--- a/lib/SP/Domain/Notification/Services/MailService.php
+++ b/lib/SP/Domain/Notification/Services/MailService.php
@@ -25,7 +25,6 @@
 namespace SP\Domain\Notification\Services;

 use Exception;
-use SP\Core\AppInfoInterface;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Events\Event;
@@ -34,6 +33,7 @@ use SP\Core\Exceptions\SPException;
 use SP\Core\Messages\MailMessage;
 use SP\Domain\Common\Services\Service;
 use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Notification\Ports\MailServiceInterface;
 use SP\Domain\Providers\MailerInterface;
 use SP\Domain\Providers\MailProviderInterface;
--- a/lib/SP/Html/DataGrid/DataGridBase.php
+++ b/lib/SP/Html/DataGrid/DataGridBase.php
@@ -27,7 +27,7 @@ namespace SP\Html\DataGrid;
 defined('APP_ROOT') || die();

 use SP\Core\Exceptions\FileNotFoundException;
-use SP\Core\UI\ThemeInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Html\DataGrid\Action\DataGridActionInterface;
 use SP\Html\DataGrid\Layout\DataGridHeader;
 use SP\Html\DataGrid\Layout\DataGridHeaderInterface;
@@ -133,7 +133,7 @@ abstract class DataGridBase implements DataGridInterface
    /**
     * DataGridBase constructor.
     *
-     * @param ThemeInterface $theme
+     * @param \SP\Domain\Core\UI\ThemeInterface $theme
     */
    public function __construct(ThemeInterface $theme)
    {
@@ -541,4 +541,4 @@ abstract class DataGridBase implements DataGridInterface
    {
        return $this->actionsCount;
    }
-}
+}
--- a/lib/SP/Mvc/Controller/SimpleControllerHelper.php
+++ b/lib/SP/Mvc/Controller/SimpleControllerHelper.php
@@ -28,7 +28,7 @@ namespace SP\Mvc\Controller;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
 use SP\Core\PhpExtensionChecker;
-use SP\Core\UI\ThemeInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Http\RequestInterface;

 /**
@@ -80,4 +80,4 @@ final class SimpleControllerHelper
    {
        return $this->extensionChecker;
    }
-}
+}
--- a/lib/SP/Mvc/Controller/WebControllerHelper.php
+++ b/lib/SP/Mvc/Controller/WebControllerHelper.php
@@ -28,7 +28,7 @@ namespace SP\Mvc\Controller;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
 use SP\Core\PhpExtensionChecker;
-use SP\Core\UI\ThemeInterface;
+use SP\Domain\Core\UI\ThemeInterface;
 use SP\Http\RequestInterface;
 use SP\Modules\Web\Controllers\Helpers\LayoutHelper;
 use SP\Mvc\View\TemplateInterface;
@@ -103,4 +103,4 @@ final class WebControllerHelper
    {
        return $this->layoutHelper;
    }
-}
+}
--- a/Show More
+++ b/Show More