chore: Refactor Client naming

Signed-off-by: Rubén D <nuxsmin@syspass.org>
2026-03-09 18:06:54 +01:00 · 2024-01-16 09:25:01 +01:00
parent c87f3abe39
commit 24fcc0abf4
19 changed files with 157 additions and 157 deletions
--- a/app/modules/web/Controllers/AccountManager/BulkEditController.php
+++ b/app/modules/web/Controllers/AccountManager/BulkEditController.php
@@ -33,7 +33,7 @@ use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountSearchService;
 use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Category\Ports\CategoryService;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Domain\Tag\Ports\TagServiceInterface;
@@ -62,19 +62,19 @@ final class BulkEditController extends ControllerBase
    private AccountHistoryService $accountHistoryService;
    private AccountGrid           $accountGrid;
    private CustomFieldServiceInterface $customFieldService;
-    private CategoryService             $categoryService;
-    private ClientServiceInterface      $clientService;
-    private TagServiceInterface            $tagService;
+    private CategoryService     $categoryService;
+    private ClientService       $clientService;
+    private TagServiceInterface $tagService;
    private UserServiceInterface           $userService;
    private UserGroupServiceInterface      $userGroupService;

    public function __construct(
-        Application            $application,
-        WebControllerHelper    $webControllerHelper,
-        CategoryService        $categoryService,
-        ClientServiceInterface $clientService,
-        TagServiceInterface    $tagService,
-        UserServiceInterface   $userService,
+        Application          $application,
+        WebControllerHelper  $webControllerHelper,
+        CategoryService      $categoryService,
+        ClientService        $clientService,
+        TagServiceInterface  $tagService,
+        UserServiceInterface $userService,
        UserGroupServiceInterface $userGroupService
    ) {
        parent::__construct($application, $webControllerHelper);
--- a/app/modules/web/Controllers/Client/ClientSaveBase.php
+++ b/app/modules/web/Controllers/Client/ClientSaveBase.php
@@ -4,7 +4,7 @@
 *
 * @author nuxsmin
 * @link https://syspass.org
- * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org
+ * @copyright 2012-2024, Rubén Domínguez nuxsmin@$syspass.org
 *
 * This file is part of sysPass.
 *
@@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Client;


 use SP\Core\Application;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\CustomField\Ports\CustomFieldServiceInterface;
 use SP\Modules\Web\Controllers\ControllerBase;
 use SP\Modules\Web\Forms\ClientForm;
@@ -37,14 +37,14 @@ use SP\Mvc\Controller\WebControllerHelper;
 */
 abstract class ClientSaveBase extends ControllerBase
 {
-    protected \SP\Domain\Client\Ports\ClientServiceInterface $clientService;
-    protected CustomFieldServiceInterface                    $customFieldService;
+    protected ClientService               $clientService;
+    protected CustomFieldServiceInterface $customFieldService;
    protected ClientForm                                     $form;

    public function __construct(
-        Application $application,
+        Application         $application,
        WebControllerHelper $webControllerHelper,
-        ClientServiceInterface $clientService,
+        ClientService       $clientService,
        CustomFieldServiceInterface $customFieldService
    ) {
        parent::__construct($application, $webControllerHelper);
--- a/app/modules/web/Controllers/Client/ClientViewBase.php
+++ b/app/modules/web/Controllers/Client/ClientViewBase.php
@@ -28,7 +28,7 @@ namespace SP\Modules\Web\Controllers\Client;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Domain\Client\Models\Client;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
@@ -47,13 +47,13 @@ abstract class ClientViewBase extends ControllerBase
 {
    use ItemTrait;

-    private ClientServiceInterface      $clientService;
+    private ClientService $clientService;
    private CustomFieldServiceInterface $customFieldService;

    public function __construct(
-        Application $application,
+        Application         $application,
        WebControllerHelper $webControllerHelper,
-        ClientServiceInterface $clientService,
+        ClientService       $clientService,
        CustomFieldServiceInterface $customFieldService
    ) {
        parent::__construct($application, $webControllerHelper);
--- a/app/modules/web/Controllers/Client/SearchController.php
+++ b/app/modules/web/Controllers/Client/SearchController.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,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Client;

 use JsonException;
 use SP\Core\Application;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
@@ -48,14 +48,14 @@ final class SearchController extends ControllerBase
    use ItemTrait;
    use JsonTrait;

-    private ClientServiceInterface $clientService;
-    private ClientGrid                                     $clientGrid;
+    private ClientService $clientService;
+    private ClientGrid    $clientGrid;

    public function __construct(
-        Application $application,
+        Application   $application,
        WebControllerHelper $webControllerHelper,
-        ClientServiceInterface $clientService,
-        ClientGrid $clientGrid
+        ClientService $clientService,
+        ClientGrid    $clientGrid
    ) {
        parent::__construct($application, $webControllerHelper);

--- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php
@@ -39,7 +39,7 @@ use SP\Domain\Account\Ports\AccountService;
 use SP\Domain\Account\Ports\PublicLinkService;
 use SP\Domain\Account\Services\PublicLink;
 use SP\Domain\Category\Ports\CategoryService;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AccountPermissionException;
 use SP\Domain\Core\Acl\AclActionsInterface;
@@ -79,8 +79,8 @@ final class AccountHelper extends AccountHelperBase
    private ItemPresetServiceInterface  $itemPresetService;
    private MasterPassServiceInterface  $masterPassService;
    private AccountAclService      $accountAclService;
-    private CategoryService        $categoryService;
-    private ClientServiceInterface $clientService;
+    private CategoryService $categoryService;
+    private ClientService   $clientService;
    private CustomFieldServiceInterface $customFieldService;
    private ?AccountPermission          $accountAcl = null;
    private ?int                        $accountId  = null;
@@ -101,7 +101,7 @@ final class AccountHelper extends AccountHelperBase
        AccountActionsHelper        $accountActionsHelper,
        AccountAclService         $accountAclService,
        CategoryService           $categoryService,
-        ClientServiceInterface      $clientService,
+        ClientService             $clientService,
        CustomFieldServiceInterface $customFieldService,
        UserServiceInterface      $userService,
        UserGroupServiceInterface $userGroupService,
--- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php
@@ -33,7 +33,7 @@ use SP\Domain\Account\Ports\AccountHistoryService;
 use SP\Domain\Account\Ports\AccountToUserGroupService;
 use SP\Domain\Account\Ports\AccountToUserService;
 use SP\Domain\Category\Ports\CategoryService;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Common\Services\ServiceException;
 use SP\Domain\Core\Acl\AccountPermissionException;
 use SP\Domain\Core\Acl\AclInterface;
@@ -68,7 +68,7 @@ final class AccountHistoryHelper extends AccountHelperBase
        private AccountHistoryService     $accountHistoryService,
        private AccountAclService         $accountAclService,
        private CategoryService $categoryService,
-        private ClientServiceInterface    $clientService,
+        private ClientService   $clientService,
        private AccountToUserService      $accountToUserService,
        private AccountToUserGroupService $accountToUserGroupService
    ) {
--- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
+++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php
@@ -35,7 +35,7 @@ use SP\Domain\Account\Dtos\AccountSearchFilterDto;
 use SP\Domain\Account\Ports\AccountSearchConstants;
 use SP\Domain\Account\Ports\AccountSearchService;
 use SP\Domain\Category\Ports\CategoryService;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
@@ -68,21 +68,21 @@ final class AccountSearchHelper extends HelperBase
    private int                           $queryTimeStart;
    private bool                    $isIndex;
    private ?AccountSearchFilterDto $accountSearchFilter = null;
-    private ClientServiceInterface  $clientService;
+    private ClientService $clientService;
    private AccountSearchService    $accountSearchService;
    private AccountActionsHelper $accountActionsHelper;
    private CategoryService      $categoryService;
    private TagServiceInterface  $tagService;

    public function __construct(
-        Application            $application,
-        TemplateInterface      $template,
-        RequestInterface       $request,
-        ClientServiceInterface $clientService,
-        CategoryService        $categoryService,
-        TagServiceInterface    $tagService,
-        AccountSearchService   $accountSearchService,
-        AccountActionsHelper   $accountActionsHelper
+        Application          $application,
+        TemplateInterface    $template,
+        RequestInterface     $request,
+        ClientService        $clientService,
+        CategoryService      $categoryService,
+        TagServiceInterface  $tagService,
+        AccountSearchService $accountSearchService,
+        AccountActionsHelper $accountActionsHelper
    ) {
        parent::__construct($application, $template, $request);

--- a/app/modules/web/Controllers/ItemManager/IndexController.php
+++ b/app/modules/web/Controllers/ItemManager/IndexController.php
@@ -32,7 +32,7 @@ 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\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Acl\AclActionsInterface;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
@@ -64,7 +64,7 @@ final class IndexController extends ControllerBase
    private TabsGridHelper      $tabsGridHelper;
    private CategoryService     $categoryService;
    private TagServiceInterface $tagService;
-    private ClientServiceInterface         $clientService;
+    private ClientService       $clientService;
    private CustomFieldDefServiceInterface $customFieldDefService;
    private AccountFileService         $accountFileService;
    private AccountService             $accountService;
@@ -85,7 +85,7 @@ final class IndexController extends ControllerBase
        Helpers\TabsGridHelper         $tabsGridHelper,
        CategoryService $categoryService,
        TagServiceInterface            $tagService,
-        ClientServiceInterface         $clientService,
+        ClientService   $clientService,
        CustomFieldDefServiceInterface $customFieldDefService,
        AccountFileService             $accountFileService,
        AccountService                 $accountService,
--- a/app/modules/web/Controllers/Items/ClientsController.php
+++ b/app/modules/web/Controllers/Items/ClientsController.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.
 *
@@ -25,7 +25,7 @@
 namespace SP\Modules\Web\Controllers\Items;

 use SP\Core\Application;
-use SP\Domain\Client\Ports\ClientServiceInterface;
+use SP\Domain\Client\Ports\ClientService;
 use SP\Domain\Core\Exceptions\ConstraintException;
 use SP\Domain\Core\Exceptions\QueryException;
 use SP\Domain\Core\Exceptions\SPException;
@@ -39,12 +39,12 @@ use SP\Mvc\View\Components\SelectItemAdapter;
 */
 final class ClientsController extends SimpleControllerBase
 {
-    private ClientServiceInterface $clientService;
+    private ClientService $clientService;

    public function __construct(
        Application $application,
        SimpleControllerHelper $simpleControllerHelper,
-        ClientServiceInterface $clientService
+        ClientService $clientService
    ) {
        parent::__construct($application, $simpleControllerHelper);