diff --git a/app/modules/api/Init.php b/app/modules/api/Init.php index be0f3744..c9722b79 100644 --- 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')); } } -} \ No newline at end of file +} diff --git a/app/modules/cli/Init.php b/app/modules/cli/Init.php index 3e91a265..71125177 100644 --- 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 ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php index 4031524e..4f7b1770 100644 --- 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; diff --git a/app/modules/web/Controllers/ConfigManager/IndexController.php b/app/modules/web/Controllers/ConfigManager/IndexController.php index d68d940f..ca2ad2b7 100644 --- 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; diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php index 540d67ef..0102051c 100644 --- 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; diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php index def3c6c2..3256358e 100644 --- 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; diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php index 7a48c2ad..15762dd3 100644 --- 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; diff --git a/app/modules/web/Controllers/Status/CheckNotices.php b/app/modules/web/Controllers/Status/CheckNotices.php index e40c26c1..1cfed625 100644 --- 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); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Status/StatusController.php b/app/modules/web/Controllers/Status/StatusController.php index 6af061f8..cb8da61b 100644 --- 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); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php index 94cf0ff3..e9f4fa31 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/account-editpass.inc b/app/modules/web/themes/material-blue/views/account/account-editpass.inc index a1dc19c8..e325728b 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/account-history.inc b/app/modules/web/themes/material-blue/views/account/account-history.inc index 9b14a92a..4d9667f6 100644 --- 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 */ diff --git a/app/modules/web/themes/material-blue/views/account/account-link.inc b/app/modules/web/themes/material-blue/views/account/account-link.inc index 557e24a3..47bd8365 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/account-permissions.inc b/app/modules/web/themes/material-blue/views/account/account-permissions.inc index c58d7be0..438c1b48 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/account-request.inc b/app/modules/web/themes/material-blue/views/account/account-request.inc index 5eedad03..922d4161 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc index 1ddfb6b6..4d004e21 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/account/actions.inc b/app/modules/web/themes/material-blue/views/account/actions.inc index c47400a1..eaa63dcb 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/account/details.inc b/app/modules/web/themes/material-blue/views/account/details.inc index 1d7c50a5..6fa2f2fa 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/files-list.inc b/app/modules/web/themes/material-blue/views/account/files-list.inc index ca64a2c0..c8509f5b 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/account/files.inc b/app/modules/web/themes/material-blue/views/account/files.inc index e8eb6d32..fdfc453d 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc index c34c34ed..65a3285d 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/account/search-header.inc b/app/modules/web/themes/material-blue/views/account/search-header.inc index 2094a2fa..6071043a 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/search-index.inc b/app/modules/web/themes/material-blue/views/account/search-index.inc index fbcdd270..6b1982c5 100644 --- 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)) { diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc index 35d15bea..6acb458d 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc index eeee716d..278f643b 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/account/viewpass.inc b/app/modules/web/themes/material-blue/views/account/viewpass.inc index 6f1b01fa..e6ee7edc 100644 --- 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; ?>
diff --git a/app/modules/web/themes/material-blue/views/common/aux-customfields.inc b/app/modules/web/themes/material-blue/views/common/aux-customfields.inc index 2cfda0c5..b71ce8f3 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/common/datatabs.inc b/app/modules/web/themes/material-blue/views/common/datatabs.inc index 24ec67fc..bc302c4c 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/common/debug.inc b/app/modules/web/themes/material-blue/views/common/debug.inc index d7190325..01ee9bac 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/config/accounts.inc b/app/modules/web/themes/material-blue/views/config/accounts.inc index 8036d84f..57bde48a 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/backup.inc b/app/modules/web/themes/material-blue/views/config/backup.inc index eab7b7a4..b8bdf987 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/encryption.inc b/app/modules/web/themes/material-blue/views/config/encryption.inc index 10aa6b57..551a48e2 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/general-auth.inc b/app/modules/web/themes/material-blue/views/config/general-auth.inc index e1edcd93..a243ec24 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/general-events.inc b/app/modules/web/themes/material-blue/views/config/general-events.inc index 55546c70..fd8564d3 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/general-proxy.inc b/app/modules/web/themes/material-blue/views/config/general-proxy.inc index a1b200e7..41aa6874 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/config/general-site.inc b/app/modules/web/themes/material-blue/views/config/general-site.inc index 3a5162a7..dd7e3b4a 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/general.inc b/app/modules/web/themes/material-blue/views/config/general.inc index effafff5..b5a80cf8 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/config/import.inc b/app/modules/web/themes/material-blue/views/config/import.inc index bdb5b371..3f2f75a8 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc index 3e9faf7a..beecb9d1 100644 --- 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 @@ info diff --git a/app/modules/web/themes/material-blue/views/config/wiki.inc b/app/modules/web/themes/material-blue/views/config/wiki.inc index efee11b7..061fe490 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/error/error-database.inc b/app/modules/web/themes/material-blue/views/error/error-database.inc index fee426c1..f0087385 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/error/error-maintenance.inc b/app/modules/web/themes/material-blue/views/error/error-maintenance.inc index 955185f7..4a51635c 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc index fbd834c8..039de3fb 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc index c316743c..4bd9242b 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc index 69468611..d4bb7a95 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/install/index.inc b/app/modules/web/themes/material-blue/views/install/index.inc index f9bb4f04..01687993 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc index 25facd3f..ebcd5a3d 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc index 8b9de800..a18ec10b 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/category.inc b/app/modules/web/themes/material-blue/views/itemshow/category.inc index 83fe95c0..1d8aef23 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/itemshow/client.inc b/app/modules/web/themes/material-blue/views/itemshow/client.inc index 1078efb7..610204ee 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc index dec7bad9..76fdc72f 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/file.inc b/app/modules/web/themes/material-blue/views/itemshow/file.inc index 8966b551..a3950115 100644 --- 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'); diff --git 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 index 333eef70..bc56de19 100644 --- 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; diff --git 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 index 825a67ac..dbbc7298 100644 --- 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; diff --git 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 index 9704742c..1fa13760 100644 --- 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; diff --git 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 index 0fdeefb8..d467b752 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc index 904e11da..a64d5519 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc index f36e4106..339fd486 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/results.inc b/app/modules/web/themes/material-blue/views/itemshow/results.inc index 1b00905f..752f4714 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/itemshow/tag.inc b/app/modules/web/themes/material-blue/views/itemshow/tag.inc index 0ae5537d..b34110a5 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/itemshow/user.inc b/app/modules/web/themes/material-blue/views/itemshow/user.inc index 9726b476..2288a958 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc index 937f0744..0bf3ca62 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc index 53ddf662..21a30848 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc index 711d799d..3d371636 100644 --- 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'); diff --git a/app/modules/web/themes/material-blue/views/login/index.inc b/app/modules/web/themes/material-blue/views/login/index.inc index 49078da5..7ce9baf3 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/main/update.inc b/app/modules/web/themes/material-blue/views/main/update.inc index 16c5a5d1..0a9156cb 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/main/upgrade.inc b/app/modules/web/themes/material-blue/views/main/upgrade.inc index 451283ba..8065cca7 100644 --- 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 @@

