chore: Move interfaces into Domain

Signed-off-by: Rubén D <nuxsmin@syspass.org>

app/modules/api/Controllers/Account/CreateController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Account;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Dtos\AccountRequest;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class CreateController
@@ -74,8 +75,8 @@ final class CreateController extends AccountBase
     }
 
     /**
-     * @return \SP\Domain\Account\Dtos\AccountRequest
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return AccountRequest
+     * @throws ServiceException
      */
     private function buildAccountRequest(): AccountRequest
     {

app/modules/api/Controllers/Account/DeleteController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Account;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class DeleteController

app/modules/api/Controllers/Account/EditController.php

@@ -25,11 +25,12 @@
 namespace SP\Modules\Api\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Dtos\AccountRequest;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class EditController
@@ -73,8 +74,8 @@ final class EditController extends AccountBase
     }
 
     /**
-     * @return \SP\Domain\Account\Dtos\AccountRequest
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return AccountRequest
+     * @throws ServiceException
      */
     private function buildAccountRequest(): AccountRequest
     {

app/modules/api/Controllers/Account/EditPassController.php

@@ -25,11 +25,12 @@
 namespace SP\Modules\Api\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Dtos\AccountRequest;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class EditPassController
@@ -75,8 +76,8 @@ final class EditPassController extends AccountBase
     }
 
     /**
-     * @return \SP\Domain\Account\Dtos\AccountRequest
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return AccountRequest
+     * @throws ServiceException
      */
     private function buildAccountRequest(): AccountRequest
     {

app/modules/api/Controllers/Account/SearchController.php

@@ -27,13 +27,14 @@ namespace SP\Modules\Api\Controllers\Account;
 use Exception;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Domain\Account\Ports\AccountSearchServiceInterface;
 use SP\Domain\Account\Search\AccountSearchConstants;
 use SP\Domain\Account\Search\AccountSearchFilter;
 use SP\Domain\Api\Ports\ApiServiceInterface;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Api\Controllers\ControllerBase;
 
 /**
@@ -78,8 +79,8 @@ final class SearchController extends ControllerBase
     }
 
     /**
-     * @return \SP\Domain\Account\Search\AccountSearchFilter
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return AccountSearchFilter
+     * @throws ServiceException
      */
     private function buildAccountSearchFilter(): AccountSearchFilter
     {

app/modules/api/Controllers/Account/ViewController.php

@@ -27,11 +27,11 @@ namespace SP\Modules\Api\Controllers\Account;
 
 use Exception;
 use League\Fractal\Resource\Item;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Dtos\AccountEnrichedDto;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\Util;
 
 /**

app/modules/api/Controllers/Account/ViewPassController.php

@@ -26,11 +26,11 @@ namespace SP\Modules\Api\Controllers\Account;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Crypt\Crypt;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class ViewController

app/modules/api/Controllers/Category/CreateController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\CategoryData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class CreateController
@@ -71,8 +72,8 @@ final class CreateController extends CategoryBase
     }
 
     /**
-     * @return \SP\DataModel\CategoryData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return CategoryData
+     * @throws ServiceException
      */
     private function buildCategoryData(): CategoryData
     {

app/modules/api/Controllers/Category/DeleteController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class DeleteController

app/modules/api/Controllers/Category/EditController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\CategoryData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 final class EditController extends CategoryBase
 {
@@ -68,8 +69,8 @@ final class EditController extends CategoryBase
     }
 
     /**
-     * @return \SP\DataModel\CategoryData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return CategoryData
+     * @throws ServiceException
      */
     private function buildCategoryData(): CategoryData
     {

app/modules/api/Controllers/Category/SearchController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Api\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\DataModel\ItemSearchData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class SearchController
@@ -61,8 +62,8 @@ final class SearchController extends CategoryBase
     }
 
     /**
-     * @return \SP\DataModel\ItemSearchData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ItemSearchData
+     * @throws ServiceException
      */
     private function buildSearchData(): ItemSearchData
     {

app/modules/api/Controllers/Category/ViewController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Category;
 
 use Exception;
 use League\Fractal\Resource\Item;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\Util;
 
 

app/modules/api/Controllers/Client/CreateController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\ClientData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class CreateController
@@ -71,8 +72,8 @@ final class CreateController extends ClientBase
     }
 
     /**
-     * @return \SP\DataModel\ClientData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ClientData
+     * @throws ServiceException
      */
     private function buildClientData(): ClientData
     {

app/modules/api/Controllers/Client/DeleteController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class DeleteController

app/modules/api/Controllers/Client/EditController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\ClientData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class EditController
@@ -69,8 +70,8 @@ final class EditController extends ClientBase
     }
 
     /**
-     * @return \SP\DataModel\ClientData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ClientData
+     * @throws ServiceException
      */
     private function buildClientData(): ClientData
     {

app/modules/api/Controllers/Client/SearchController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Api\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\DataModel\ItemSearchData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class SearchController
@@ -61,8 +62,8 @@ final class SearchController extends ClientBase
     }
 
     /**
-     * @return \SP\DataModel\ItemSearchData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ItemSearchData
+     * @throws ServiceException
      */
     private function buildSearchData(): ItemSearchData
     {

app/modules/api/Controllers/Client/ViewController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Client;
 
 use Exception;
 use League\Fractal\Resource\Item;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\Util;
 
 /**

app/modules/api/Controllers/Config/BackupController.php

@@ -27,12 +27,13 @@ namespace SP\Modules\Api\Controllers\Config;
 use Exception;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\InvalidClassException;
 use SP\Domain\Api\Ports\ApiServiceInterface;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Ports\FileBackupServiceInterface;
 use SP\Domain\Export\Services\BackupFiles;
 use SP\Modules\Api\Controllers\ControllerBase;
@@ -48,7 +49,7 @@ final class BackupController extends ControllerBase
     private FileBackupServiceInterface $fileBackupService;
 
     /**
-     * @throws \SP\Core\Exceptions\InvalidClassException
+     * @throws InvalidClassException
      */
     public function __construct(
         Application $application,

app/modules/api/Controllers/Config/ExportController.php

@@ -28,12 +28,13 @@ namespace SP\Modules\Api\Controllers\Config;
 use Exception;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\InvalidClassException;
 use SP\Domain\Api\Ports\ApiServiceInterface;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Ports\XmlExportServiceInterface;
 use SP\Modules\Api\Controllers\ControllerBase;
 use SP\Modules\Api\Controllers\Help\ConfigHelp;
@@ -46,7 +47,7 @@ final class ExportController extends ControllerBase
     private XmlExportServiceInterface $xmlExportService;
 
     /**
-     * @throws \SP\Core\Exceptions\InvalidClassException
+     * @throws InvalidClassException
      */
     public function __construct(
         Application $application,

app/modules/api/Controllers/ControllerBase.php

@@ -30,13 +30,14 @@ use League\Fractal\Manager;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
-use SP\Core\Context\ContextInterface;
 use SP\Core\Events\EventDispatcher;
 use SP\Core\Exceptions\SPException;
 use SP\Domain\Api\Ports\ApiServiceInterface;
 use SP\Domain\Api\Services\ApiResponse;
 use SP\Domain\Api\Services\JsonRpcResponse;
+use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\Context\ContextInterface;
 use SP\Http\Json;
 
 /**
@@ -86,7 +87,7 @@ abstract class ControllerBase
 
     /**
      * @throws SPException
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @throws ServiceException
      */
     final protected function setupApi(int $actionId): void
     {

app/modules/api/Controllers/Tag/CreateController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Tag;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\TagData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class CreateController
@@ -71,8 +72,8 @@ final class CreateController extends TagBase
     }
 
     /**
-     * @return \SP\DataModel\TagData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return TagData
+     * @throws ServiceException
      */
     private function buildTagData(): TagData
     {

app/modules/api/Controllers/Tag/DeleteController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\Tag;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class DeleteController

app/modules/api/Controllers/Tag/EditController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\Tag;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\TagData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class EditController
@@ -69,8 +70,8 @@ final class EditController extends TagBase
     }
 
     /**
-     * @return \SP\DataModel\TagData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return TagData
+     * @throws ServiceException
      */
     private function buildTagData(): TagData
     {

app/modules/api/Controllers/Tag/SearchController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Api\Controllers\Tag;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\DataModel\ItemSearchData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class SearchController
@@ -60,8 +61,8 @@ final class SearchController extends TagBase
     }
 
     /**
-     * @return \SP\DataModel\ItemSearchData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ItemSearchData
+     * @throws ServiceException
      */
     private function buildSearchData(): ItemSearchData
     {

app/modules/api/Controllers/Tag/ViewController.php

@@ -25,10 +25,10 @@
 namespace SP\Modules\Api\Controllers\Tag;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class ViewController

app/modules/api/Controllers/UserGroup/CreateController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\UserGroup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\UserGroupData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class CreateController
@@ -70,8 +71,8 @@ final class CreateController extends UserGroupBase
     }
 
     /**
-     * @return \SP\DataModel\UserGroupData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return UserGroupData
+     * @throws ServiceException
      */
     private function buildUserGroupData(): UserGroupData
     {

app/modules/api/Controllers/UserGroup/DeleteController.php

@@ -26,10 +26,10 @@ namespace SP\Modules\Api\Controllers\UserGroup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class DeleteController

app/modules/api/Controllers/UserGroup/EditController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Api\Controllers\UserGroup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\DataModel\UserGroupData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class EditController
@@ -72,8 +73,8 @@ final class EditController extends UserGroupBase
     }
 
     /**
-     * @return \SP\DataModel\UserGroupData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return UserGroupData
+     * @throws ServiceException
      */
     private function buildUserGroupData(): UserGroupData
     {

app/modules/api/Controllers/UserGroup/SearchController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Api\Controllers\UserGroup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\DataModel\ItemSearchData;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class SearchController
@@ -59,8 +60,8 @@ final class SearchController extends UserGroupBase
     }
 
     /**
-     * @return \SP\DataModel\ItemSearchData
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @return ItemSearchData
+     * @throws ServiceException
      */
     private function buildSearchData(): ItemSearchData
     {

app/modules/api/Controllers/UserGroup/ViewController.php

@@ -25,10 +25,10 @@
 namespace SP\Modules\Api\Controllers\UserGroup;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Api\Services\ApiResponse;
+use SP\Domain\Core\Acl\AclActionsInterface;
 
 /**
  * Class ViewController

app/modules/web/Controllers/AccessManager/IndexController.php

@@ -25,7 +25,6 @@
 namespace SP\Modules\Web\Controllers\AccessManager;
 
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Exceptions\ConstraintException;
@@ -33,6 +32,7 @@ use SP\Core\Exceptions\QueryException;
 use SP\DataModel\ItemSearchData;
 use SP\Domain\Account\Ports\PublicLinkServiceInterface;
 use SP\Domain\Auth\Ports\AuthTokenServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\User\Ports\UserGroupServiceInterface;
 use SP\Domain\User\Ports\UserProfileServiceInterface;
 use SP\Domain\User\Ports\UserServiceInterface;

app/modules/web/Controllers/Account/CopyController.php

@@ -25,8 +25,8 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/Account/CreateController.php

@@ -25,8 +25,8 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/Account/DeleteController.php

@@ -25,11 +25,11 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\UI\ThemeIcons;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\Helpers\Account\AccountHelper;
 use SP\Mvc\Controller\WebControllerHelper;
 use SP\Util\ErrorUtil;

app/modules/web/Controllers/Account/EditController.php

@@ -25,8 +25,8 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/Account/EditPassController.php

@@ -27,8 +27,8 @@ namespace SP\Modules\Web\Controllers\Account;
 use Exception;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/Account/RequestAccessController.php

@@ -25,10 +25,10 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Helpers\Account\AccountRequestHelper;
 use SP\Mvc\Controller\WebControllerHelper;
@@ -43,10 +43,10 @@ final class RequestAccessController extends ControllerBase
     private AccountServiceInterface $accountService;
 
     public function __construct(
-        Application $application,
-        WebControllerHelper $webControllerHelper,
-        \SP\Domain\Account\Ports\AccountServiceInterface $accountService,
-        AccountRequestHelper $accountRequestHelper
+        Application             $application,
+        WebControllerHelper     $webControllerHelper,
+        AccountServiceInterface $accountService,
+        AccountRequestHelper    $accountRequestHelper
     ) {
         parent::__construct($application, $webControllerHelper);
 

app/modules/web/Controllers/Account/SaveCopyController.php

@@ -25,11 +25,12 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -39,7 +40,7 @@ final class SaveCopyController extends AccountSaveBase
 {
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveCopyAction(): ?bool
     {

app/modules/web/Controllers/Account/SaveCreateController.php

@@ -25,11 +25,12 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -39,7 +40,7 @@ final class SaveCreateController extends AccountSaveBase
 {
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveCreateAction(): ?bool
     {

app/modules/web/Controllers/Account/SaveDeleteController.php

@@ -26,10 +26,12 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -41,15 +43,16 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SaveDeleteController extends AccountControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
-    private \SP\Domain\Account\Ports\AccountServiceInterface $accountService;
+    private AccountServiceInterface $accountService;
     private CustomFieldServiceInterface                      $customFieldService;
 
     public function __construct(
         Application $application,
         WebControllerHelper $webControllerHelper,
-        \SP\Domain\Account\Ports\AccountServiceInterface $accountService,
+        AccountServiceInterface $accountService,
         CustomFieldServiceInterface $customFieldService
     ) {
         parent::__construct(
@@ -67,7 +70,7 @@ final class SaveDeleteController extends AccountControllerBase
      * @param  int  $id  Account's ID
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveDeleteAction(int $id): bool
     {

app/modules/web/Controllers/Account/SaveEditController.php

@@ -26,11 +26,12 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -44,7 +45,7 @@ final class SaveEditController extends AccountSaveBase
      * @param  int  $id  Account's ID
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditAction(int $id): ?bool
     {

app/modules/web/Controllers/Account/SaveEditPassController.php

@@ -26,12 +26,15 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Account\Ports\AccountPresetServiceInterface;
+use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Modules\Web\Forms\AccountForm;
@@ -44,14 +47,14 @@ final class SaveEditPassController extends AccountControllerBase
 {
     use JsonTrait;
 
-    private \SP\Domain\Account\Ports\AccountServiceInterface $accountService;
+    private AccountServiceInterface $accountService;
     private AccountForm                                      $accountForm;
 
     public function __construct(
         Application $application,
         WebControllerHelper $webControllerHelper,
-        \SP\Domain\Account\Ports\AccountServiceInterface $accountService,
-        \SP\Domain\Account\Ports\AccountPresetServiceInterface $accountPresetService
+        AccountServiceInterface $accountService,
+        AccountPresetServiceInterface $accountPresetService
     ) {
         parent::__construct(
             $application,
@@ -68,7 +71,7 @@ final class SaveEditPassController extends AccountControllerBase
      * @param  int  $id  Account's ID
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditPassAction(int $id): bool
     {

app/modules/web/Controllers/Account/SaveEditRestoreController.php

@@ -26,12 +26,13 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
@@ -43,7 +44,7 @@ final class SaveEditRestoreController extends AccountControllerBase
 {
     use JsonTrait;
 
-    private \SP\Domain\Account\Ports\AccountServiceInterface $accountService;
+    private AccountServiceInterface $accountService;
 
     public function __construct(
         Application $application,
@@ -65,7 +66,7 @@ final class SaveEditRestoreController extends AccountControllerBase
      * @param  int  $id  Account's ID
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditRestoreAction(int $historyId, int $id): bool
     {

app/modules/web/Controllers/Account/SaveRequestController.php

@@ -26,14 +26,15 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\User\Ports\UserServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Http\Uri;
@@ -46,16 +47,17 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SaveRequestController extends AccountControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountServiceInterface $accountService;
     private UserServiceInterface                       $userService;
 
     public function __construct(
-        Application $application,
-        WebControllerHelper $webControllerHelper,
-        \SP\Domain\Account\Ports\AccountServiceInterface $accountService,
-        UserServiceInterface $userService
+        Application             $application,
+        WebControllerHelper     $webControllerHelper,
+        AccountServiceInterface $accountService,
+        UserServiceInterface    $userService
     ) {
         parent::__construct(
             $application,
@@ -72,7 +74,7 @@ final class SaveRequestController extends AccountControllerBase
      * @param  int  $id  Account's ID
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveRequestAction(int $id): bool
     {

app/modules/web/Controllers/Account/ViewController.php

@@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\Account;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/Account/ViewHistoryController.php

@@ -25,9 +25,10 @@
 namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
+use SP\Domain\Account\Ports\AccountHistoryServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\Helpers\Account\AccountHistoryHelper;
 use SP\Mvc\Controller\WebControllerHelper;
 use SP\Util\ErrorUtil;
@@ -37,13 +38,13 @@ use SP\Util\ErrorUtil;
  */
 final class ViewHistoryController extends AccountControllerBase
 {
-    private \SP\Domain\Account\Ports\AccountHistoryServiceInterface $accountHistoryService;
+    private AccountHistoryServiceInterface $accountHistoryService;
     private AccountHistoryHelper                                    $accountHistoryHelper;
 
     public function __construct(
         Application $application,
         WebControllerHelper $webControllerHelper,
-        \SP\Domain\Account\Ports\AccountHistoryServiceInterface $accountHistoryService,
+        AccountHistoryServiceInterface $accountHistoryService,
         AccountHistoryHelper $accountHistoryHelper
     ) {
         parent::__construct(

app/modules/web/Controllers/Account/ViewLinkController.php

@@ -27,11 +27,9 @@ namespace SP\Modules\Web\Controllers\Account;
 
 use Exception;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Crypt\Vault;
-use SP\Core\Crypt\VaultInterface;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\UI\ThemeIcons;
@@ -39,6 +37,8 @@ use SP\DataModel\AccountExtData;
 use SP\Domain\Account\Ports\AccountServiceInterface;
 use SP\Domain\Account\Ports\PublicLinkServiceInterface;
 use SP\Domain\Account\Services\PublicLinkService;
+use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Core\Crypt\VaultInterface;
 use SP\Http\Uri;
 use SP\Mvc\Controller\WebControllerHelper;
 use SP\Util\ErrorUtil;

app/modules/web/Controllers/AccountFile/ListController.php

@@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\AccountFile;
 
 use Exception;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Util\ErrorUtil;
 
 /**

app/modules/web/Controllers/AccountFile/SearchController.php

@@ -24,9 +24,12 @@
 
 namespace SP\Modules\Web\Controllers\AccountFile;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
+use SP\Core\Exceptions\ConstraintException;
+use SP\Core\Exceptions\QueryException;
 use SP\Domain\Account\Ports\AccountFileServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -42,7 +45,8 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountFileServiceInterface $accountFileService;
     private FileGrid                    $fileGrid;
@@ -65,9 +69,9 @@ final class SearchController extends ControllerBase
      * Search action
      *
      * @return bool
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\ConstraintException
-     * @throws \SP\Core\Exceptions\QueryException
+     * @throws JsonException
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function searchAction(): bool
     {
@@ -88,9 +92,9 @@ final class SearchController extends ControllerBase
     /**
      * getSearchGrid
      *
-     * @return \SP\Html\DataGrid\DataGridInterface
-     * @throws \SP\Core\Exceptions\ConstraintException
-     * @throws \SP\Core\Exceptions\QueryException
+     * @return DataGridInterface
+     * @throws ConstraintException
+     * @throws QueryException
      */
     protected function getSearchGrid(): DataGridInterface
     {

app/modules/web/Controllers/AccountHistoryManager/SearchController.php

@@ -24,11 +24,12 @@
 
 namespace SP\Modules\Web\Controllers\AccountHistoryManager;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Domain\Account\Ports\AccountHistoryServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -45,7 +46,8 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountHistoryServiceInterface $accountHistoryService;
     private AccountHistoryGrid             $accountHistoryGrid;
@@ -67,9 +69,9 @@ final class SearchController extends ControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\ConstraintException
-     * @throws \SP\Core\Exceptions\QueryException
+     * @throws JsonException
+     * @throws ConstraintException
+     * @throws QueryException
      */
     public function searchAction(): bool
     {

app/modules/web/Controllers/AccountManager/BulkEditController.php

@@ -25,8 +25,8 @@
 namespace SP\Modules\Web\Controllers\AccountManager;
 
 use Exception;
+use JsonException;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Domain\Account\Ports\AccountHistoryServiceInterface;
@@ -34,6 +34,7 @@ use SP\Domain\Account\Ports\AccountSearchServiceInterface;
 use SP\Domain\Account\Ports\AccountServiceInterface;
 use SP\Domain\Category\Ports\CategoryServiceInterface;
 use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Domain\Tag\Ports\TagServiceInterface;
 use SP\Domain\User\Ports\UserGroupServiceInterface;
@@ -53,7 +54,8 @@ use SP\Mvc\View\Components\SelectItemAdapter;
  */
 final class BulkEditController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountServiceInterface        $accountService;
     private AccountSearchServiceInterface  $accountSearchService;
@@ -90,7 +92,7 @@ final class BulkEditController extends ControllerBase
      * bulkEditAction
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function bulkEditAction(): bool
     {

app/modules/web/Controllers/AccountManager/DeleteController.php

@@ -25,11 +25,12 @@
 namespace SP\Modules\Web\Controllers\AccountManager;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -44,7 +45,8 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class DeleteController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountServiceInterface     $accountService;
     private CustomFieldServiceInterface $customFieldService;
@@ -69,7 +71,7 @@ final class DeleteController extends ControllerBase
      * @param  int|null  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function deleteAction(?int $id = null): bool
     {

app/modules/web/Controllers/AccountManager/SaveBulkEditController.php

@@ -25,14 +25,15 @@
 namespace SP\Modules\Web\Controllers\AccountManager;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SPException;
 use SP\Domain\Account\Dtos\AccountUpdateBulkDto;
 use SP\Domain\Account\Ports\AccountHistoryServiceInterface;
 use SP\Domain\Account\Ports\AccountPresetServiceInterface;
 use SP\Domain\Account\Ports\AccountServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -40,6 +41,7 @@ use SP\Modules\Web\Forms\AccountForm;
 use SP\Mvc\Controller\ItemTrait;
 use SP\Mvc\Controller\WebControllerHelper;
 use SP\Util\Util;
+
 use function SP\processException;
 
 /**
@@ -49,7 +51,8 @@ use function SP\processException;
  */
 final class SaveBulkEditController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountServiceInterface        $accountService;
     private AccountHistoryServiceInterface $accountHistoryService;
@@ -75,7 +78,7 @@ final class SaveBulkEditController extends ControllerBase
      * saveBulkEditAction
      *
      * @return bool
-     * @throws \SP\Core\Exceptions\SPException
+     * @throws SPException
      */
     public function saveBulkEditAction(): bool
     {

app/modules/web/Controllers/AccountManager/SearchController.php

@@ -24,11 +24,16 @@
 
 namespace SP\Modules\Web\Controllers\AccountManager;
 
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
+use SP\Core\Exceptions\ConstraintException;
+use SP\Core\Exceptions\QueryException;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
 use SP\Domain\Account\Ports\AccountSearchServiceInterface;
 use SP\Domain\Account\Ports\AccountServiceInterface;
 use SP\Domain\Account\Search\AccountSearchFilter;
+use SP\Domain\Auth\Services\AuthException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -45,15 +50,16 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AccountServiceInterface       $accountService;
     private AccountSearchServiceInterface $accountSearchService;
     private AccountGrid                   $accountGrid;
 
     /**
-     * @throws \SP\Core\Exceptions\SessionTimeout
-     * @throws \SP\Domain\Auth\Services\AuthException
+     * @throws SessionTimeout
+     * @throws AuthException
      */
     public function __construct(
         Application $application,
@@ -71,9 +77,9 @@ final class SearchController extends ControllerBase
 
     /**
      * @return bool
-     * @throws \SP\Core\Exceptions\ConstraintException
-     * @throws \SP\Core\Exceptions\QueryException
-     * @throws \SP\Core\Exceptions\SPException
+     * @throws ConstraintException
+     * @throws QueryException
+     * @throws SPException
      */
     public function searchAction(): bool
     {
@@ -94,10 +100,10 @@ final class SearchController extends ControllerBase
     /**
      * getSearchGrid
      *
-     * @return \SP\Html\DataGrid\DataGridInterface
-     * @throws \SP\Core\Exceptions\ConstraintException
-     * @throws \SP\Core\Exceptions\QueryException
-     * @throws \SP\Core\Exceptions\SPException
+     * @return DataGridInterface
+     * @throws ConstraintException
+     * @throws QueryException
+     * @throws SPException
      */
     protected function getSearchGrid(): DataGridInterface
     {

app/modules/web/Controllers/AuthToken/AuthTokenViewBase.php

@@ -26,7 +26,6 @@ namespace SP\Modules\Web\Controllers\AuthToken;
 
 
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -34,6 +33,8 @@ use SP\Core\Exceptions\SPException;
 use SP\DataModel\AuthTokenData;
 use SP\Domain\Auth\Ports\AuthTokenServiceInterface;
 use SP\Domain\Auth\Services\AuthTokenService;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Domain\User\Ports\UserServiceInterface;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -47,7 +48,8 @@ use SP\Mvc\View\Components\SelectItemAdapter;
  */
 abstract class AuthTokenViewBase extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AuthTokenServiceInterface   $authTokenService;
     private CustomFieldServiceInterface $customFieldService;
@@ -75,7 +77,7 @@ abstract class AuthTokenViewBase extends ControllerBase
      * @throws ConstraintException
      * @throws QueryException
      * @throws SPException
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @throws ServiceException
      */
     protected function setViewData(?int $authTokenId = null): void
     {

app/modules/web/Controllers/AuthToken/CreateController.php

@@ -25,8 +25,9 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -38,7 +39,7 @@ final class CreateController extends AuthTokenViewBase
 {
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function createAction(): bool
     {

app/modules/web/Controllers/AuthToken/DeleteController.php

@@ -25,9 +25,10 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -43,7 +44,7 @@ final class DeleteController extends AuthTokenSaveBase
      * @param  int|null  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function deleteAction(?int $id = null): bool
     {

app/modules/web/Controllers/AuthToken/EditController.php

@@ -25,8 +25,9 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -42,7 +43,7 @@ final class EditController extends AuthTokenViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function editAction(int $id): bool
     {

app/modules/web/Controllers/AuthToken/SaveCreateController.php

@@ -25,9 +25,10 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -39,7 +40,7 @@ final class SaveCreateController extends AuthTokenSaveBase
 {
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveCreateAction(): bool
     {

app/modules/web/Controllers/AuthToken/SaveEditController.php

@@ -25,10 +25,11 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -44,7 +45,7 @@ final class SaveEditController extends AuthTokenSaveBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditAction(int $id): bool
     {

app/modules/web/Controllers/AuthToken/SearchController.php

@@ -24,12 +24,13 @@
 
 namespace SP\Modules\Web\Controllers\AuthToken;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\Domain\Auth\Ports\AuthTokenServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -45,7 +46,8 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private AuthTokenServiceInterface $authTokenService;
     private AuthTokenGrid             $authTokenGrid;
@@ -71,7 +73,7 @@ final class SearchController extends ControllerBase
      * @throws ConstraintException
      * @throws QueryException
      * @throws SPException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function searchAction(): bool
     {

app/modules/web/Controllers/AuthToken/ViewController.php

@@ -25,9 +25,10 @@
 namespace SP\Modules\Web\Controllers\AuthToken;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -43,7 +44,7 @@ final class ViewController extends AuthTokenViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function viewAction(int $id): bool
     {

app/modules/web/Controllers/Bootstrap/GetEnvironmentController.php

@@ -25,10 +25,11 @@
 namespace SP\Modules\Web\Controllers\Bootstrap;
 
 use Exception;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapBase;
 use SP\Core\Crypt\CryptPKI;
-use SP\Core\Crypt\CryptPKIInterface;
+use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Import\Services\ImportService;
 use SP\Infrastructure\File\FileException;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -68,7 +69,7 @@ final class GetEnvironmentController extends SimpleControllerBase
      * Returns environment data
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function getEnvironmentAction(): bool
     {

app/modules/web/Controllers/Category/CategoryViewBase.php

@@ -25,7 +25,6 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
@@ -33,6 +32,7 @@ use SP\Core\Exceptions\SPException;
 use SP\DataModel\CategoryData;
 use SP\Domain\Category\Ports\CategoryServiceInterface;
 use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -50,9 +50,9 @@ abstract class CategoryViewBase extends ControllerBase
     private CustomFieldServiceInterface $customFieldService;
 
     public function __construct(
-        Application $application,
-        WebControllerHelper $webControllerHelper,
-        \SP\Domain\Category\Ports\CategoryServiceInterface $categoryService,
+        Application                 $application,
+        WebControllerHelper         $webControllerHelper,
+        CategoryServiceInterface    $categoryService,
         CustomFieldServiceInterface $customFieldService
     ) {
         parent::__construct($application, $webControllerHelper);

app/modules/web/Controllers/Category/CreateController.php

@@ -25,8 +25,9 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -39,7 +40,7 @@ final class CreateController extends CategoryViewBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function createAction(): bool
     {

app/modules/web/Controllers/Category/DeleteController.php

@@ -26,9 +26,10 @@ namespace SP\Modules\Web\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -42,7 +43,7 @@ final class DeleteController extends CategorySaveBase
      * @param  int|null  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function deleteAction(?int $id = null): bool
     {

app/modules/web/Controllers/Category/EditController.php

@@ -26,8 +26,9 @@ namespace SP\Modules\Web\Controllers\Category;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -44,7 +45,7 @@ final class EditController extends CategoryViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function editAction(int $id): bool
     {

app/modules/web/Controllers/Category/SaveCreateAction.php

@@ -25,10 +25,11 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -38,7 +39,7 @@ final class SaveCreateAction extends CategorySaveBase
 {
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveCreateAction(): bool
     {

app/modules/web/Controllers/Category/SaveEditController.php

@@ -25,10 +25,11 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 
 /**
@@ -42,7 +43,7 @@ final class SaveEditController extends CategorySaveBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditAction(int $id): bool
     {

app/modules/web/Controllers/Category/SearchController.php

@@ -25,12 +25,13 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\Domain\Category\Ports\CategoryServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -44,7 +45,8 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     private CategoryServiceInterface $categoryService;
     private CategoryGrid             $categoryGrid;
@@ -70,7 +72,7 @@ final class SearchController extends ControllerBase
      * @throws ConstraintException
      * @throws QueryException
      * @throws SPException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function searchAction(): bool
     {

app/modules/web/Controllers/Category/ViewController.php

@@ -25,8 +25,9 @@
 namespace SP\Modules\Web\Controllers\Category;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -43,7 +44,7 @@ final class ViewController extends CategoryViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function viewAction(int $id): bool
     {

app/modules/web/Controllers/Client/ClientViewBase.php

@@ -26,13 +26,14 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
 use SP\DataModel\ClientData;
 use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Common\Services\ServiceException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Infrastructure\Common\Repositories\NoSuchItemException;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -46,8 +47,8 @@ abstract class ClientViewBase extends ControllerBase
 {
     use ItemTrait;
 
-    private \SP\Domain\Client\Ports\ClientServiceInterface $clientService;
-    private CustomFieldServiceInterface                    $customFieldService;
+    private ClientServiceInterface      $clientService;
+    private CustomFieldServiceInterface $customFieldService;
 
     public function __construct(
         Application $application,
@@ -72,7 +73,7 @@ abstract class ClientViewBase extends ControllerBase
      * @throws NoSuchItemException
      * @throws QueryException
      * @throws SPException
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @throws ServiceException
      */
     protected function setViewData(?int $clientId = null): void
     {

app/modules/web/Controllers/Client/CreateController.php

@@ -26,8 +26,9 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -40,7 +41,7 @@ final class CreateController extends ClientViewBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function createAction(): bool
     {

app/modules/web/Controllers/Client/DeleteController.php

@@ -26,9 +26,10 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
@@ -38,7 +39,8 @@ use SP\Mvc\Controller\ItemTrait;
  */
 final class DeleteController extends ClientSaveBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     /**
      * Delete action
@@ -46,7 +48,7 @@ final class DeleteController extends ClientSaveBase
      * @param  int|null  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function deleteAction(?int $id = null): bool
     {

app/modules/web/Controllers/Client/EditController.php

@@ -26,8 +26,9 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -44,7 +45,7 @@ final class EditController extends ClientViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function editAction(int $id): bool
     {

app/modules/web/Controllers/Client/SaveCreateController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
@@ -39,11 +40,12 @@ use SP\Mvc\Controller\ItemTrait;
  */
 final class SaveCreateController extends ClientSaveBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveCreateAction(): bool
     {

app/modules/web/Controllers/Client/SaveEditController.php

@@ -26,10 +26,11 @@ namespace SP\Modules\Web\Controllers\Client;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\ItemTrait;
@@ -39,7 +40,8 @@ use SP\Mvc\Controller\ItemTrait;
  */
 final class SaveEditController extends ClientSaveBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
     /**
      * Saves edit action
@@ -47,7 +49,7 @@ final class SaveEditController extends ClientSaveBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveEditAction(int $id): bool
     {

app/modules/web/Controllers/Client/SearchController.php

@@ -25,11 +25,13 @@
 namespace SP\Modules\Web\Controllers\Client;
 
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Application;
 use SP\Core\Exceptions\ConstraintException;
 use SP\Core\Exceptions\QueryException;
 use SP\Core\Exceptions\SPException;
+use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Html\DataGrid\DataGridInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\ControllerBase;
@@ -43,15 +45,16 @@ use SP\Mvc\Controller\WebControllerHelper;
  */
 final class SearchController extends ControllerBase
 {
-    use JsonTrait, ItemTrait;
+    use ItemTrait;
+    use JsonTrait;
 
-    private \SP\Domain\Client\Ports\ClientServiceInterface $clientService;
+    private ClientServiceInterface $clientService;
     private ClientGrid                                     $clientGrid;
 
     public function __construct(
         Application $application,
         WebControllerHelper $webControllerHelper,
-        \SP\Domain\Client\Ports\ClientServiceInterface $clientService,
+        ClientServiceInterface $clientService,
         ClientGrid $clientGrid
     ) {
         parent::__construct($application, $webControllerHelper);
@@ -69,7 +72,7 @@ final class SearchController extends ControllerBase
      * @throws ConstraintException
      * @throws QueryException
      * @throws SPException
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function searchAction(): bool
     {

app/modules/web/Controllers/Client/ViewController.php

@@ -25,8 +25,9 @@
 namespace SP\Modules\Web\Controllers\Client;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Events\Event;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 
@@ -45,7 +46,7 @@ final class ViewController extends ClientViewBase
      * @param  int  $id
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function viewAction(int $id): bool
     {

app/modules/web/Controllers/ConfigAccount/SaveController.php

@@ -24,12 +24,14 @@
 
 namespace SP\Modules\Web\Controllers\ConfigAccount;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\ValidationException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 
@@ -46,7 +48,7 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveAction(): bool
     {
@@ -74,7 +76,7 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
+     * @param ConfigDataInterface $configData
      *
      * @return void
      */
@@ -91,11 +93,11 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
-     * @param  \SP\Core\Events\EventMessage  $eventMessage
+     * @param ConfigDataInterface $configData
+     * @param EventMessage $eventMessage
      *
      * @return void
-     * @throws \SP\Core\Exceptions\ValidationException
+     * @throws ValidationException
      */
     private function handleFilesConfig(ConfigDataInterface $configData, EventMessage $eventMessage): void
     {
@@ -123,8 +125,8 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
-     * @param  \SP\Core\Events\EventMessage  $eventMessage
+     * @param ConfigDataInterface $configData
+     * @param EventMessage $eventMessage
      *
      * @return void
      */
@@ -150,8 +152,8 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigBackup/DownloadBackupAppController.php

@@ -26,11 +26,13 @@ namespace SP\Modules\Web\Controllers\ConfigBackup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Services\BackupFiles;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -98,8 +100,8 @@ final class DownloadBackupAppController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws \SP\Core\Exceptions\SPException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws SPException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigBackup/DownloadBackupDbController.php

@@ -25,12 +25,13 @@
 namespace SP\Modules\Web\Controllers\ConfigBackup;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Services\BackupFiles;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -100,8 +101,8 @@ final class DownloadBackupDbController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws \SP\Core\Exceptions\SPException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws SPException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigBackup/DownloadExportController.php

@@ -26,12 +26,13 @@ namespace SP\Modules\Web\Controllers\ConfigBackup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Services\XmlExportService;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -98,8 +99,8 @@ final class DownloadExportController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws \SP\Core\Exceptions\SPException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws SPException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigBackup/FileBackupController.php

@@ -26,12 +26,14 @@ namespace SP\Modules\Web\Controllers\ConfigBackup;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Ports\FileBackupServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -59,7 +61,7 @@ final class FileBackupController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \SP\Core\Exceptions\SPException
+     * @throws SPException
      */
     public function fileBackupAction(): bool
     {
@@ -95,8 +97,8 @@ final class FileBackupController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws \SP\Core\Exceptions\SPException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws SPException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigBackup/XmlExportController.php

@@ -25,12 +25,14 @@
 namespace SP\Modules\Web\Controllers\ConfigBackup;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Core\Exceptions\SPException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Export\Ports\XmlExportServiceInterface;
 use SP\Domain\Export\Ports\XmlVerifyServiceInterface;
 use SP\Http\JsonResponse;
@@ -62,7 +64,7 @@ final class XmlExportController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \SP\Core\Exceptions\SPException
+     * @throws SPException
      */
     public function xmlExportAction(): bool
     {
@@ -131,8 +133,8 @@ final class XmlExportController extends SimpleControllerBase
     /**
      * initialize
      *
-     * @throws \SP\Core\Exceptions\SPException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws SPException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigEncryption/RefreshController.php

@@ -26,13 +26,15 @@ namespace SP\Modules\Web\Controllers\ConfigEncryption;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Crypt\Hash;
 use SP\Core\Crypt\Session as CryptSession;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Crypt\Ports\MasterPassServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -62,7 +64,7 @@ final class RefreshController extends SimpleControllerBase
      * Refresh master password hash
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function refreshAction(): bool
     {
@@ -93,8 +95,8 @@ final class RefreshController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigEncryption/SaveController.php

@@ -26,12 +26,15 @@ namespace SP\Modules\Web\Controllers\ConfigEncryption;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Crypt\Hash;
 use SP\Core\Events\Event;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Config\Ports\ConfigServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Crypt\Ports\MasterPassServiceInterface;
 use SP\Domain\Crypt\Services\MasterPassService;
 use SP\Domain\Crypt\Services\UpdateMasterPassRequest;
@@ -39,6 +42,8 @@ use SP\Domain\Task\Ports\TaskInterface;
 use SP\Domain\Task\Services\Task;
 use SP\Domain\Task\Services\TaskFactory;
 use SP\Http\JsonResponse;
+use SP\Infrastructure\Common\Repositories\NoSuchItemException;
+use SP\Infrastructure\File\FileException;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
@@ -67,9 +72,9 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
-     * @throws \SP\Infrastructure\Common\Repositories\NoSuchItemException
-     * @throws \SP\Domain\Common\Services\ServiceException
+     * @throws JsonException
+     * @throws NoSuchItemException
+     * @throws ServiceException
      */
     public function saveAction(): bool
     {
@@ -190,7 +195,7 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @throws \SP\Infrastructure\File\FileException
+     * @throws FileException
      */
     private function getTask(): ?TaskInterface
     {
@@ -203,8 +208,8 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigEncryption/SaveTempController.php

@@ -25,10 +25,12 @@
 namespace SP\Modules\Web\Controllers\ConfigEncryption;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -60,7 +62,7 @@ final class SaveTempController extends SimpleControllerBase
      * Create a temporary master pass
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveTempAction(): bool
     {
@@ -112,8 +114,8 @@ final class SaveTempController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php

@@ -25,14 +25,16 @@
 namespace SP\Modules\Web\Controllers\ConfigGeneral;
 
 use Exception;
+use JsonException;
 use RuntimeException;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Domain\Config\Ports\ConfigBackupServiceInterface;
 use SP\Domain\Config\Services\ConfigBackupService;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\SimpleControllerHelper;
@@ -102,8 +104,8 @@ final class DownloadConfigBackup extends SimpleControllerBase
     }
 
     /**
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigGeneral/DownloadLogController.php

@@ -26,11 +26,13 @@ namespace SP\Modules\Web\Controllers\ConfigGeneral;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Infrastructure\File\FileHandler;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -85,8 +87,8 @@ final class DownloadLogController extends SimpleControllerBase
     }
 
     /**
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigGeneral/SaveController.php

@@ -24,14 +24,16 @@
 
 namespace SP\Modules\Web\Controllers\ConfigGeneral;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Exceptions\ValidationException;
 use SP\Domain\Config\Ports\ConfigDataInterface;
 use SP\Domain\Config\Services\ConfigUtil;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
 use SP\Util\Util;
@@ -46,7 +48,7 @@ final class SaveController extends SimpleControllerBase
     use ConfigTrait;
 
     /**
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveAction(): bool
     {
@@ -76,7 +78,7 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
+     * @param ConfigDataInterface $configData
      *
      * @return void
      */
@@ -106,11 +108,11 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
-     * @param  \SP\Core\Events\EventMessage  $eventMessage
+     * @param ConfigDataInterface $configData
+     * @param EventMessage $eventMessage
      *
      * @return void
-     * @throws \SP\Core\Exceptions\ValidationException
+     * @throws ValidationException
      */
     private function handleEventsConfig(ConfigDataInterface $configData, EventMessage $eventMessage): void
     {
@@ -151,11 +153,11 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
-     * @param  \SP\Core\Events\EventMessage  $eventMessage
+     * @param ConfigDataInterface $configData
+     * @param EventMessage $eventMessage
      *
      * @return void
-     * @throws \SP\Core\Exceptions\ValidationException
+     * @throws ValidationException
      */
     private function handleProxyConfig(ConfigDataInterface $configData, EventMessage $eventMessage): void
     {
@@ -190,8 +192,8 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @param  \SP\Domain\Config\Ports\ConfigDataInterface  $configData
-     * @param  \SP\Core\Events\EventMessage  $eventMessage
+     * @param ConfigDataInterface $configData
+     * @param EventMessage $eventMessage
      *
      * @return void
      */
@@ -222,8 +224,8 @@ final class SaveController extends SimpleControllerBase
     }
 
     /**
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigImport/ImportController.php

@@ -25,12 +25,14 @@
 namespace SP\Modules\Web\Controllers\ConfigImport;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Context\SessionContext;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Import\Ports\ImportServiceInterface;
 use SP\Domain\Import\Services\FileImport;
 use SP\Domain\Import\Services\ImportParams;
@@ -61,7 +63,7 @@ final class ImportController extends SimpleControllerBase
     }
 
     /**
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function importAction(): bool
     {
@@ -110,7 +112,7 @@ final class ImportController extends SimpleControllerBase
     }
 
     /**
-     * @return \SP\Domain\Import\Services\ImportParams
+     * @return ImportParams
      */
     private function getImportParams(): ImportParams
     {
@@ -130,8 +132,8 @@ final class ImportController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigLdap/CheckController.php

@@ -27,7 +27,6 @@ namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 use Exception;
 use JsonException;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
@@ -35,6 +34,7 @@ use SP\Core\Exceptions\CheckException;
 use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Domain\Auth\Ports\LdapCheckServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;

app/modules/web/Controllers/ConfigLdap/CheckImportController.php

@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
@@ -34,6 +34,7 @@ use SP\Core\Exceptions\CheckException;
 use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Domain\Auth\Ports\LdapCheckServiceInterface;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -63,7 +64,7 @@ final class CheckImportController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      * @throws SPException
      */
     public function checkImportAction(): bool

app/modules/web/Controllers/ConfigLdap/ImportController.php

@@ -26,17 +26,19 @@ namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 
 use Exception;
+use JsonException;
 use Klein\Klein;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\CheckException;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Exceptions\ValidationException;
 use SP\Core\PhpExtensionChecker;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Import\Ports\LdapImportServiceInterface;
 use SP\Domain\Import\Services\LdapImportParams;
@@ -50,7 +52,8 @@ use SP\Modules\Web\Controllers\Traits\JsonTrait;
  */
 final class ImportController extends SimpleControllerBase
 {
-    use JsonTrait, ConfigLdapTrait;
+    use ConfigLdapTrait;
+    use JsonTrait;
 
     private LdapImportServiceInterface $ldapImportService;
 
@@ -72,7 +75,7 @@ final class ImportController extends SimpleControllerBase
      * importAction
      *
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function importAction(): bool
     {
@@ -129,7 +132,7 @@ final class ImportController extends SimpleControllerBase
 
     /**
      * @return array
-     * @throws \SP\Core\Exceptions\ValidationException
+     * @throws ValidationException
      */
     private function getImportParams(): array
     {
@@ -158,8 +161,8 @@ final class ImportController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigLdap/SaveController.php

@@ -25,13 +25,15 @@
 namespace SP\Modules\Web\Controllers\ConfigLdap;
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
 use SP\Core\Exceptions\CheckException;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Exceptions\ValidationException;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
@@ -43,11 +45,12 @@ use SP\Modules\Web\Controllers\Traits\ConfigTrait;
  */
 final class SaveController extends SimpleControllerBase
 {
-    use ConfigTrait, ConfigLdapTrait;
+    use ConfigLdapTrait;
+    use ConfigTrait;
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveAction(): bool
     {
@@ -117,8 +120,8 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigMail/CheckController.php

@@ -26,14 +26,16 @@ namespace SP\Modules\Web\Controllers\ConfigMail;
 
 
 use Exception;
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Core\Exceptions\SPException;
 use SP\Core\Exceptions\ValidationException;
 use SP\Domain\Config\Services\ConfigUtil;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Notification\Ports\MailServiceInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
@@ -62,7 +64,7 @@ final class CheckController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function checkAction(): bool
     {
@@ -103,7 +105,7 @@ final class CheckController extends SimpleControllerBase
     }
 
     /**
-     * @return \SP\Providers\Mail\MailParams
+     * @return MailParams
      */
     private function handleMailConfig(): MailParams
     {
@@ -125,8 +127,8 @@ final class CheckController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigMail/SaveController.php

@@ -24,11 +24,13 @@
 
 namespace SP\Modules\Web\Controllers\ConfigMail;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
 use SP\Domain\Config\Services\ConfigUtil;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
@@ -44,7 +46,7 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveAction(): bool
     {
@@ -113,8 +115,8 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {

app/modules/web/Controllers/ConfigManager/IndexController.php

@@ -29,7 +29,6 @@ use DI\NotFoundException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use SP\Core\Acl\Acl;
-use SP\Core\Acl\AclActionsInterface;
 use SP\Core\Application;
 use SP\Core\Crypt\CryptSessionHandler;
 use SP\Core\Events\Event;
@@ -41,6 +40,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\Acl\AclActionsInterface;
 use SP\Domain\Core\AppInfoInterface;
 use SP\Domain\Core\File\MimeType;
 use SP\Domain\Core\File\MimeTypesInterface;

app/modules/web/Controllers/ConfigWiki/SaveController.php

@@ -24,10 +24,12 @@
 
 namespace SP\Modules\Web\Controllers\ConfigWiki;
 
-use SP\Core\Acl\AclActionsInterface;
+use JsonException;
 use SP\Core\Acl\UnauthorizedPageException;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
+use SP\Core\Exceptions\SessionTimeout;
+use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Http\JsonResponse;
 use SP\Modules\Web\Controllers\SimpleControllerBase;
 use SP\Modules\Web\Controllers\Traits\ConfigTrait;
@@ -43,7 +45,7 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return bool
-     * @throws \JsonException
+     * @throws JsonException
      */
     public function saveAction(): bool
     {
@@ -87,8 +89,8 @@ final class SaveController extends SimpleControllerBase
 
     /**
      * @return void
-     * @throws \JsonException
-     * @throws \SP\Core\Exceptions\SessionTimeout
+     * @throws JsonException
+     * @throws SessionTimeout
      */
     protected function initialize(): void
     {