chore: Relocate classes

Signed-off-by: Rubén D <nuxsmin@syspass.org>
2026-03-06 08:34:16 +01:00 · 2024-04-21 21:09:32 +02:00
parent 5e1f4be413
commit cda692d4de
285 changed files with 1037 additions and 1550 deletions
--- a/app/modules/web/Controllers/AccessManager/IndexController.php
+++ b/app/modules/web/Controllers/AccessManager/IndexController.php
@@ -27,10 +27,10 @@ namespace SP\Modules\Web\Controllers\AccessManager;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Events\Event;
-use SP\DataModel\ItemSearchData;
 use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Auth\Ports\AuthTokenService;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\User\Ports\UserGroupService;
@@ -53,8 +53,8 @@ use SP\Mvc\Controller\WebControllerHelper;
 */
 final class IndexController extends ControllerBase
 {
-    protected ItemSearchData            $itemSearchData;
-    protected TabsGridHelper            $tabsGridHelper;
+    protected ItemSearchDto  $itemSearchData;
+    protected TabsGridHelper $tabsGridHelper;
    private UserGrid                    $userGrid;
    private UserGroupGrid               $userGroupGrid;
    private UserProfileGrid             $userProfileGrid;
@@ -96,7 +96,7 @@ final class IndexController extends ControllerBase
        $this->authTokenService = $authTokenService;
        $this->publicLinkService = $publicLinkService;
        $this->tabsGridHelper = $tabsGridHelper;
-        $this->itemSearchData = new ItemSearchData();
+        $this->itemSearchData = new ItemSearchDto();
    }

    /**
--- a/app/modules/web/Controllers/AccountFile/UploadController.php
+++ b/app/modules/web/Controllers/AccountFile/UploadController.php
@@ -29,13 +29,13 @@ use JsonException;
 use SP\Core\Application;
 use SP\Core\Events\Event;
 use SP\Core\Events\EventMessage;
-use SP\DataModel\File;
+use SP\Domain\Account\Models\File;
 use SP\Domain\Account\Ports\AccountFileService;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Core\Exceptions\SPException;
+use SP\Domain\File\Ports\FileHandlerInterface;
 use SP\Infrastructure\File\FileException;
 use SP\Infrastructure\File\FileHandler;
-use SP\Infrastructure\File\FileHandlerInterface;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
 use SP\Mvc\Controller\WebControllerHelper;
@@ -161,7 +161,7 @@ final class UploadController extends ControllerBase
    }

    /**
-     * @param File $fileData
+     * @param \SP\Domain\Account\Models\File $fileData
     * @param FileHandlerInterface $fileHandler
     *
     * @return string
--- a/app/modules/web/Controllers/Helpers/Grid/GridBase.php
+++ b/app/modules/web/Controllers/Helpers/Grid/GridBase.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -27,8 +27,8 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\UI\ThemeIcons;
-use SP\DataModel\ItemSearchData;
 use SP\Domain\Core\Acl\AclInterface;
+use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Http\RequestInterface;
 use SP\Html\DataGrid\Action\DataGridActionSearch;
 use SP\Html\DataGrid\DataGridData;
@@ -67,13 +67,13 @@ abstract class GridBase extends HelperBase implements GridInterface
     * Actualizar los datos del paginador
     *
     * @param DataGridInterface $dataGrid
-     * @param ItemSearchData $itemSearchData
+     * @param ItemSearchDto $itemSearchData
     *
     * @return DataGridInterface
     */
    public function updatePager(
        DataGridInterface $dataGrid,
-        ItemSearchData $itemSearchData
+        ItemSearchDto $itemSearchData
    ): DataGridInterface {
        $dataGrid->getPager()
                 ->setLimitStart($itemSearchData->getLimitStart())
--- a/app/modules/web/Controllers/Helpers/LayoutHelper.php
+++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -35,7 +35,7 @@ use SP\Domain\Core\Crypt\CryptPKIInterface;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Core\UI\ThemeInterface;
 use SP\Domain\Http\RequestInterface;
-use SP\Domain\Install\Services\InstallerService;
+use SP\Domain\Install\Services\Installer;
 use SP\Html\DataGrid\Action\DataGridAction;
 use SP\Http\Uri;
 use SP\Mvc\View\TemplateInterface;
@@ -122,7 +122,7 @@ final class LayoutHelper extends HelperBase
        $this->view->assign('app_desc', AppInfoInterface::APP_DESC);
        $this->view->assign('app_website_url', AppInfoInterface::APP_WEBSITE_URL);
        $this->view->assign('app_blog_url', AppInfoInterface::APP_BLOG_URL);
-        $this->view->assign('app_version', InstallerService::VERSION_TEXT);
+        $this->view->assign('app_version', Installer::VERSION_TEXT);
        $this->view->assign('logo_icon', $baseUrl . '/public/images/logo_icon.png');
        $this->view->assign('logo_no_bg_color', $baseUrl . '/public/images/logo_full_nobg_outline_color.png');
        $this->view->assign('logo_no_bg', $baseUrl . '/public/images/logo_full_nobg_outline.png');
--- a/app/modules/web/Controllers/Install/InstallController.php
+++ b/app/modules/web/Controllers/Install/InstallController.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -29,7 +29,7 @@ use Exception;
 use SP\Core\Application;
 use SP\Domain\Core\Exceptions\SPException;
 use SP\Domain\Install\Adapters\InstallDataFactory;
-use SP\Domain\Install\Ports\InstallerServiceInterface;
+use SP\Domain\Install\Ports\InstallerService;
 use SP\Http\JsonMessage;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -42,12 +42,12 @@ final class InstallController extends ControllerBase
 {
    use JsonTrait;

-    private InstallerServiceInterface $installer;
+    private InstallerService $installer;

    public function __construct(
        Application $application,
        WebControllerHelper $webControllerHelper,
-        InstallerServiceInterface $installer
+        InstallerService $installer
    ) {
        parent::__construct($application, $webControllerHelper);

--- a/app/modules/web/Controllers/ItemManager/IndexController.php
+++ b/app/modules/web/Controllers/ItemManager/IndexController.php
@@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\ItemManager;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Events\Event;
-use SP\DataModel\ItemSearchData;
 use SP\Domain\Account\Ports\AccountFileService;
 use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Category\Ports\CategoryService;
 use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\CustomField\Ports\CustomFieldDefinitionService;
@@ -60,8 +60,8 @@ use SP\Mvc\Controller\WebControllerHelper;
 */
 final class IndexController extends ControllerBase
 {
-    protected ?ItemSearchData              $itemSearchData = null;
-    private TabsGridHelper      $tabsGridHelper;
+    protected ?ItemSearchDto $itemSearchData = null;
+    private TabsGridHelper   $tabsGridHelper;
    private CategoryService $categoryService;
    private TagService      $tagService;
    private ClientService   $clientService;
@@ -140,7 +140,7 @@ final class IndexController extends ControllerBase
     */
    protected function getGridTabs(): void
    {
-        $this->itemSearchData = new ItemSearchData(null, 0, $this->configData->getAccountCount());
+        $this->itemSearchData = new ItemSearchDto(null, 0, $this->configData->getAccountCount());

        if ($this->checkAccess(AclActionsInterface::CATEGORY)) {
            $this->tabsGridHelper->addTab($this->getCategoriesList());
--- a/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php
+++ b/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2023, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -28,7 +28,7 @@ namespace SP\Modules\Web\Controllers\PublicLink;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Bootstrap\BootstrapWeb;
-use SP\DataModel\PublicLinkList;
+use SP\Domain\Account\Models\PublicLinkList;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Account\Services\PublicLink;
--- a/app/modules/web/Controllers/SecurityManager/IndexController.php
+++ b/app/modules/web/Controllers/SecurityManager/IndexController.php
@@ -27,8 +27,8 @@ namespace SP\Modules\Web\Controllers\SecurityManager;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Events\Event;
-use SP\DataModel\ItemSearchData;
 use SP\Domain\Core\Acl\AclActionsInterface;
+use SP\Domain\Core\Dtos\ItemSearchDto;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Security\Ports\EventlogService;
@@ -47,8 +47,8 @@ use SP\Mvc\Controller\WebControllerHelper;
 */
 final class IndexController extends ControllerBase
 {
-    protected ItemSearchData         $itemSearchData;
-    protected TabsGridHelper         $tabsGridHelper;
+    protected ItemSearchDto  $itemSearchData;
+    protected TabsGridHelper $tabsGridHelper;
    private EventlogGrid             $eventlogGrid;
    private TrackGrid             $trackGrid;
    private EventlogService $eventlogService;
@@ -73,7 +73,7 @@ final class IndexController extends ControllerBase
        $this->eventlogService = $eventlogService;
        $this->trackService = $trackService;

-        $this->itemSearchData = new ItemSearchData();
+        $this->itemSearchData = new ItemSearchDto();
    }

    /**