diff --git a/app/modules/web/themes/material-blue/views/userpassreset/request.inc b/app/modules/web/themes/material-blue/views/userpassreset/request.inc index 7f7133f4..4bba956c 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc index d0fa05a6..b14a935c 100644 --- 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; ?> diff --git a/app/modules/web/themes/material-blue/views/usersettings/general.inc b/app/modules/web/themes/material-blue/views/usersettings/general.inc index 19e68ae9..81ff7d49 100644 --- 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; diff --git a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc index 80417d93..cf02559f 100644 --- 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'); diff --git a/lib/SP/Core/Definitions/CoreDefinitions.php b/lib/SP/Core/Definitions/CoreDefinitions.php index a7742d59..99a4a4cd 100644 --- 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; diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php index 98deaecd..14059898 100644 --- 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; diff --git a/lib/SP/Core/ModuleBase.php b/lib/SP/Core/ModuleBase.php index ad5378ce..b376761c 100644 --- 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; diff --git a/lib/SP/Core/PhpExtensionChecker.php b/lib/SP/Core/PhpExtensionChecker.php index fbe89a8c..543ddb5e 100644 --- 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 ); } -} \ No newline at end of file +} diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php index 80351858..dccc2697 100644 --- 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; diff --git a/lib/SP/Core/UI/ThemeContext.php b/lib/SP/Core/UI/ThemeContext.php index 0f7021e6..623a9dff 100644 --- 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; /** diff --git a/lib/SP/Core/UI/ThemeIcons.php b/lib/SP/Core/UI/ThemeIcons.php index 28ccc846..bc8cd2a3 100644 --- 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; diff --git a/lib/SP/Domain/Auth/Services/LoginService.php b/lib/SP/Domain/Auth/Services/LoginService.php index a0e30174..9ed4321d 100644 --- 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; diff --git a/lib/SP/Domain/Config/Services/ConfigFileService.php b/lib/SP/Domain/Config/Services/ConfigFileService.php index 96a3feb8..5a221510 100644 --- 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; diff --git a/lib/SP/Core/AppInfoInterface.php b/lib/SP/Domain/Core/AppInfoInterface.php similarity index 94% rename from lib/SP/Core/AppInfoInterface.php rename to lib/SP/Domain/Core/AppInfoInterface.php index f6d7c4cb..7aefdc0b 100644 --- a/lib/SP/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 . */ -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'; -} \ No newline at end of file +} diff --git a/lib/SP/Core/ItemsTypeInterface.php b/lib/SP/Domain/Core/ItemsTypeInterface.php similarity index 93% rename from lib/SP/Core/ItemsTypeInterface.php rename to lib/SP/Domain/Core/ItemsTypeInterface.php index 436ccb6f..41f1c844 100644 --- a/lib/SP/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 . */ -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; -} \ No newline at end of file +} diff --git a/lib/SP/Core/LanguageInterface.php b/lib/SP/Domain/Core/LanguageInterface.php similarity index 94% rename from lib/SP/Core/LanguageInterface.php rename to lib/SP/Domain/Core/LanguageInterface.php index 12814159..cf289411 100644 --- a/lib/SP/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 . */ -namespace SP\Core; +namespace SP\Domain\Core; /** @@ -58,4 +58,4 @@ interface LanguageInterface * Restablecer el lenguaje global para las traducciones */ public function unsetAppLocales(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Core/UI/ThemeContextInterface.php b/lib/SP/Domain/Core/UI/ThemeContextInterface.php similarity index 97% rename from lib/SP/Core/UI/ThemeContextInterface.php rename to lib/SP/Domain/Core/UI/ThemeContextInterface.php index 26d6ef70..9310cbb4 100644 --- a/lib/SP/Core/UI/ThemeContextInterface.php +++ b/lib/SP/Domain/Core/UI/ThemeContextInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Core\UI; +namespace SP\Domain\Core\UI; use Directory; diff --git a/lib/SP/Core/UI/ThemeIconsInterface.php b/lib/SP/Domain/Core/UI/ThemeIconsInterface.php similarity index 98% rename from lib/SP/Core/UI/ThemeIconsInterface.php rename to lib/SP/Domain/Core/UI/ThemeIconsInterface.php index 92ccfb1a..52edcedb 100644 --- a/lib/SP/Core/UI/ThemeIconsInterface.php +++ b/lib/SP/Domain/Core/UI/ThemeIconsInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Core\UI; +namespace SP\Domain\Core\UI; use SP\Core\Context\ContextInterface; use SP\Html\Assets\IconInterface; diff --git a/lib/SP/Core/UI/ThemeInterface.php b/lib/SP/Domain/Core/UI/ThemeInterface.php similarity index 98% rename from lib/SP/Core/UI/ThemeInterface.php rename to lib/SP/Domain/Core/UI/ThemeInterface.php index bbff8ca5..cbfb3a3a 100644 --- a/lib/SP/Core/UI/ThemeInterface.php +++ b/lib/SP/Domain/Core/UI/ThemeInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Core\UI; +namespace SP\Domain\Core\UI; /** * Interface ThemeInterface diff --git a/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php b/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php index 1284ffec..b793df03 100644 --- 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; diff --git a/lib/SP/Domain/Export/Services/BackupFiles.php b/lib/SP/Domain/Export/Services/BackupFiles.php index 28caa9cb..fb6df5b3 100644 --- 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; diff --git a/lib/SP/Domain/Export/Services/FileBackupService.php b/lib/SP/Domain/Export/Services/FileBackupService.php index 5aa8b423..5c6b89f7 100644 --- 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; diff --git a/lib/SP/Domain/Export/Services/XmlExportService.php b/lib/SP/Domain/Export/Services/XmlExportService.php index 59d4679f..f0d9b826 100644 --- 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; diff --git a/lib/SP/Domain/Notification/Services/MailService.php b/lib/SP/Domain/Notification/Services/MailService.php index 9c69d753..914f24a2 100644 --- 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; diff --git a/lib/SP/Html/DataGrid/DataGridBase.php b/lib/SP/Html/DataGrid/DataGridBase.php index 65acdd03..dc332705 100644 --- 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; } -} \ No newline at end of file +} diff --git a/lib/SP/Mvc/Controller/SimpleControllerHelper.php b/lib/SP/Mvc/Controller/SimpleControllerHelper.php index a6079128..c954a0ad 100644 --- 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; } -} \ No newline at end of file +} diff --git a/lib/SP/Mvc/Controller/WebControllerHelper.php b/lib/SP/Mvc/Controller/WebControllerHelper.php index 0800c48c..89c1ef20 100644 --- 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; } -} \ No newline at end of file +} diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php index 63e3f0db..23ec6562 100644 --- a/lib/SP/Mvc/View/Template.php +++ b/lib/SP/Mvc/View/Template.php @@ -28,7 +28,7 @@ defined('APP_ROOT') || die(); use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Exceptions\FileNotFoundException; -use SP\Core\UI\ThemeInterface; +use SP\Domain\Core\UI\ThemeInterface; use SP\Http\Uri; /** @@ -59,7 +59,7 @@ final class Template implements TemplateInterface private bool $upgraded = false; /** - * @param ThemeInterface $theme + * @param \SP\Domain\Core\UI\ThemeInterface $theme */ public function __construct(ThemeInterface $theme) { diff --git a/lib/SP/Mvc/View/TemplateInterface.php b/lib/SP/Mvc/View/TemplateInterface.php index 790f767d..f00f71d7 100644 --- a/lib/SP/Mvc/View/TemplateInterface.php +++ b/lib/SP/Mvc/View/TemplateInterface.php @@ -26,7 +26,7 @@ namespace SP\Mvc\View; use SP\Core\Exceptions\FileNotFoundException; -use SP\Core\UI\ThemeInterface; +use SP\Domain\Core\UI\ThemeInterface; /** * Class Template @@ -168,4 +168,4 @@ interface TemplateInterface public function assign(string $name, $value = '', ?string $scope = null): void; public function isUpgraded(): bool; -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Log/DatabaseLogHandler.php b/lib/SP/Providers/Log/DatabaseLogHandler.php index f849a7fd..5701e8da 100644 --- a/lib/SP/Providers/Log/DatabaseLogHandler.php +++ b/lib/SP/Providers/Log/DatabaseLogHandler.php @@ -31,8 +31,8 @@ use SP\Core\Events\EventReceiver; use SP\Core\Exceptions\InvalidClassException; use SP\Core\Exceptions\SPException; use SP\Core\Language; -use SP\Core\LanguageInterface; use SP\DataModel\EventlogData; +use SP\Domain\Core\LanguageInterface; use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Domain\Security\Services\EventlogService; use SP\Providers\EventsTrait; diff --git a/lib/SP/Providers/Log/LoggerBase.php b/lib/SP/Providers/Log/LoggerBase.php index 2f628214..77d22757 100644 --- a/lib/SP/Providers/Log/LoggerBase.php +++ b/lib/SP/Providers/Log/LoggerBase.php @@ -31,7 +31,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventReceiver; use SP\Core\Exceptions\InvalidClassException; use SP\Core\Language; -use SP\Core\LanguageInterface; +use SP\Domain\Core\LanguageInterface; use SP\Http\Request; use SP\Http\RequestInterface; use SP\Providers\EventsTrait; diff --git a/lib/SP/Providers/Mail/MailProvider.php b/lib/SP/Providers/Mail/MailProvider.php index 43a182df..ea8b4745 100644 --- a/lib/SP/Providers/Mail/MailProvider.php +++ b/lib/SP/Providers/Mail/MailProvider.php @@ -25,9 +25,9 @@ namespace SP\Providers\Mail; use Exception; -use SP\Core\AppInfoInterface; use SP\Core\Application; use SP\Core\Exceptions\SPException; +use SP\Domain\Core\AppInfoInterface; use SP\Domain\Providers\MailerInterface; use SP\Domain\Providers\MailProviderInterface; use SP\Providers\Provider; @@ -121,4 +121,4 @@ final class MailProvider extends Provider implements MailProviderInterface { // TODO: Implement initialize() method. } -} \ No newline at end of file +} diff --git a/tests/SP/Core/UI/ThemeIconsTest.php b/tests/SP/Core/UI/ThemeIconsTest.php index e055334c..9ec2e1dc 100644 --- a/tests/SP/Core/UI/ThemeIconsTest.php +++ b/tests/SP/Core/UI/ThemeIconsTest.php @@ -27,7 +27,6 @@ namespace SP\Tests\Core\UI; use PHPUnit\Framework\MockObject\Exception; use SP\Core\Context\ContextInterface; use SP\Core\Exceptions\InvalidClassException; -use SP\Core\UI\ThemeContextInterface; use SP\Core\UI\ThemeIcons; use SP\Html\Assets\FontIcon; use SP\Infrastructure\File\FileCacheInterface; @@ -86,7 +85,7 @@ class ThemeIconsTest extends UnitaryTestCase { $context = $this->createMock(ContextInterface::class); $fileCache = $this->createMock(FileCacheInterface::class); - $themeContext = $this->createMock(ThemeContextInterface::class); + $themeContext = $this->createMock(\SP\Domain\Core\UI\ThemeContextInterface::class); $context->expects(self::once()) ->method('getAppStatus') diff --git a/tests/SP/Core/UI/ThemeTest.php b/tests/SP/Core/UI/ThemeTest.php index c1de92a7..9723acf8 100644 --- a/tests/SP/Core/UI/ThemeTest.php +++ b/tests/SP/Core/UI/ThemeTest.php @@ -30,8 +30,7 @@ use PHPUnit\Framework\MockObject\MockObject; use SP\Core\Context\ContextException; use SP\Core\Context\SessionContextInterface; use SP\Core\UI\Theme; -use SP\Core\UI\ThemeContextInterface; -use SP\Core\UI\ThemeIconsInterface; +use SP\Domain\Core\UI\ThemeContextInterface; use SP\Domain\User\Services\UserLoginResponse; use SP\Tests\Generators\UserDataGenerator; use SP\Tests\UnitaryTestCase; @@ -44,9 +43,9 @@ use SP\Tests\UnitaryTestCase; class ThemeTest extends UnitaryTestCase { - private ThemeContextInterface|MockObject $themeContext; - private ThemeIconsInterface|MockObject $themeIcons; - private Theme $theme; + private \SP\Domain\Core\UI\ThemeContextInterface|MockObject $themeContext; + private \SP\Domain\Core\UI\ThemeIconsInterface|MockObject $themeIcons; + private Theme $theme; public function testGetIcons() { @@ -181,7 +180,7 @@ class ThemeTest extends UnitaryTestCase parent::setUp(); $this->themeContext = $this->createMock(ThemeContextInterface::class); - $this->themeIcons = $this->createMock(ThemeIconsInterface::class); + $this->themeIcons = $this->createMock(\SP\Domain\Core\UI\ThemeIconsInterface::class); $this->theme = new Theme($this->themeContext, $this->themeIcons); }