diff --git a/app/modules/api/Controllers/Account/AccountBase.php b/app/modules/api/Controllers/Account/AccountBase.php index 0e2a93e5..1ebab9b4 100644 --- a/app/modules/api/Controllers/Account/AccountBase.php +++ b/app/modules/api/Controllers/Account/AccountBase.php @@ -28,11 +28,11 @@ namespace SP\Modules\Api\Controllers\Account; use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Domain\Account\AccountPresetServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\Out\AccountAdapterInterface; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Account\Adapters\AccountAdapterInterface; +use SP\Domain\Account\Ports\AccountPresetServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\AccountHelp; @@ -68,4 +68,4 @@ abstract class AccountBase extends ControllerBase $this->apiService->setHelpClass(AccountHelp::class); } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Account/SearchController.php b/app/modules/api/Controllers/Account/SearchController.php index 3c446535..9128a12e 100644 --- a/app/modules/api/Controllers/Account/SearchController.php +++ b/app/modules/api/Controllers/Account/SearchController.php @@ -29,10 +29,10 @@ use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Account\AccountSearchServiceInterface; +use SP\Domain\Account\Ports\AccountSearchServiceInterface; use SP\Domain\Account\Search\AccountSearchConstants; use SP\Domain\Account\Search\AccountSearchFilter; -use SP\Domain\Api\ApiServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; use SP\Domain\Api\Services\ApiResponse; use SP\Modules\Api\Controllers\ControllerBase; @@ -107,4 +107,4 @@ final class SearchController extends ControllerBase return $filter; } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Category/CategoryBase.php b/app/modules/api/Controllers/Category/CategoryBase.php index af8e0e2e..53e538ae 100644 --- a/app/modules/api/Controllers/Category/CategoryBase.php +++ b/app/modules/api/Controllers/Category/CategoryBase.php @@ -28,9 +28,9 @@ namespace SP\Modules\Api\Controllers\Category; use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Category\Out\CategoryAdapterInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\Category\Ports\CategoryAdapterInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\CategoryHelp; @@ -61,4 +61,4 @@ abstract class CategoryBase extends ControllerBase $this->apiService->setHelpClass(CategoryHelp::class); } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Client/ClientBase.php b/app/modules/api/Controllers/Client/ClientBase.php index b5b8af95..bb5c515e 100644 --- a/app/modules/api/Controllers/Client/ClientBase.php +++ b/app/modules/api/Controllers/Client/ClientBase.php @@ -28,9 +28,9 @@ namespace SP\Modules\Api\Controllers\Client; use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Client\Out\ClientAdapterInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\Client\Ports\ClientAdapterInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\ClientHelp; @@ -50,7 +50,7 @@ abstract class ClientBase extends ControllerBase Klein $router, ApiServiceInterface $apiService, Acl $acl, - ClientServiceInterface $clientService, + \SP\Domain\Client\Ports\ClientServiceInterface $clientService, ClientAdapterInterface $clientAdapter ) { parent::__construct($application, $router, $apiService, $acl); @@ -61,4 +61,4 @@ abstract class ClientBase extends ControllerBase $this->apiService->setHelpClass(ClientHelp::class); } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Config/BackupController.php b/app/modules/api/Controllers/Config/BackupController.php index 3f2971d3..6fcf104c 100644 --- a/app/modules/api/Controllers/Config/BackupController.php +++ b/app/modules/api/Controllers/Config/BackupController.php @@ -31,9 +31,9 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Api\ApiServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; use SP\Domain\Api\Services\ApiResponse; -use SP\Domain\Export\FileBackupServiceInterface; +use SP\Domain\Export\Ports\FileBackupServiceInterface; use SP\Domain\Export\Services\BackupFiles; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\ConfigHelp; @@ -118,4 +118,4 @@ final class BackupController extends ControllerBase ], ]; } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Config/ExportController.php b/app/modules/api/Controllers/Config/ExportController.php index fea0aefb..4652a73c 100644 --- a/app/modules/api/Controllers/Config/ExportController.php +++ b/app/modules/api/Controllers/Config/ExportController.php @@ -32,9 +32,9 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Api\ApiServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; use SP\Domain\Api\Services\ApiResponse; -use SP\Domain\Export\XmlExportServiceInterface; +use SP\Domain\Export\Ports\XmlExportServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\ConfigHelp; @@ -100,4 +100,4 @@ final class ExportController extends ControllerBase $this->returnResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/ControllerBase.php b/app/modules/api/Controllers/ControllerBase.php index e743b662..80c871d5 100644 --- a/app/modules/api/Controllers/ControllerBase.php +++ b/app/modules/api/Controllers/ControllerBase.php @@ -33,10 +33,10 @@ use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Context\ContextInterface; use SP\Core\Events\EventDispatcher; use SP\Core\Exceptions\SPException; -use SP\Domain\Api\ApiServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; use SP\Domain\Api\Services\ApiResponse; use SP\Domain\Api\Services\JsonRpcResponse; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\Json; /** @@ -127,4 +127,4 @@ abstract class ControllerBase { $this->sendJsonResponse(JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId())); } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/Tag/TagBase.php b/app/modules/api/Controllers/Tag/TagBase.php index ab9468f9..9f77757f 100644 --- a/app/modules/api/Controllers/Tag/TagBase.php +++ b/app/modules/api/Controllers/Tag/TagBase.php @@ -28,8 +28,8 @@ namespace SP\Modules\Api\Controllers\Tag; use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\TagHelp; @@ -56,4 +56,4 @@ abstract class TagBase extends ControllerBase $this->apiService->setHelpClass(TagHelp::class); } -} \ No newline at end of file +} diff --git a/app/modules/api/Controllers/UserGroup/UserGroupBase.php b/app/modules/api/Controllers/UserGroup/UserGroupBase.php index f26fa860..4a4abfee 100644 --- a/app/modules/api/Controllers/UserGroup/UserGroupBase.php +++ b/app/modules/api/Controllers/UserGroup/UserGroupBase.php @@ -27,8 +27,8 @@ namespace SP\Modules\Api\Controllers\UserGroup; use Klein\Klein; use SP\Core\Acl\Acl; use SP\Core\Application; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Modules\Api\Controllers\ControllerBase; use SP\Modules\Api\Controllers\Help\TagHelp; @@ -55,4 +55,4 @@ abstract class UserGroupBase extends ControllerBase $this->apiService->setHelpClass(TagHelp::class); } -} \ No newline at end of file +} diff --git a/app/modules/cli/Commands/BackupCommand.php b/app/modules/cli/Commands/BackupCommand.php index 01a4f1b0..3a9aeb51 100644 --- a/app/modules/cli/Commands/BackupCommand.php +++ b/app/modules/cli/Commands/BackupCommand.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -19,7 +19,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with sysPass. If not, see . + * along with sysPass. If not, see . */ namespace SP\Modules\Cli\Commands; @@ -27,8 +27,8 @@ namespace SP\Modules\Cli\Commands; use Exception; use Psr\Log\LoggerInterface; use RuntimeException; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Export\FileBackupServiceInterface; +use SP\Domain\Config\Ports\ConfigInterface; +use SP\Domain\Export\Ports\FileBackupServiceInterface; use SP\Domain\Export\Services\FileBackupService; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -130,4 +130,4 @@ final class BackupCommand extends CommandBase return $path; } -} \ No newline at end of file +} diff --git a/app/modules/cli/Commands/CommandBase.php b/app/modules/cli/Commands/CommandBase.php index 75fc59e6..f431ef1f 100644 --- a/app/modules/cli/Commands/CommandBase.php +++ b/app/modules/cli/Commands/CommandBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,8 +25,8 @@ namespace SP\Modules\Cli\Commands; use Psr\Log\LoggerInterface; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Domain\Config\Services\ConfigFileService; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; @@ -86,4 +86,4 @@ abstract class CommandBase extends Command return static::getEnvVarForOption($argument) ?: $input->getArgument($argument); } -} \ No newline at end of file +} diff --git a/app/modules/cli/Commands/Crypt/UpdateMasterPasswordCommand.php b/app/modules/cli/Commands/Crypt/UpdateMasterPasswordCommand.php index dbade78f..95a953ec 100644 --- a/app/modules/cli/Commands/Crypt/UpdateMasterPasswordCommand.php +++ b/app/modules/cli/Commands/Crypt/UpdateMasterPasswordCommand.php @@ -27,12 +27,11 @@ namespace SP\Modules\Cli\Commands\Crypt; use Exception; use Psr\Log\LoggerInterface; use RuntimeException; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Account\Services\AccountService; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\ConfigServiceInterface; +use SP\Domain\Config\Ports\ConfigInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Config\Services\ConfigService; -use SP\Domain\Crypt\MasterPassServiceInterface; use SP\Domain\Crypt\Services\MasterPassService; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; use SP\Modules\Cli\Commands\CommandBase; @@ -65,13 +64,13 @@ final class UpdateMasterPasswordCommand extends CommandBase /** * @var string */ - protected static $defaultName = 'sp:crypt:update-master-password'; - private \SP\Domain\Crypt\MasterPassServiceInterface $masterPassService; - private ConfigService $configService; + protected static $defaultName = 'sp:crypt:update-master-password'; + private \SP\Domain\Crypt\Ports\MasterPassServiceInterface $masterPassService; + private ConfigService $configService; private AccountService $accountService; public function __construct( - MasterPassServiceInterface $masterPassService, + \SP\Domain\Crypt\Ports\MasterPassServiceInterface $masterPassService, AccountServiceInterface $accountService, ConfigServiceInterface $configService, LoggerInterface $logger, diff --git a/app/modules/cli/Commands/InstallCommand.php b/app/modules/cli/Commands/InstallCommand.php index a1ab463a..c2235ddf 100644 --- a/app/modules/cli/Commands/InstallCommand.php +++ b/app/modules/cli/Commands/InstallCommand.php @@ -29,9 +29,9 @@ use Psr\Log\LoggerInterface; use SP\Core\Exceptions\InstallError; use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Language; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Install\In\InstallData; -use SP\Domain\Install\InstallerServiceInterface; +use SP\Domain\Config\Ports\ConfigInterface; +use SP\Domain\Install\Adapters\InstallData; +use SP\Domain\Install\Ports\InstallerServiceInterface; use SP\Domain\Install\Services\InstallerService; use SP\Util\Util; use Symfony\Component\Console\Input\InputArgument; @@ -395,4 +395,4 @@ final class InstallCommand extends CommandBase return true; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccessManager/IndexController.php b/app/modules/web/Controllers/AccessManager/IndexController.php index 8cb2cbea..992e8e53 100644 --- a/app/modules/web/Controllers/AccessManager/IndexController.php +++ b/app/modules/web/Controllers/AccessManager/IndexController.php @@ -31,11 +31,11 @@ use SP\Core\Events\Event; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\PublicLinkServiceInterface; -use SP\Domain\Auth\AuthTokenServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Html\DataGrid\DataGridTab; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\AuthTokenGrid; @@ -219,4 +219,4 @@ final class IndexController extends ControllerBase { return $this->tabsGridHelper; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/AccountSaveBase.php b/app/modules/web/Controllers/Account/AccountSaveBase.php index 2a544fbf..e7a84c8d 100644 --- a/app/modules/web/Controllers/Account/AccountSaveBase.php +++ b/app/modules/web/Controllers/Account/AccountSaveBase.php @@ -26,9 +26,9 @@ namespace SP\Modules\Web\Controllers\Account; use SP\Core\Application; -use SP\Domain\Account\AccountPresetServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Account\Ports\AccountPresetServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\AccountForm; use SP\Mvc\Controller\ItemTrait; @@ -61,4 +61,4 @@ abstract class AccountSaveBase extends AccountControllerBase $this->customFieldService = $customFieldService; $this->accountForm = new AccountForm($application, $this->request, $accountPresetService); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/AccountViewBase.php b/app/modules/web/Controllers/Account/AccountViewBase.php index d294c980..b085c6cb 100644 --- a/app/modules/web/Controllers/Account/AccountViewBase.php +++ b/app/modules/web/Controllers/Account/AccountViewBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Account; use SP\Core\Application; use SP\Core\UI\ThemeIcons; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountHelper; use SP\Mvc\Controller\WebControllerHelper; @@ -42,7 +42,7 @@ abstract class AccountViewBase extends AccountControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, AccountHelper $accountHelper ) { parent::__construct($application, $webControllerHelper); @@ -51,4 +51,4 @@ abstract class AccountViewBase extends AccountControllerBase $this->accountHelper = $accountHelper; $this->icons = $this->theme->getIcons(); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/CopyPassController.php b/app/modules/web/Controllers/Account/CopyPassController.php index 63e7590b..5f7dd155 100644 --- a/app/modules/web/Controllers/Account/CopyPassController.php +++ b/app/modules/web/Controllers/Account/CopyPassController.php @@ -28,7 +28,6 @@ namespace SP\Modules\Web\Controllers\Account; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountPasswordHelper; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -40,13 +39,13 @@ final class CopyPassController extends AccountControllerBase { use JsonTrait; - private AccountServiceInterface $accountService; - private AccountPasswordHelper $accountPasswordHelper; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private AccountPasswordHelper $accountPasswordHelper; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, AccountPasswordHelper $accountPasswordHelper ) { parent::__construct( @@ -94,4 +93,4 @@ final class CopyPassController extends AccountControllerBase return $this->returnJsonResponseData($data); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/CopyPassHistoryController.php b/app/modules/web/Controllers/Account/CopyPassHistoryController.php index 38c05412..cbd52e25 100644 --- a/app/modules/web/Controllers/Account/CopyPassHistoryController.php +++ b/app/modules/web/Controllers/Account/CopyPassHistoryController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Account; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountPasswordHelper; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -39,8 +39,8 @@ final class CopyPassHistoryController extends AccountControllerBase { use JsonTrait; - private AccountServiceInterface $accountService; - private AccountPasswordHelper $accountPasswordHelper; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private AccountPasswordHelper $accountPasswordHelper; public function __construct( Application $application, @@ -93,4 +93,4 @@ final class CopyPassHistoryController extends AccountControllerBase return $this->returnJsonResponseData($data); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/DeleteController.php b/app/modules/web/Controllers/Account/DeleteController.php index 855ed702..9bddbc76 100644 --- a/app/modules/web/Controllers/Account/DeleteController.php +++ b/app/modules/web/Controllers/Account/DeleteController.php @@ -29,7 +29,6 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\UI\ThemeIcons; -use SP\Domain\Account\AccountServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountHelper; use SP\Mvc\Controller\WebControllerHelper; use SP\Util\ErrorUtil; @@ -39,15 +38,15 @@ use SP\Util\ErrorUtil; */ final class DeleteController extends AccountControllerBase { - private AccountHelper $accountHelper; - private ThemeIcons $icons; - private AccountServiceInterface $accountService; + private AccountHelper $accountHelper; + private ThemeIcons $icons; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, AccountHelper $accountHelper, - AccountServiceInterface $accountService + \SP\Domain\Account\Ports\AccountServiceInterface $accountService ) { parent::__construct( $application, @@ -108,4 +107,4 @@ final class DeleteController extends AccountControllerBase ErrorUtil::showExceptionInView($this->view, $e, 'account'); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/RequestAccessController.php b/app/modules/web/Controllers/Account/RequestAccessController.php index 54eec363..d38b8fef 100644 --- a/app/modules/web/Controllers/Account/RequestAccessController.php +++ b/app/modules/web/Controllers/Account/RequestAccessController.php @@ -28,7 +28,7 @@ use Exception; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Account\AccountRequestHelper; use SP\Mvc\Controller\WebControllerHelper; @@ -45,7 +45,7 @@ final class RequestAccessController extends ControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, AccountRequestHelper $accountRequestHelper ) { parent::__construct($application, $webControllerHelper); @@ -91,4 +91,4 @@ final class RequestAccessController extends ControllerBase ErrorUtil::showExceptionInView($this->view, $e, 'account-request'); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/SaveDeleteController.php b/app/modules/web/Controllers/Account/SaveDeleteController.php index 43d61725..ae6cd889 100644 --- a/app/modules/web/Controllers/Account/SaveDeleteController.php +++ b/app/modules/web/Controllers/Account/SaveDeleteController.php @@ -30,8 +30,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -44,13 +43,13 @@ final class SaveDeleteController extends AccountControllerBase { use JsonTrait, ItemTrait; - private AccountServiceInterface $accountService; - private CustomFieldServiceInterface $customFieldService; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private CustomFieldServiceInterface $customFieldService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, CustomFieldServiceInterface $customFieldService ) { parent::__construct( @@ -98,4 +97,4 @@ final class SaveDeleteController extends AccountControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/SaveEditPassController.php b/app/modules/web/Controllers/Account/SaveEditPassController.php index 6103ec93..140ef194 100644 --- a/app/modules/web/Controllers/Account/SaveEditPassController.php +++ b/app/modules/web/Controllers/Account/SaveEditPassController.php @@ -32,8 +32,6 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Account\AccountPresetServiceInterface; -use SP\Domain\Account\AccountServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\AccountForm; @@ -46,14 +44,14 @@ final class SaveEditPassController extends AccountControllerBase { use JsonTrait; - private AccountServiceInterface $accountService; - private AccountForm $accountForm; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private AccountForm $accountForm; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, - AccountPresetServiceInterface $accountPresetService + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountPresetServiceInterface $accountPresetService ) { parent::__construct( $application, @@ -109,4 +107,4 @@ final class SaveEditPassController extends AccountControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/SaveEditRestoreController.php b/app/modules/web/Controllers/Account/SaveEditRestoreController.php index 95f2a7fb..4c3fe4a7 100644 --- a/app/modules/web/Controllers/Account/SaveEditRestoreController.php +++ b/app/modules/web/Controllers/Account/SaveEditRestoreController.php @@ -31,7 +31,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -43,7 +43,7 @@ final class SaveEditRestoreController extends AccountControllerBase { use JsonTrait; - private AccountServiceInterface $accountService; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; public function __construct( Application $application, @@ -100,4 +100,4 @@ final class SaveEditRestoreController extends AccountControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/SaveRequestController.php b/app/modules/web/Controllers/Account/SaveRequestController.php index 1d207cce..8e4b523f 100644 --- a/app/modules/web/Controllers/Account/SaveRequestController.php +++ b/app/modules/web/Controllers/Account/SaveRequestController.php @@ -33,8 +33,8 @@ use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Http\JsonResponse; use SP\Http\Uri; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -54,7 +54,7 @@ final class SaveRequestController extends AccountControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, UserServiceInterface $userService ) { parent::__construct( @@ -136,4 +136,4 @@ final class SaveRequestController extends AccountControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/ViewHistoryController.php b/app/modules/web/Controllers/Account/ViewHistoryController.php index d410a2f4..cbca877d 100644 --- a/app/modules/web/Controllers/Account/ViewHistoryController.php +++ b/app/modules/web/Controllers/Account/ViewHistoryController.php @@ -28,7 +28,6 @@ use Exception; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Account\AccountHistoryServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountHistoryHelper; use SP\Mvc\Controller\WebControllerHelper; use SP\Util\ErrorUtil; @@ -38,13 +37,13 @@ use SP\Util\ErrorUtil; */ final class ViewHistoryController extends AccountControllerBase { - private AccountHistoryServiceInterface $accountHistoryService; - private AccountHistoryHelper $accountHistoryHelper; + private \SP\Domain\Account\Ports\AccountHistoryServiceInterface $accountHistoryService; + private AccountHistoryHelper $accountHistoryHelper; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountHistoryServiceInterface $accountHistoryService, + \SP\Domain\Account\Ports\AccountHistoryServiceInterface $accountHistoryService, AccountHistoryHelper $accountHistoryHelper ) { parent::__construct( @@ -101,4 +100,4 @@ final class ViewHistoryController extends AccountControllerBase } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/ViewLinkController.php b/app/modules/web/Controllers/Account/ViewLinkController.php index 42eb43da..764a7b88 100644 --- a/app/modules/web/Controllers/Account/ViewLinkController.php +++ b/app/modules/web/Controllers/Account/ViewLinkController.php @@ -35,8 +35,6 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\UI\ThemeIcons; use SP\DataModel\AccountExtData; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\PublicLinkServiceInterface; use SP\Domain\Account\Services\PublicLinkService; use SP\Http\Uri; use SP\Mvc\Controller\WebControllerHelper; @@ -49,16 +47,16 @@ use SP\Util\Util; */ final class ViewLinkController extends AccountControllerBase { - private AccountServiceInterface $accountService; - private ThemeIcons $icons; - private PublicLinkService $publicLinkService; - private ImageUtil $imageUtil; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private ThemeIcons $icons; + private PublicLinkService $publicLinkService; + private ImageUtil $imageUtil; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - AccountServiceInterface $accountService, - PublicLinkServiceInterface $publicLinkService, + \SP\Domain\Account\Ports\AccountServiceInterface $accountService, + \SP\Domain\Account\Ports\PublicLinkServiceInterface $publicLinkService, ImageUtil $imageUtil ) { parent::__construct( @@ -174,4 +172,4 @@ final class ViewLinkController extends AccountControllerBase ErrorUtil::showExceptionInView($this->view, $e, 'account-link'); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/ViewPassController.php b/app/modules/web/Controllers/Account/ViewPassController.php index 171ab986..6744cae3 100644 --- a/app/modules/web/Controllers/Account/ViewPassController.php +++ b/app/modules/web/Controllers/Account/ViewPassController.php @@ -30,9 +30,9 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\DataModel\ItemPreset\Password; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountPasswordHelper; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -124,4 +124,4 @@ final class ViewPassController extends AccountControllerBase return null; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Account/ViewPassHistoryController.php b/app/modules/web/Controllers/Account/ViewPassHistoryController.php index 7a6754bb..e834cc73 100644 --- a/app/modules/web/Controllers/Account/ViewPassHistoryController.php +++ b/app/modules/web/Controllers/Account/ViewPassHistoryController.php @@ -30,9 +30,9 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\DataModel\ItemPreset\Password; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Modules\Web\Controllers\Helpers\Account\AccountPasswordHelper; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -44,9 +44,9 @@ final class ViewPassHistoryController extends AccountControllerBase { use JsonTrait; - private AccountServiceInterface $accountService; - private AccountPasswordHelper $accountPasswordHelper; - private ItemPresetServiceInterface $itemPresetService; + private \SP\Domain\Account\Ports\AccountServiceInterface $accountService; + private AccountPasswordHelper $accountPasswordHelper; + private ItemPresetServiceInterface $itemPresetService; public function __construct( Application $application, @@ -121,4 +121,4 @@ final class ViewPassHistoryController extends AccountControllerBase return null; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php b/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php index 03c02864..7fcb915e 100644 --- a/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php +++ b/app/modules/web/Controllers/AccountFavorite/AccountFavoriteBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\AccountFavorite; use SP\Core\Application; -use SP\Domain\Account\AccountToFavoriteServiceInterface; +use SP\Domain\Account\Ports\AccountToFavoriteServiceInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -48,4 +48,4 @@ abstract class AccountFavoriteBase extends SimpleControllerBase $this->accountToFavoriteService = $accountToFavoriteService; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountFile/AccountFileBase.php b/app/modules/web/Controllers/AccountFile/AccountFileBase.php index 29561a7a..5c09c985 100644 --- a/app/modules/web/Controllers/AccountFile/AccountFileBase.php +++ b/app/modules/web/Controllers/AccountFile/AccountFileBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\AccountFile; use SP\Core\Application; -use SP\Domain\Account\AccountFileServiceInterface; +use SP\Domain\Account\Ports\AccountFileServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -45,4 +45,4 @@ abstract class AccountFileBase extends ControllerBase $this->accountFileService = $accountFileService; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountFile/SearchController.php b/app/modules/web/Controllers/AccountFile/SearchController.php index 1097aa6f..020738bd 100644 --- a/app/modules/web/Controllers/AccountFile/SearchController.php +++ b/app/modules/web/Controllers/AccountFile/SearchController.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\AccountFile; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Account\AccountFileServiceInterface; +use SP\Domain\Account\Ports\AccountFileServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; diff --git a/app/modules/web/Controllers/AccountFile/UploadController.php b/app/modules/web/Controllers/AccountFile/UploadController.php index 88b672bb..218ae986 100644 --- a/app/modules/web/Controllers/AccountFile/UploadController.php +++ b/app/modules/web/Controllers/AccountFile/UploadController.php @@ -30,8 +30,8 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; use SP\DataModel\FileData; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountFileServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Html\Html; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; diff --git a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php index 5b140d30..bb75f7c3 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/DeleteController.php @@ -28,8 +28,8 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -116,4 +116,4 @@ final class DeleteController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php index 4dafd4f5..426bb761 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/RestoreController.php @@ -28,8 +28,8 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -101,4 +101,4 @@ final class RestoreController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php index b3bf859a..5cb9f436 100644 --- a/app/modules/web/Controllers/AccountHistoryManager/SearchController.php +++ b/app/modules/web/Controllers/AccountHistoryManager/SearchController.php @@ -28,7 +28,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -102,4 +102,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountManager/BulkEditController.php b/app/modules/web/Controllers/AccountManager/BulkEditController.php index b8328017..101f9f2b 100644 --- a/app/modules/web/Controllers/AccountManager/BulkEditController.php +++ b/app/modules/web/Controllers/AccountManager/BulkEditController.php @@ -29,15 +29,15 @@ use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountSearchServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\Tag\TagServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +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\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid; @@ -152,4 +152,4 @@ final class BulkEditController extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountManager/DeleteController.php b/app/modules/web/Controllers/AccountManager/DeleteController.php index c902e464..6a42c206 100644 --- a/app/modules/web/Controllers/AccountManager/DeleteController.php +++ b/app/modules/web/Controllers/AccountManager/DeleteController.php @@ -29,8 +29,8 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -111,4 +111,4 @@ final class DeleteController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php index be0358d8..e5aa8ee5 100644 --- a/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php +++ b/app/modules/web/Controllers/AccountManager/SaveBulkEditController.php @@ -29,9 +29,9 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountPresetServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountPresetServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Account\Services\AccountBulkRequest; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -105,4 +105,4 @@ final class SaveBulkEditController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AccountManager/SearchController.php b/app/modules/web/Controllers/AccountManager/SearchController.php index d506e2fb..78b339f6 100644 --- a/app/modules/web/Controllers/AccountManager/SearchController.php +++ b/app/modules/web/Controllers/AccountManager/SearchController.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\AccountManager; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Account\AccountSearchServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountSearchServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; @@ -112,4 +112,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AuthToken/AuthTokenSaveBase.php b/app/modules/web/Controllers/AuthToken/AuthTokenSaveBase.php index 0136dd5c..156e87cd 100644 --- a/app/modules/web/Controllers/AuthToken/AuthTokenSaveBase.php +++ b/app/modules/web/Controllers/AuthToken/AuthTokenSaveBase.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\AuthToken; use SP\Core\Application; -use SP\Domain\Auth\AuthTokenServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\AuthTokenForm; @@ -59,4 +59,4 @@ abstract class AuthTokenSaveBase extends ControllerBase $this->customFieldService = $customFieldService; $this->form = new AuthTokenForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AuthToken/AuthTokenViewBase.php b/app/modules/web/Controllers/AuthToken/AuthTokenViewBase.php index 3c33a4c3..20049281 100644 --- a/app/modules/web/Controllers/AuthToken/AuthTokenViewBase.php +++ b/app/modules/web/Controllers/AuthToken/AuthTokenViewBase.php @@ -32,10 +32,10 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\AuthTokenData; -use SP\Domain\Auth\AuthTokenServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; use SP\Domain\Auth\Services\AuthTokenService; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\ItemTrait; @@ -116,4 +116,4 @@ abstract class AuthTokenViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::AUTHTOKEN, $authTokenId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/AuthToken/SearchController.php b/app/modules/web/Controllers/AuthToken/SearchController.php index 7f5ad853..28a8c1e2 100644 --- a/app/modules/web/Controllers/AuthToken/SearchController.php +++ b/app/modules/web/Controllers/AuthToken/SearchController.php @@ -29,7 +29,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Auth\AuthTokenServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -104,4 +104,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Category/CategorySaveBase.php b/app/modules/web/Controllers/Category/CategorySaveBase.php index 2901baac..6a85eaa9 100644 --- a/app/modules/web/Controllers/Category/CategorySaveBase.php +++ b/app/modules/web/Controllers/Category/CategorySaveBase.php @@ -25,8 +25,8 @@ namespace SP\Modules\Web\Controllers\Category; use SP\Core\Application; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Modules\Web\Forms\CategoryForm; @@ -58,4 +58,4 @@ abstract class CategorySaveBase extends ControllerBase $this->customFieldService = $customFieldService; $this->form = new CategoryForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Category/CategoryViewBase.php b/app/modules/web/Controllers/Category/CategoryViewBase.php index ab3a19f9..80304fe7 100644 --- a/app/modules/web/Controllers/Category/CategoryViewBase.php +++ b/app/modules/web/Controllers/Category/CategoryViewBase.php @@ -31,9 +31,9 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; -use SP\Domain\Category\CategoryServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\ItemTrait; @@ -52,7 +52,7 @@ abstract class CategoryViewBase extends ControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - CategoryServiceInterface $categoryService, + \SP\Domain\Category\Ports\CategoryServiceInterface $categoryService, CustomFieldServiceInterface $customFieldService ) { parent::__construct($application, $webControllerHelper); @@ -103,4 +103,4 @@ abstract class CategoryViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::CATEGORY, $categoryId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Category/SearchController.php b/app/modules/web/Controllers/Category/SearchController.php index cd9cf663..baed3880 100644 --- a/app/modules/web/Controllers/Category/SearchController.php +++ b/app/modules/web/Controllers/Category/SearchController.php @@ -30,7 +30,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Category\CategoryServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -103,4 +103,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Client/ClientSaveBase.php b/app/modules/web/Controllers/Client/ClientSaveBase.php index e39cc626..cc4f4730 100644 --- a/app/modules/web/Controllers/Client/ClientSaveBase.php +++ b/app/modules/web/Controllers/Client/ClientSaveBase.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\Client; use SP\Core\Application; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\ClientForm; use SP\Mvc\Controller\WebControllerHelper; @@ -37,9 +37,9 @@ use SP\Mvc\Controller\WebControllerHelper; */ abstract class ClientSaveBase extends ControllerBase { - protected ClientServiceInterface $clientService; - protected CustomFieldServiceInterface $customFieldService; - protected ClientForm $form; + protected \SP\Domain\Client\Ports\ClientServiceInterface $clientService; + protected CustomFieldServiceInterface $customFieldService; + protected ClientForm $form; public function __construct( Application $application, @@ -55,4 +55,4 @@ abstract class ClientSaveBase extends ControllerBase $this->customFieldService = $customFieldService; $this->form = new ClientForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Client/ClientViewBase.php b/app/modules/web/Controllers/Client/ClientViewBase.php index cf08b3e5..2ef70e13 100644 --- a/app/modules/web/Controllers/Client/ClientViewBase.php +++ b/app/modules/web/Controllers/Client/ClientViewBase.php @@ -32,8 +32,8 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ClientData; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\ItemTrait; @@ -46,8 +46,8 @@ abstract class ClientViewBase extends ControllerBase { use ItemTrait; - private ClientServiceInterface $clientService; - private CustomFieldServiceInterface $customFieldService; + private \SP\Domain\Client\Ports\ClientServiceInterface $clientService; + private CustomFieldServiceInterface $customFieldService; public function __construct( Application $application, @@ -106,4 +106,4 @@ abstract class ClientViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::CLIENT, $clientId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Client/SearchController.php b/app/modules/web/Controllers/Client/SearchController.php index acb6cebd..c1241b7f 100644 --- a/app/modules/web/Controllers/Client/SearchController.php +++ b/app/modules/web/Controllers/Client/SearchController.php @@ -30,7 +30,6 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Client\ClientServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -46,13 +45,13 @@ final class SearchController extends ControllerBase { use JsonTrait, ItemTrait; - private ClientServiceInterface $clientService; - private ClientGrid $clientGrid; + private \SP\Domain\Client\Ports\ClientServiceInterface $clientService; + private ClientGrid $clientGrid; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - ClientServiceInterface $clientService, + \SP\Domain\Client\Ports\ClientServiceInterface $clientService, ClientGrid $clientGrid ) { parent::__construct($application, $webControllerHelper); @@ -103,4 +102,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigAccount/SaveController.php b/app/modules/web/Controllers/ConfigAccount/SaveController.php index 01144e2c..3931603a 100644 --- a/app/modules/web/Controllers/ConfigAccount/SaveController.php +++ b/app/modules/web/Controllers/ConfigAccount/SaveController.php @@ -29,7 +29,7 @@ use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -74,7 +74,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * * @return void */ @@ -91,7 +91,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \SP\Core\Events\EventMessage $eventMessage * * @return void @@ -123,7 +123,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \SP\Core\Events\EventMessage $eventMessage * * @return void @@ -164,4 +164,4 @@ final class SaveController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php index 8b356f5b..e54fde24 100644 --- a/app/modules/web/Controllers/ConfigBackup/FileBackupController.php +++ b/app/modules/web/Controllers/ConfigBackup/FileBackupController.php @@ -32,8 +32,7 @@ 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\Export\FileBackupServiceInterface; +use SP\Domain\Export\Ports\FileBackupServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -110,4 +109,4 @@ final class FileBackupController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php index 627425f4..b5698b01 100644 --- a/app/modules/web/Controllers/ConfigBackup/XmlExportController.php +++ b/app/modules/web/Controllers/ConfigBackup/XmlExportController.php @@ -31,9 +31,8 @@ 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\Export\XmlExportServiceInterface; -use SP\Domain\Export\XmlVerifyServiceInterface; +use SP\Domain\Export\Ports\XmlExportServiceInterface; +use SP\Domain\Export\Ports\XmlVerifyServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -146,4 +145,4 @@ final class XmlExportController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php index 0a13ce54..ba6f926b 100644 --- a/app/modules/web/Controllers/ConfigEncryption/RefreshController.php +++ b/app/modules/web/Controllers/ConfigEncryption/RefreshController.php @@ -33,7 +33,7 @@ use SP\Core\Crypt\Hash; use SP\Core\Crypt\Session as CryptSession; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Crypt\MasterPassServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -107,4 +107,4 @@ final class RefreshController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveController.php b/app/modules/web/Controllers/ConfigEncryption/SaveController.php index 4277630f..abde9744 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveController.php @@ -31,8 +31,8 @@ use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Crypt\Hash; use SP\Core\Events\Event; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Crypt\MasterPassServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Domain\Crypt\Services\MasterPassService; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; use SP\Domain\Task\Services\Task; @@ -216,4 +216,4 @@ final class SaveController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php index 795c2706..b86f6e8a 100644 --- a/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php +++ b/app/modules/web/Controllers/ConfigEncryption/SaveTempController.php @@ -29,7 +29,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Crypt\TemporaryMasterPassServiceInterface; +use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -126,4 +126,4 @@ final class SaveTempController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php index e0d81719..5b580d88 100644 --- a/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php +++ b/app/modules/web/Controllers/ConfigGeneral/DownloadConfigBackup.php @@ -31,7 +31,7 @@ use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Config\ConfigBackupServiceInterface; +use SP\Domain\Config\Ports\ConfigBackupServiceInterface; use SP\Domain\Config\Services\ConfigBackupService; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -116,4 +116,4 @@ final class DownloadConfigBackup extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigGeneral/SaveController.php b/app/modules/web/Controllers/ConfigGeneral/SaveController.php index eede16c9..1c808912 100644 --- a/app/modules/web/Controllers/ConfigGeneral/SaveController.php +++ b/app/modules/web/Controllers/ConfigGeneral/SaveController.php @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigUtil; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -76,7 +76,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * * @return void */ @@ -106,7 +106,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \SP\Core\Events\EventMessage $eventMessage * * @return void @@ -151,7 +151,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \SP\Core\Events\EventMessage $eventMessage * * @return void @@ -190,7 +190,7 @@ final class SaveController extends SimpleControllerBase } /** - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \SP\Core\Events\EventMessage $eventMessage * * @return void @@ -236,4 +236,4 @@ final class SaveController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigImport/ImportController.php b/app/modules/web/Controllers/ConfigImport/ImportController.php index be723485..ee72d6b9 100644 --- a/app/modules/web/Controllers/ConfigImport/ImportController.php +++ b/app/modules/web/Controllers/ConfigImport/ImportController.php @@ -31,7 +31,7 @@ use SP\Core\Application; use SP\Core\Context\SessionContext; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Import\ImportServiceInterface; +use SP\Domain\Import\Ports\ImportServiceInterface; use SP\Domain\Import\Services\FileImport; use SP\Domain\Import\Services\ImportParams; use SP\Http\JsonResponse; @@ -144,4 +144,4 @@ final class ImportController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigLdap/CheckController.php b/app/modules/web/Controllers/ConfigLdap/CheckController.php index 53ebcded..60223ede 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckController.php @@ -31,7 +31,7 @@ use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Exceptions\CheckException; -use SP\Domain\Auth\LdapCheckServiceInterface; +use SP\Domain\Auth\Ports\LdapCheckServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -120,4 +120,4 @@ final class CheckController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php index 31e195de..1d8dd947 100644 --- a/app/modules/web/Controllers/ConfigLdap/CheckImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/CheckImportController.php @@ -35,7 +35,7 @@ use SP\Core\Events\Event; use SP\Core\Exceptions\CheckException; use SP\Core\PhpExtensionChecker; use SP\Core\UI\ThemeInterface; -use SP\Domain\Auth\LdapCheckServiceInterface; +use SP\Domain\Auth\Ports\LdapCheckServiceInterface; use SP\Http\JsonResponse; use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\SimpleControllerBase; @@ -132,4 +132,4 @@ final class CheckImportController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigLdap/ImportController.php b/app/modules/web/Controllers/ConfigLdap/ImportController.php index 0e123c52..c5dbb9bf 100644 --- a/app/modules/web/Controllers/ConfigLdap/ImportController.php +++ b/app/modules/web/Controllers/ConfigLdap/ImportController.php @@ -38,7 +38,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Exceptions\ValidationException; use SP\Core\PhpExtensionChecker; use SP\Core\UI\ThemeInterface; -use SP\Domain\Import\LdapImportServiceInterface; +use SP\Domain\Import\Ports\LdapImportServiceInterface; use SP\Domain\Import\Services\LdapImportParams; use SP\Http\JsonResponse; use SP\Http\RequestInterface; @@ -174,4 +174,4 @@ final class ImportController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigMail/CheckController.php b/app/modules/web/Controllers/ConfigMail/CheckController.php index b1e6e0d3..b93b7888 100644 --- a/app/modules/web/Controllers/ConfigMail/CheckController.php +++ b/app/modules/web/Controllers/ConfigMail/CheckController.php @@ -34,7 +34,7 @@ use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; use SP\Core\Exceptions\ValidationException; use SP\Domain\Config\Services\ConfigUtil; -use SP\Domain\Notification\MailServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\ConfigTrait; @@ -139,4 +139,4 @@ final class CheckController extends SimpleControllerBase $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ConfigManager/IndexController.php b/app/modules/web/Controllers/ConfigManager/IndexController.php index ba6451f6..128dc482 100644 --- a/app/modules/web/Controllers/ConfigManager/IndexController.php +++ b/app/modules/web/Controllers/ConfigManager/IndexController.php @@ -40,15 +40,15 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\Core\Language; use SP\Core\MimeTypesInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Config\ConfigServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Crypt\Services\TemporaryMasterPassService; use SP\Domain\Export\Services\BackupFiles; use SP\Domain\Export\Services\XmlExportService; use SP\Domain\Task\Services\Task; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\File\FileException; @@ -592,4 +592,4 @@ final class IndexController extends ControllerBase { return $this->tabsHelper; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php index 48803550..6b1af859 100644 --- a/app/modules/web/Controllers/ControllerBase.php +++ b/app/modules/web/Controllers/ControllerBase.php @@ -40,7 +40,7 @@ use SP\Core\PhpExtensionChecker; use SP\Core\UI\ThemeInterface; use SP\DataModel\ProfileData; use SP\Domain\Auth\Services\AuthException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Domain\User\Services\UserLoginResponse; use SP\Http\RequestInterface; @@ -236,4 +236,4 @@ abstract class ControllerBase { return $this->userData->getIsAdminApp() || $this->acl->checkUserAccess($action); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/CustomField/CustomFieldSaveBase.php b/app/modules/web/Controllers/CustomField/CustomFieldSaveBase.php index b575e079..e6ecb397 100644 --- a/app/modules/web/Controllers/CustomField/CustomFieldSaveBase.php +++ b/app/modules/web/Controllers/CustomField/CustomFieldSaveBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\CustomField; use SP\Core\Application; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\CustomFieldDefForm; use SP\Mvc\Controller\WebControllerHelper; @@ -42,7 +42,7 @@ abstract class CustomFieldSaveBase extends ControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - CustomFieldDefServiceInterface $customFieldDefService + \SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface $customFieldDefService ) { parent::__construct($application, $webControllerHelper); @@ -51,4 +51,4 @@ abstract class CustomFieldSaveBase extends ControllerBase $this->customFieldDefService = $customFieldDefService; $this->form = new CustomFieldDefForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/CustomField/CustomFieldViewBase.php b/app/modules/web/Controllers/CustomField/CustomFieldViewBase.php index 5c15f5dd..30649e88 100644 --- a/app/modules/web/Controllers/CustomField/CustomFieldViewBase.php +++ b/app/modules/web/Controllers/CustomField/CustomFieldViewBase.php @@ -31,8 +31,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\CustomFieldDefinitionData; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; -use SP\Domain\CustomField\CustomFieldTypeServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeServiceInterface; use SP\Domain\CustomField\Services\CustomFieldDefService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; @@ -41,13 +40,13 @@ use SP\Mvc\View\Components\SelectItemAdapter; abstract class CustomFieldViewBase extends ControllerBase { - private CustomFieldDefServiceInterface $customFieldDefService; - private CustomFieldTypeServiceInterface $customFieldTypeService; + private \SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface $customFieldDefService; + private CustomFieldTypeServiceInterface $customFieldTypeService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - CustomFieldDefServiceInterface $customFieldDefService, + \SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface $customFieldDefService, CustomFieldTypeServiceInterface $customFieldTypeService ) { parent::__construct($application, $webControllerHelper); @@ -97,4 +96,4 @@ abstract class CustomFieldViewBase extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/CustomField/SearchController.php b/app/modules/web/Controllers/CustomField/SearchController.php index dab241f6..ff3a51b2 100644 --- a/app/modules/web/Controllers/CustomField/SearchController.php +++ b/app/modules/web/Controllers/CustomField/SearchController.php @@ -29,7 +29,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -51,7 +51,7 @@ final class SearchController extends ControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - CustomFieldDefServiceInterface $customFieldDefService, + \SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface $customFieldDefService, CustomFieldGrid $customFieldGrid ) { parent::__construct($application, $webControllerHelper); @@ -104,4 +104,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Eventlog/ClearController.php b/app/modules/web/Controllers/Eventlog/ClearController.php index 20ad9666..35af901a 100644 --- a/app/modules/web/Controllers/Eventlog/ClearController.php +++ b/app/modules/web/Controllers/Eventlog/ClearController.php @@ -29,7 +29,7 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Security\EventlogServiceInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -83,4 +83,4 @@ final class ClearController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Eventlog/SearchController.php b/app/modules/web/Controllers/Eventlog/SearchController.php index ea1e85c0..304c9e8d 100644 --- a/app/modules/web/Controllers/Eventlog/SearchController.php +++ b/app/modules/web/Controllers/Eventlog/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Eventlog; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Security\EventlogServiceInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -103,4 +103,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php index e9fb804d..98ab3ce6 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php @@ -37,21 +37,21 @@ use SP\DataModel\Dto\AccountEnrichedDto; use SP\DataModel\ItemPreset\AccountPermission; use SP\DataModel\ItemPreset\AccountPrivate; use SP\DataModel\ProfileData; -use SP\Domain\Account\AccountAclServiceInterface; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\AccountAclServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Domain\Account\Services\AccountAcl; use SP\Domain\Account\Services\PublicLinkService; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Crypt\MasterPassServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; -use SP\Domain\Tag\TagServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Mvc\Controller\ItemTrait; diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php index d1a5bf6d..cb504dff 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelperBase.php @@ -29,7 +29,7 @@ use SP\Core\Acl\Acl; use SP\Core\Acl\UnauthorizedPageException; use SP\Core\Application; use SP\Core\Exceptions\SPException; -use SP\Domain\Crypt\MasterPassServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Domain\User\Services\UpdatedMasterPassException; use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -87,4 +87,4 @@ abstract class AccountHelperBase extends HelperBase throw new UpdatedMasterPassException(SPException::INFO); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php index c9d5bb2f..5b94d66b 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -32,12 +32,12 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\AccountHistoryData; use SP\DataModel\Dto\AccountAclDto; -use SP\Domain\Account\AccountAclServiceInterface; -use SP\Domain\Account\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountAclServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Domain\Account\Services\AccountAcl; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Crypt\MasterPassServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Http\RequestInterface; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Mvc\View\TemplateInterface; @@ -61,7 +61,7 @@ final class AccountHistoryHelper extends AccountHelperBase TemplateInterface $template, RequestInterface $request, Acl $acl, - AccountHistoryServiceInterface $accountHistoryService, + \SP\Domain\Account\Ports\AccountHistoryServiceInterface $accountHistoryService, AccountActionsHelper $accountActionsHelper, MasterPassServiceInterface $masterPassService, AccountAclServiceInterface $accountAclService, @@ -171,4 +171,4 @@ final class AccountHistoryHelper extends AccountHelperBase throw new AccountPermissionException(SPException::INFO); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php index b39c6a31..b04d1a53 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php @@ -29,8 +29,8 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Session as CryptSession; -use SP\Domain\Account\Out\AccountPassData; -use SP\Domain\Crypt\MasterPassServiceInterface; +use SP\Domain\Account\Adapters\AccountPassData; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; use SP\Http\RequestInterface; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Modules\Web\Controllers\Helpers\HelperException; @@ -158,4 +158,4 @@ final class AccountPasswordHelper extends HelperBase ) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php index 934e89b9..47fd4e72 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php @@ -34,13 +34,12 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ProfileData; use SP\DataModel\UserPreferencesData; -use SP\Domain\Account\AccountSearchServiceInterface; use SP\Domain\Account\Search\AccountSearchConstants; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Domain\Account\Services\AccountSearchItem; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Html\DataGrid\Action\DataGridAction; use SP\Html\DataGrid\Action\DataGridActionSearch; use SP\Html\DataGrid\DataGrid; @@ -68,9 +67,9 @@ final class AccountSearchHelper extends HelperBase private int $queryTimeStart; private bool $isIndex; private ?AccountSearchFilter $accountSearchFilter = null; - private ClientServiceInterface $clientService; - private AccountSearchServiceInterface $accountSearchService; - private AccountActionsHelper $accountActionsHelper; + private ClientServiceInterface $clientService; + private \SP\Domain\Account\Ports\AccountSearchServiceInterface $accountSearchService; + private AccountActionsHelper $accountActionsHelper; private CategoryServiceInterface $categoryService; private TagServiceInterface $tagService; @@ -81,7 +80,7 @@ final class AccountSearchHelper extends HelperBase ClientServiceInterface $clientService, CategoryServiceInterface $categoryService, TagServiceInterface $tagService, - AccountSearchServiceInterface $accountSearchService, + \SP\Domain\Account\Ports\AccountSearchServiceInterface $accountSearchService, AccountActionsHelper $accountActionsHelper ) { parent::__construct($application, $template, $request); @@ -382,4 +381,4 @@ final class AccountSearchHelper extends HelperBase return $accountSearchFilter; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php index 01982df5..edcc3fe2 100644 --- a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Html\DataGrid\Action\DataGridAction; use SP\Html\DataGrid\Action\DataGridActionSearch; use SP\Html\DataGrid\Action\DataGridActionType; @@ -287,4 +287,4 @@ final class ItemPresetGrid extends GridBase return $gridAction; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/HelperBase.php b/app/modules/web/Controllers/Helpers/HelperBase.php index 355b457b..c6601c4e 100644 --- a/app/modules/web/Controllers/Helpers/HelperBase.php +++ b/app/modules/web/Controllers/Helpers/HelperBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Helpers; use SP\Core\Application; use SP\Core\Context\ContextInterface; use SP\Core\Events\EventDispatcher; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Http\Request; use SP\Http\RequestInterface; @@ -66,4 +66,4 @@ abstract class HelperBase $this->configData = $this->config->getConfigData(); $this->view = $template; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php index 449cb32c..c4ae2b5f 100644 --- a/app/modules/web/Controllers/Helpers/ItemPresetHelper.php +++ b/app/modules/web/Controllers/Helpers/ItemPresetHelper.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -32,9 +32,9 @@ use SP\DataModel\ItemPreset\AccountPrivate; use SP\DataModel\ItemPreset\Password; use SP\DataModel\ItemPreset\SessionTimeout; use SP\DataModel\ItemPresetData; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Http\RequestInterface; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Mvc\View\TemplateInterface; @@ -164,4 +164,4 @@ final class ItemPresetHelper extends HelperBase $userProfiles->getItemsFromModelSelected([$itemPresetData->getUserProfileId()]) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Install/InstallController.php b/app/modules/web/Controllers/Install/InstallController.php index 67c34704..bc36d247 100644 --- a/app/modules/web/Controllers/Install/InstallController.php +++ b/app/modules/web/Controllers/Install/InstallController.php @@ -27,8 +27,8 @@ namespace SP\Modules\Web\Controllers\Install; use Exception; use SP\Core\Application; -use SP\Domain\Install\In\InstallDataFactory; -use SP\Domain\Install\InstallerServiceInterface; +use SP\Domain\Install\Adapters\InstallDataFactory; +use SP\Domain\Install\Ports\InstallerServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -41,7 +41,7 @@ final class InstallController extends ControllerBase { use JsonTrait; - private InstallerServiceInterface $installer; + private \SP\Domain\Install\Ports\InstallerServiceInterface $installer; public function __construct( Application $application, @@ -71,4 +71,4 @@ final class InstallController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ItemManager/IndexController.php b/app/modules/web/Controllers/ItemManager/IndexController.php index 06476934..db39c9c4 100644 --- a/app/modules/web/Controllers/ItemManager/IndexController.php +++ b/app/modules/web/Controllers/ItemManager/IndexController.php @@ -31,14 +31,14 @@ use SP\Core\Events\Event; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Account\Ports\AccountFileServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Html\DataGrid\DataGridTab; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers; @@ -294,4 +294,4 @@ final class IndexController extends ControllerBase { return $this->tabsGridHelper; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ItemPreset/ItemPresetSaveBase.php b/app/modules/web/Controllers/ItemPreset/ItemPresetSaveBase.php index 35fd3c20..21aad467 100644 --- a/app/modules/web/Controllers/ItemPreset/ItemPresetSaveBase.php +++ b/app/modules/web/Controllers/ItemPreset/ItemPresetSaveBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\ItemPreset; use SP\Core\Application; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\ItemsPresetForm; use SP\Mvc\Controller\WebControllerHelper; @@ -36,8 +36,8 @@ use SP\Mvc\Controller\WebControllerHelper; */ abstract class ItemPresetSaveBase extends ControllerBase { - protected ItemPresetServiceInterface $itemPresetService; - protected ItemsPresetForm $form; + protected \SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface $itemPresetService; + protected ItemsPresetForm $form; public function __construct( Application $application, @@ -51,4 +51,4 @@ abstract class ItemPresetSaveBase extends ControllerBase $this->itemPresetService = $itemPresetService; $this->form = new ItemsPresetForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ItemPreset/ItemPresetViewBase.php b/app/modules/web/Controllers/ItemPreset/ItemPresetViewBase.php index e7107a47..e6648883 100644 --- a/app/modules/web/Controllers/ItemPreset/ItemPresetViewBase.php +++ b/app/modules/web/Controllers/ItemPreset/ItemPresetViewBase.php @@ -33,8 +33,7 @@ use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemPresetData; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\ItemPresetHelper; @@ -45,13 +44,13 @@ use SP\Mvc\Controller\WebControllerHelper; */ abstract class ItemPresetViewBase extends ControllerBase { - private ItemPresetServiceInterface $itemPresetService; - private ItemPresetHelper $itemPresetHelper; + private \SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface $itemPresetService; + private ItemPresetHelper $itemPresetHelper; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - ItemPresetServiceInterface $itemPresetService, + \SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface $itemPresetService, ItemPresetHelper $itemPresetHelper ) { parent::__construct($application, $webControllerHelper); @@ -95,7 +94,7 @@ abstract class ItemPresetViewBase extends ControllerBase case ItemPresetInterface::ITEM_TYPE_ACCOUNT_PRIVATE: $this->itemPresetHelper->makeAccountPrivateView($itemPresetData); break; - case ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT: + case \SP\Domain\ItemPreset\Ports\ItemPresetInterface::ITEM_TYPE_SESSION_TIMEOUT: $this->itemPresetHelper->makeSessionTimeoutView($itemPresetData); break; case ItemPresetInterface::ITEM_TYPE_ACCOUNT_PASSWORD: @@ -114,4 +113,4 @@ abstract class ItemPresetViewBase extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/ItemPreset/SearchController.php b/app/modules/web/Controllers/ItemPreset/SearchController.php index fccabb37..bb10c30d 100644 --- a/app/modules/web/Controllers/ItemPreset/SearchController.php +++ b/app/modules/web/Controllers/ItemPreset/SearchController.php @@ -27,7 +27,6 @@ namespace SP\Modules\Web\Controllers\ItemPreset; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -43,13 +42,13 @@ final class SearchController extends ControllerBase { use JsonTrait, ItemTrait; - private ItemPresetServiceInterface $itemPresetService; - private ItemPresetGrid $itemPresetGrid; + private \SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface $itemPresetService; + private ItemPresetGrid $itemPresetGrid; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - ItemPresetServiceInterface $itemPresetService, + \SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface $itemPresetService, ItemPresetGrid $itemPresetGrid ) { parent::__construct($application, $webControllerHelper); @@ -104,4 +103,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Items/AccountsUserController.php b/app/modules/web/Controllers/Items/AccountsUserController.php index 64519918..cdf06d90 100644 --- a/app/modules/web/Controllers/Items/AccountsUserController.php +++ b/app/modules/web/Controllers/Items/AccountsUserController.php @@ -25,7 +25,7 @@ namespace SP\Modules\Web\Controllers\Items; use SP\Core\Application; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Http\Json; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; @@ -78,4 +78,4 @@ final class AccountsUserController extends SimpleControllerBase Json::factory($this->router->response())->returnJson($jsonResponse); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Items/CategoriesController.php b/app/modules/web/Controllers/Items/CategoriesController.php index f82113d2..9ae0bf63 100644 --- a/app/modules/web/Controllers/Items/CategoriesController.php +++ b/app/modules/web/Controllers/Items/CategoriesController.php @@ -28,7 +28,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Category\CategoryServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Http\Json; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -63,4 +63,4 @@ final class CategoriesController extends SimpleControllerBase Json::factory($this->router->response()) ->returnRawJson(SelectItemAdapter::factory($this->categoryService->getAllBasic())->getJsonItemsFromModel()); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Items/ClientsController.php b/app/modules/web/Controllers/Items/ClientsController.php index 037dddd3..1fd3af69 100644 --- a/app/modules/web/Controllers/Items/ClientsController.php +++ b/app/modules/web/Controllers/Items/ClientsController.php @@ -25,7 +25,7 @@ namespace SP\Modules\Web\Controllers\Items; use SP\Core\Application; -use SP\Domain\Client\ClientServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; use SP\Http\Json; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -60,4 +60,4 @@ final class ClientsController extends SimpleControllerBase Json::factory($this->router->response()) ->returnRawJson(SelectItemAdapter::factory($this->clientService->getAllForUser())->getJsonItemsFromModel()); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Items/NotificationsController.php b/app/modules/web/Controllers/Items/NotificationsController.php index 625af33c..12d4adbf 100644 --- a/app/modules/web/Controllers/Items/NotificationsController.php +++ b/app/modules/web/Controllers/Items/NotificationsController.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Items; use SP\Core\Application; use SP\DataModel\NotificationData; -use SP\Domain\Notification\NotificationServiceInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Html\Html; use SP\Http\Json; use SP\Http\JsonResponse; @@ -86,4 +86,4 @@ final class NotificationsController extends SimpleControllerBase Json::factory($this->router->response())->returnJson($jsonResponse); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Items/TagsController.php b/app/modules/web/Controllers/Items/TagsController.php index 99696191..ff13cf0a 100644 --- a/app/modules/web/Controllers/Items/TagsController.php +++ b/app/modules/web/Controllers/Items/TagsController.php @@ -28,7 +28,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Http\Json; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Mvc\Controller\SimpleControllerHelper; @@ -63,4 +63,4 @@ final class TagsController extends SimpleControllerBase Json::factory($this->router->response()) ->returnRawJson(SelectItemAdapter::factory($this->tagService->getAllBasic())->getJsonItemsFromModel()); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Login/LoginController.php b/app/modules/web/Controllers/Login/LoginController.php index de17255a..f5d4236f 100644 --- a/app/modules/web/Controllers/Login/LoginController.php +++ b/app/modules/web/Controllers/Login/LoginController.php @@ -29,7 +29,7 @@ use SP\Core\Application; use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Auth\LoginServiceInterface; +use SP\Domain\Auth\Ports\LoginServiceInterface; use SP\Domain\Auth\Services\LoginService; use SP\Http\Uri; use SP\Modules\Web\Controllers\ControllerBase; @@ -122,4 +122,4 @@ final class LoginController extends ControllerBase ); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Notification/NotificationSaveBase.php b/app/modules/web/Controllers/Notification/NotificationSaveBase.php index 53a7aca7..650ad2aa 100644 --- a/app/modules/web/Controllers/Notification/NotificationSaveBase.php +++ b/app/modules/web/Controllers/Notification/NotificationSaveBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Notification; use SP\Core\Application; -use SP\Domain\Notification\NotificationServiceInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\NotificationForm; use SP\Mvc\Controller\WebControllerHelper; @@ -52,4 +52,4 @@ abstract class NotificationSaveBase extends ControllerBase $this->form = new NotificationForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Notification/NotificationViewBase.php b/app/modules/web/Controllers/Notification/NotificationViewBase.php index e664fb93..a0e3d949 100644 --- a/app/modules/web/Controllers/Notification/NotificationViewBase.php +++ b/app/modules/web/Controllers/Notification/NotificationViewBase.php @@ -31,8 +31,8 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\NotificationData; -use SP\Domain\Notification\NotificationServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -49,7 +49,7 @@ abstract class NotificationViewBase extends ControllerBase public function __construct( Application $application, WebControllerHelper $webControllerHelper, - NotificationServiceInterface $notificationService, + \SP\Domain\Notification\Ports\NotificationServiceInterface $notificationService, UserServiceInterface $userService ) { parent::__construct($application, $webControllerHelper); @@ -97,4 +97,4 @@ abstract class NotificationViewBase extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Notification/SearchController.php b/app/modules/web/Controllers/Notification/SearchController.php index d0086b7b..9fe9ee16 100644 --- a/app/modules/web/Controllers/Notification/SearchController.php +++ b/app/modules/web/Controllers/Notification/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Notification; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Notification\NotificationServiceInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -100,4 +100,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/DeleteController.php b/app/modules/web/Controllers/Plugin/DeleteController.php index 8b929e34..4a7cfc30 100644 --- a/app/modules/web/Controllers/Plugin/DeleteController.php +++ b/app/modules/web/Controllers/Plugin/DeleteController.php @@ -29,7 +29,7 @@ use Exception; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -43,7 +43,7 @@ final class DeleteController extends ControllerBase { use JsonTrait, ItemTrait; - private PluginServiceInterface $pluginService; + private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; public function __construct( Application $application, @@ -96,4 +96,4 @@ final class DeleteController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/DisableController.php b/app/modules/web/Controllers/Plugin/DisableController.php index 5692f72c..7dfb59b0 100644 --- a/app/modules/web/Controllers/Plugin/DisableController.php +++ b/app/modules/web/Controllers/Plugin/DisableController.php @@ -29,7 +29,6 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Plugin\PluginServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -42,12 +41,12 @@ final class DisableController extends ControllerBase { use JsonTrait; - private PluginServiceInterface $pluginService; + private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - PluginServiceInterface $pluginService + \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService ) { parent::__construct($application, $webControllerHelper); @@ -83,4 +82,4 @@ final class DisableController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/EnableController.php b/app/modules/web/Controllers/Plugin/EnableController.php index f44d5ab1..6012c83f 100644 --- a/app/modules/web/Controllers/Plugin/EnableController.php +++ b/app/modules/web/Controllers/Plugin/EnableController.php @@ -29,7 +29,7 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -42,7 +42,7 @@ final class EnableController extends ControllerBase { use JsonTrait; - private PluginServiceInterface $pluginService; + private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; public function __construct( Application $application, @@ -83,4 +83,4 @@ final class EnableController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/PluginSearchBase.php b/app/modules/web/Controllers/Plugin/PluginSearchBase.php index b205cb83..bdacf124 100644 --- a/app/modules/web/Controllers/Plugin/PluginSearchBase.php +++ b/app/modules/web/Controllers/Plugin/PluginSearchBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Plugin; use SP\Core\Application; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\PluginGrid; @@ -77,4 +77,4 @@ abstract class PluginSearchBase extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/ResetController.php b/app/modules/web/Controllers/Plugin/ResetController.php index 10860ffe..b3a15444 100644 --- a/app/modules/web/Controllers/Plugin/ResetController.php +++ b/app/modules/web/Controllers/Plugin/ResetController.php @@ -29,8 +29,7 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Plugin\PluginDataServiceInterface; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginDataServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -43,14 +42,14 @@ final class ResetController extends ControllerBase { use JsonTrait; - private PluginServiceInterface $pluginService; - private PluginDataServiceInterface $pluginDataService; + private \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService; + private PluginDataServiceInterface $pluginDataService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - PluginServiceInterface $pluginService, - PluginDataServiceInterface $pluginDataService + \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService, + \SP\Domain\Plugin\Ports\PluginDataServiceInterface $pluginDataService ) { parent::__construct($application, $webControllerHelper); @@ -87,4 +86,4 @@ final class ResetController extends ControllerBase return $this->returnJsonResponseException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Plugin/ViewController.php b/app/modules/web/Controllers/Plugin/ViewController.php index 49a8255a..b8624a6e 100644 --- a/app/modules/web/Controllers/Plugin/ViewController.php +++ b/app/modules/web/Controllers/Plugin/ViewController.php @@ -30,7 +30,7 @@ use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Http\JsonResponse; use SP\Infrastructure\Plugin\Repositories\PluginModel; use SP\Modules\Web\Controllers\ControllerBase; @@ -128,4 +128,4 @@ final class ViewController extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/PublicLink/PublicLinkSaveBase.php b/app/modules/web/Controllers/PublicLink/PublicLinkSaveBase.php index ec44d1dd..3db4a91d 100644 --- a/app/modules/web/Controllers/PublicLink/PublicLinkSaveBase.php +++ b/app/modules/web/Controllers/PublicLink/PublicLinkSaveBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\PublicLink; use SP\Core\Application; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\PublicLinkForm; use SP\Mvc\Controller\WebControllerHelper; @@ -51,4 +51,4 @@ abstract class PublicLinkSaveBase extends ControllerBase $this->publicLinkService = $publicLinkService; $this->form = new PublicLinkForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php b/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php index cf895b5b..d49bc1c2 100644 --- a/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php +++ b/app/modules/web/Controllers/PublicLink/PublicLinkViewBase.php @@ -30,8 +30,8 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Bootstrap\BootstrapWeb; use SP\DataModel\PublicLinkListData; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Domain\Account\Services\PublicLinkService; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -97,4 +97,4 @@ abstract class PublicLinkViewBase extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/PublicLink/SearchController.php b/app/modules/web/Controllers/PublicLink/SearchController.php index 400ba6da..c149317c 100644 --- a/app/modules/web/Controllers/PublicLink/SearchController.php +++ b/app/modules/web/Controllers/PublicLink/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\PublicLink; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -100,4 +100,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/SecurityManager/IndexController.php b/app/modules/web/Controllers/SecurityManager/IndexController.php index 7fc02603..d1dae16b 100644 --- a/app/modules/web/Controllers/SecurityManager/IndexController.php +++ b/app/modules/web/Controllers/SecurityManager/IndexController.php @@ -31,8 +31,8 @@ use SP\Core\Events\Event; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; -use SP\Domain\Security\EventlogServiceInterface; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Html\DataGrid\DataGridTab; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\EventlogGrid; @@ -149,4 +149,4 @@ final class IndexController extends ControllerBase { return $this->tabsGridHelper; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php index e514be08..7a48c2ad 100644 --- a/app/modules/web/Controllers/SimpleControllerBase.php +++ b/app/modules/web/Controllers/SimpleControllerBase.php @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SessionTimeout; use SP\Core\Exceptions\SPException; use SP\Core\PhpExtensionChecker; use SP\Core\UI\ThemeInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Http\Request; use SP\Modules\Web\Controllers\Traits\WebControllerTrait; @@ -109,4 +109,4 @@ abstract class SimpleControllerBase throw new UnauthorizedPageException(SPException::INFO); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Tag/SearchController.php b/app/modules/web/Controllers/Tag/SearchController.php index a9ceb922..dacff2c7 100644 --- a/app/modules/web/Controllers/Tag/SearchController.php +++ b/app/modules/web/Controllers/Tag/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\Tag; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -43,8 +43,8 @@ final class SearchController extends ControllerBase { use JsonTrait, ItemTrait; - private TagServiceInterface $tagService; - private TagGrid $tagGrid; + private \SP\Domain\Tag\Ports\TagServiceInterface $tagService; + private TagGrid $tagGrid; public function __construct( Application $application, @@ -103,4 +103,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Tag/TagSaveBase.php b/app/modules/web/Controllers/Tag/TagSaveBase.php index 2283790e..37d5a7d1 100644 --- a/app/modules/web/Controllers/Tag/TagSaveBase.php +++ b/app/modules/web/Controllers/Tag/TagSaveBase.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\Tag; use SP\Core\Application; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\TagForm; use SP\Mvc\Controller\WebControllerHelper; @@ -55,4 +55,4 @@ abstract class TagSaveBase extends ControllerBase $this->customFieldService = $customFieldService; $this->form = new TagForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Tag/TagViewBase.php b/app/modules/web/Controllers/Tag/TagViewBase.php index 8be7b289..85eafa3d 100644 --- a/app/modules/web/Controllers/Tag/TagViewBase.php +++ b/app/modules/web/Controllers/Tag/TagViewBase.php @@ -31,7 +31,7 @@ use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\TagData; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -41,7 +41,7 @@ use SP\Mvc\Controller\WebControllerHelper; */ abstract class TagViewBase extends ControllerBase { - private TagServiceInterface $tagService; + private \SP\Domain\Tag\Ports\TagServiceInterface $tagService; public function __construct( Application $application, @@ -84,4 +84,4 @@ abstract class TagViewBase extends ControllerBase $this->view->assign('readonly', false); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Task/TrackStatusController.php b/app/modules/web/Controllers/Task/TrackStatusController.php index 88116e5b..b43f6bf1 100644 --- a/app/modules/web/Controllers/Task/TrackStatusController.php +++ b/app/modules/web/Controllers/Task/TrackStatusController.php @@ -26,7 +26,6 @@ namespace SP\Modules\Web\Controllers\Task; use Klein\Response; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Task\TaskServiceInterface; /** * Class TrackStatusController @@ -35,10 +34,10 @@ use SP\Domain\Task\TaskServiceInterface; */ final class TrackStatusController { - private TaskServiceInterface $taskService; - private Response $response; + private \SP\Domain\Task\Ports\TaskServiceInterface $taskService; + private Response $response; - public function __construct(Response $response, TaskServiceInterface $taskService) + public function __construct(Response $response, \SP\Domain\Task\Ports\TaskServiceInterface $taskService) { $this->response = $response; $this->taskService = $taskService; @@ -72,4 +71,4 @@ final class TrackStatusController processException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Track/SearchController.php b/app/modules/web/Controllers/Track/SearchController.php index e64ebdb7..8e557020 100644 --- a/app/modules/web/Controllers/Track/SearchController.php +++ b/app/modules/web/Controllers/Track/SearchController.php @@ -29,7 +29,7 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Acl\UnauthorizedActionException; use SP\Core\Application; use SP\Core\Exceptions\SPException; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Controllers\Helpers\Grid\TrackGrid; @@ -102,4 +102,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Track/TrackBase.php b/app/modules/web/Controllers/Track/TrackBase.php index 1c42b4e0..c41e9a25 100644 --- a/app/modules/web/Controllers/Track/TrackBase.php +++ b/app/modules/web/Controllers/Track/TrackBase.php @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Controllers\Track; use SP\Core\Application; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -49,4 +49,4 @@ abstract class TrackBase extends ControllerBase $this->trackService = $trackService; } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Traits/ConfigTrait.php b/app/modules/web/Controllers/Traits/ConfigTrait.php index 691b70e6..0d2781c7 100644 --- a/app/modules/web/Controllers/Traits/ConfigTrait.php +++ b/app/modules/web/Controllers/Traits/ConfigTrait.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\Traits; use Exception; use SP\Core\Bootstrap\BootstrapBase; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Http\JsonResponse; use SP\Util\Util; @@ -76,4 +76,4 @@ trait ConfigTrait ); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Traits/WebControllerTrait.php b/app/modules/web/Controllers/Traits/WebControllerTrait.php index 0c76c647..d7acfd1f 100644 --- a/app/modules/web/Controllers/Traits/WebControllerTrait.php +++ b/app/modules/web/Controllers/Traits/WebControllerTrait.php @@ -25,7 +25,7 @@ namespace SP\Modules\Web\Controllers\Traits; use SP\Core\Exceptions\SPException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\RequestInterface; use SP\Mvc\Controller\ControllerTrait; @@ -76,4 +76,4 @@ trait WebControllerTrait fn($redirect) => $this->router->response()->redirect($redirect)->send(true) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/Upgrade/UpgradeController.php b/app/modules/web/Controllers/Upgrade/UpgradeController.php index 895fd9b9..f18b3b25 100644 --- a/app/modules/web/Controllers/Upgrade/UpgradeController.php +++ b/app/modules/web/Controllers/Upgrade/UpgradeController.php @@ -28,7 +28,7 @@ use Exception; use SP\Core\Application; use SP\Core\Exceptions\SPException; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Persistence\UpgradeDatabaseServiceInterface; +use SP\Domain\Persistence\Ports\UpgradeDatabaseServiceInterface; use SP\Domain\Upgrade\Services\UpgradeAppService; use SP\Domain\Upgrade\Services\UpgradeDatabaseService; use SP\Http\JsonResponse; @@ -130,4 +130,4 @@ final class UpgradeController extends ControllerBase $this->upgradeAppService->upgrade($appVersion, $this->configData); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/User/SearchController.php b/app/modules/web/Controllers/User/SearchController.php index ecefd2c9..596765ef 100644 --- a/app/modules/web/Controllers/User/SearchController.php +++ b/app/modules/web/Controllers/User/SearchController.php @@ -27,7 +27,6 @@ namespace SP\Modules\Web\Controllers\User; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\User\UserServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -43,13 +42,13 @@ final class SearchController extends ControllerBase { use JsonTrait, ItemTrait; - private UserServiceInterface $userService; - private UserGrid $userGrid; + private \SP\Domain\User\Ports\UserServiceInterface $userService; + private UserGrid $userGrid; public function __construct( Application $application, WebControllerHelper $webControllerHelper, - UserServiceInterface $userService, + \SP\Domain\User\Ports\UserServiceInterface $userService, UserGrid $userGrid ) { parent::__construct($application, $webControllerHelper); @@ -103,4 +102,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/User/UserSaveBase.php b/app/modules/web/Controllers/User/UserSaveBase.php index f5d7e090..c9c37351 100644 --- a/app/modules/web/Controllers/User/UserSaveBase.php +++ b/app/modules/web/Controllers/User/UserSaveBase.php @@ -27,11 +27,11 @@ namespace SP\Modules\Web\Controllers\User; use SP\Core\Application; use SP\DataModel\UserData; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\Notification\MailServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; +use SP\Domain\User\Ports\UserPassRecoverServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserPassRecoverService; -use SP\Domain\User\UserPassRecoverServiceInterface; -use SP\Domain\User\UserServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\UserForm; use SP\Mvc\Controller\WebControllerHelper; @@ -88,4 +88,4 @@ abstract class UserSaveBase extends ControllerBase ); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/User/UserViewBase.php b/app/modules/web/Controllers/User/UserViewBase.php index cf082c97..777a2e63 100644 --- a/app/modules/web/Controllers/User/UserViewBase.php +++ b/app/modules/web/Controllers/User/UserViewBase.php @@ -29,10 +29,9 @@ use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\DataModel\UserData; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -45,16 +44,16 @@ abstract class UserViewBase extends ControllerBase { use ItemTrait; - protected UserServiceInterface $userService; - private UserGroupServiceInterface $userGroupService; - private UserProfileServiceInterface $userProfileService; + protected UserServiceInterface $userService; + private \SP\Domain\User\Ports\UserGroupServiceInterface $userGroupService; + private UserProfileServiceInterface $userProfileService; private CustomFieldServiceInterface $customFieldService; public function __construct( Application $application, WebControllerHelper $webControllerHelper, UserServiceInterface $userService, - UserGroupServiceInterface $userGroupService, + \SP\Domain\User\Ports\UserGroupServiceInterface $userGroupService, UserProfileServiceInterface $userProfileService, CustomFieldServiceInterface $customFieldService ) { @@ -146,4 +145,4 @@ abstract class UserViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::USER, $userId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserGroup/SearchController.php b/app/modules/web/Controllers/UserGroup/SearchController.php index 42235289..691a9413 100644 --- a/app/modules/web/Controllers/UserGroup/SearchController.php +++ b/app/modules/web/Controllers/UserGroup/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\UserGroup; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\User\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -100,4 +100,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserGroup/UserGroupSaveBase.php b/app/modules/web/Controllers/UserGroup/UserGroupSaveBase.php index c79418cf..29756563 100644 --- a/app/modules/web/Controllers/UserGroup/UserGroupSaveBase.php +++ b/app/modules/web/Controllers/UserGroup/UserGroupSaveBase.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\UserGroup; use SP\Core\Application; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\UserGroupForm; use SP\Mvc\Controller\WebControllerHelper; @@ -56,4 +56,4 @@ abstract class UserGroupSaveBase extends ControllerBase $this->form = new UserGroupForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserGroup/UserGroupViewBase.php b/app/modules/web/Controllers/UserGroup/UserGroupViewBase.php index 14d4216f..88ae26ee 100644 --- a/app/modules/web/Controllers/UserGroup/UserGroupViewBase.php +++ b/app/modules/web/Controllers/UserGroup/UserGroupViewBase.php @@ -29,9 +29,9 @@ use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\DataModel\UserGroupData; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -114,4 +114,4 @@ abstract class UserGroupViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::GROUP, $userGroupId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserPassReset/UserPassResetSaveBase.php b/app/modules/web/Controllers/UserPassReset/UserPassResetSaveBase.php index 1a016d2e..794c7ccc 100644 --- a/app/modules/web/Controllers/UserPassReset/UserPassResetSaveBase.php +++ b/app/modules/web/Controllers/UserPassReset/UserPassResetSaveBase.php @@ -28,10 +28,10 @@ namespace SP\Modules\Web\Controllers\UserPassReset; use Exception; use SP\Core\Application; use SP\Core\Exceptions\SPException; -use SP\Domain\Notification\MailServiceInterface; -use SP\Domain\Security\TrackServiceInterface; -use SP\Domain\User\UserPassRecoverServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; +use SP\Domain\User\Ports\UserPassRecoverServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Security\Repositories\TrackRequest; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\WebControllerHelper; @@ -92,4 +92,4 @@ abstract class UserPassResetSaveBase extends ControllerBase processException($e); } } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserProfile/SearchController.php b/app/modules/web/Controllers/UserProfile/SearchController.php index 0b51cb7d..71a86bfb 100644 --- a/app/modules/web/Controllers/UserProfile/SearchController.php +++ b/app/modules/web/Controllers/UserProfile/SearchController.php @@ -27,7 +27,7 @@ namespace SP\Modules\Web\Controllers\UserProfile; use SP\Core\Acl\ActionsInterface; use SP\Core\Application; -use SP\Domain\User\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Html\DataGrid\DataGridInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\ControllerBase; @@ -103,4 +103,4 @@ final class SearchController extends ControllerBase $itemSearchData ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserProfile/UserProfileSaveBase.php b/app/modules/web/Controllers/UserProfile/UserProfileSaveBase.php index 377bd7fd..51f48940 100644 --- a/app/modules/web/Controllers/UserProfile/UserProfileSaveBase.php +++ b/app/modules/web/Controllers/UserProfile/UserProfileSaveBase.php @@ -26,8 +26,8 @@ namespace SP\Modules\Web\Controllers\UserProfile; use SP\Core\Application; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Modules\Web\Forms\UserProfileForm; use SP\Mvc\Controller\WebControllerHelper; @@ -55,4 +55,4 @@ abstract class UserProfileSaveBase extends ControllerBase $this->customFieldService = $customFieldService; $this->form = new UserProfileForm($application, $this->request); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserProfile/UserProfileViewBase.php b/app/modules/web/Controllers/UserProfile/UserProfileViewBase.php index 5235c367..fde3df16 100644 --- a/app/modules/web/Controllers/UserProfile/UserProfileViewBase.php +++ b/app/modules/web/Controllers/UserProfile/UserProfileViewBase.php @@ -30,8 +30,8 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\DataModel\ProfileData; use SP\DataModel\UserProfileData; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Modules\Web\Controllers\ControllerBase; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\Controller\WebControllerHelper; @@ -105,4 +105,4 @@ abstract class UserProfileViewBase extends ControllerBase $this->getCustomFieldsForItem(ActionsInterface::PROFILE, $profileId, $this->customFieldService) ); } -} \ No newline at end of file +} diff --git a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php index 23805421..25a56a7f 100644 --- a/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php +++ b/app/modules/web/Controllers/UserSettingsGeneral/SaveController.php @@ -28,9 +28,9 @@ use Exception; use SP\Core\Application; use SP\Core\Events\Event; use SP\DataModel\UserPreferencesData; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserLoginResponse; use SP\Domain\User\Services\UserService; -use SP\Domain\User\UserServiceInterface; use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\SimpleControllerBase; use SP\Modules\Web\Controllers\Traits\JsonTrait; @@ -110,4 +110,4 @@ final class SaveController extends SimpleControllerBase return $userPreferencesData; } -} \ No newline at end of file +} diff --git a/app/modules/web/Forms/AccountForm.php b/app/modules/web/Forms/AccountForm.php index 4419cda4..1c0d532b 100644 --- a/app/modules/web/Forms/AccountForm.php +++ b/app/modules/web/Forms/AccountForm.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -30,7 +30,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Account\AccountPresetServiceInterface; +use SP\Domain\Account\Ports\AccountPresetServiceInterface; use SP\Domain\Account\Services\AccountRequest; use SP\Http\RequestInterface; @@ -213,4 +213,4 @@ final class AccountForm extends FormBase implements FormInterface { return $this->accountRequest; } -} \ No newline at end of file +} diff --git a/app/modules/web/Forms/FormBase.php b/app/modules/web/Forms/FormBase.php index 9c9f3f39..da8199f1 100644 --- a/app/modules/web/Forms/FormBase.php +++ b/app/modules/web/Forms/FormBase.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Modules\Web\Forms; use SP\Core\Application; use SP\Core\Context\ContextInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; use SP\Http\Request; use SP\Http\RequestInterface; @@ -75,4 +75,4 @@ abstract class FormBase * Analizar los datos de la petición HTTP */ abstract protected function analyzeRequestData(); -} \ No newline at end of file +} diff --git a/app/modules/web/Forms/ItemsPresetForm.php b/app/modules/web/Forms/ItemsPresetForm.php index ff7cbef9..c7eec2d6 100644 --- a/app/modules/web/Forms/ItemsPresetForm.php +++ b/app/modules/web/Forms/ItemsPresetForm.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -32,7 +32,7 @@ use SP\DataModel\ItemPreset\AccountPrivate; use SP\DataModel\ItemPreset\Password; use SP\DataModel\ItemPreset\SessionTimeout; use SP\DataModel\ItemPresetData; -use SP\Domain\ItemPreset\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Domain\ItemPreset\Services\ItemPresetRequest; use SP\Mvc\Controller\Validators\Validator; @@ -213,4 +213,4 @@ final class ItemsPresetForm extends FormBase implements FormInterface { return $this->itemPresetRequest; } -} \ No newline at end of file +} diff --git a/app/modules/web/Init.php b/app/modules/web/Init.php index 45684e51..ea2560ab 100644 --- a/app/modules/web/Init.php +++ b/app/modules/web/Init.php @@ -47,15 +47,15 @@ use SP\Core\LanguageInterface; use SP\Core\ProvidersHelper; use SP\Core\UI\ThemeInterface; use SP\DataModel\ItemPreset\SessionTimeout; -use SP\Domain\Crypt\SecureSessionServiceInterface; +use SP\Domain\Crypt\Ports\SecureSessionServiceInterface; use SP\Domain\Crypt\Services\SecureSessionService; -use SP\Domain\ItemPreset\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; use SP\Domain\ItemPreset\Services\ItemPresetService; use SP\Domain\Upgrade\Services\UpgradeAppService; use SP\Domain\Upgrade\Services\UpgradeDatabaseService; use SP\Domain\Upgrade\Services\UpgradeUtil; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Services\UserProfileService; -use SP\Domain\User\UserProfileServiceInterface; use SP\Http\Address; use SP\Http\RequestInterface; use SP\Http\Uri; @@ -449,4 +449,4 @@ final class Init extends HttpModuleBase { return (new Uri(BootstrapWeb::$WEBROOT))->addParam('r', $route)->getUri(); } -} \ No newline at end of file +} diff --git a/app/modules/web/themes/material-blue/views/account/account-editpass.inc b/app/modules/web/themes/material-blue/views/account/account-editpass.inc index eba779a9..7725a27c 100644 --- a/app/modules/web/themes/material-blue/views/account/account-editpass.inc +++ b/app/modules/web/themes/material-blue/views/account/account-editpass.inc @@ -27,7 +27,7 @@ * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/account/account-history.inc b/app/modules/web/themes/material-blue/views/account/account-history.inc index e64cabc9..a8daa4c4 100644 --- a/app/modules/web/themes/material-blue/views/account/account-history.inc +++ b/app/modules/web/themes/material-blue/views/account/account-history.inc @@ -27,7 +27,7 @@ * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/account/account-link.inc b/app/modules/web/themes/material-blue/views/account/account-link.inc index 298a35fc..7919be82 100644 --- a/app/modules/web/themes/material-blue/views/account/account-link.inc +++ b/app/modules/web/themes/material-blue/views/account/account-link.inc @@ -27,7 +27,7 @@ * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; @@ -163,4 +163,4 @@ $accountData = $_getvar('accountData'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/account-permissions.inc b/app/modules/web/themes/material-blue/views/account/account-permissions.inc index 85b36dee..0ecc54ff 100644 --- a/app/modules/web/themes/material-blue/views/account/account-permissions.inc +++ b/app/modules/web/themes/material-blue/views/account/account-permissions.inc @@ -1,10 +1,33 @@ . + */ + /** * @var callable $_getvar * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var AccountPrivate $accountPrivate */ diff --git a/app/modules/web/themes/material-blue/views/account/account-request.inc b/app/modules/web/themes/material-blue/views/account/account-request.inc index 180731fd..600f59a1 100644 --- a/app/modules/web/themes/material-blue/views/account/account-request.inc +++ b/app/modules/web/themes/material-blue/views/account/account-request.inc @@ -1,10 +1,33 @@ . + */ + /** * @var callable $_getvar * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; @@ -88,4 +111,4 @@ $accountData = $_getvar('accountData'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/actions.inc b/app/modules/web/themes/material-blue/views/account/actions.inc index b89208ca..033a8dc8 100644 --- a/app/modules/web/themes/material-blue/views/account/actions.inc +++ b/app/modules/web/themes/material-blue/views/account/actions.inc @@ -1,10 +1,33 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; @@ -52,4 +75,4 @@ use SP\Html\DataGrid\Action\DataGridActionInterface; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/details.inc b/app/modules/web/themes/material-blue/views/account/details.inc index 74db973a..d19c62a6 100644 --- a/app/modules/web/themes/material-blue/views/account/details.inc +++ b/app/modules/web/themes/material-blue/views/account/details.inc @@ -1,10 +1,33 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/account/files-list.inc b/app/modules/web/themes/material-blue/views/account/files-list.inc index d0b808d5..11782776 100644 --- a/app/modules/web/themes/material-blue/views/account/files-list.inc +++ b/app/modules/web/themes/material-blue/views/account/files-list.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var FileData $file */ @@ -65,4 +88,4 @@ use SP\Html\Html; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/files.inc b/app/modules/web/themes/material-blue/views/account/files.inc index 8cbfc97c..f6b5c644 100644 --- a/app/modules/web/themes/material-blue/views/account/files.inc +++ b/app/modules/web/themes/material-blue/views/account/files.inc @@ -1,10 +1,33 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc index 64aaceb6..0fe39866 100644 --- a/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc +++ b/app/modules/web/themes/material-blue/views/account/linkedAccounts.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/account/search-header.inc b/app/modules/web/themes/material-blue/views/account/search-header.inc index 25cdc018..58415a77 100644 --- a/app/modules/web/themes/material-blue/views/account/search-header.inc +++ b/app/modules/web/themes/material-blue/views/account/search-header.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var AccountSearchItem $account * @var DataGridTab $data */ @@ -50,4 +73,4 @@ if (!isset($data)) {
  • - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/search-index.inc b/app/modules/web/themes/material-blue/views/account/search-index.inc index 3e4c5e36..b434d306 100644 --- a/app/modules/web/themes/material-blue/views/account/search-index.inc +++ b/app/modules/web/themes/material-blue/views/account/search-index.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var AccountSearchItem $account * @var DataGrid $data */ diff --git a/app/modules/web/themes/material-blue/views/account/search-rows.inc b/app/modules/web/themes/material-blue/views/account/search-rows.inc index 43fa294a..ab3509e5 100644 --- a/app/modules/web/themes/material-blue/views/account/search-rows.inc +++ b/app/modules/web/themes/material-blue/views/account/search-rows.inc @@ -25,7 +25,7 @@ /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var AccountSearchItem $account * @var DataGridTab $data * @var DataGridActionBase $actionMenu @@ -363,4 +363,4 @@ $favoriteRouteOff = $_getvar('favoriteRouteOff'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc index 43777145..fb9bd8c0 100644 --- a/app/modules/web/themes/material-blue/views/account/search-searchbox.inc +++ b/app/modules/web/themes/material-blue/views/account/search-searchbox.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ThemeIcons $icons * @var callable $_getvar - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var AccountSearchItem $account * @var DataGrid $data */ @@ -151,4 +174,4 @@ $pager = $data->getPager(); value=""/> - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/account/viewpass.inc b/app/modules/web/themes/material-blue/views/account/viewpass.inc index 389627b0..843d0923 100644 --- a/app/modules/web/themes/material-blue/views/account/viewpass.inc +++ b/app/modules/web/themes/material-blue/views/account/viewpass.inc @@ -1,10 +1,33 @@ . + */ + /** * @var callable $_getvar * @var ThemeIcons $icons * @var AccountExtData $accountData * @var AccountAcl $accountAcl - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData */ use SP\Core\UI\ThemeIcons; diff --git a/app/modules/web/themes/material-blue/views/config/accounts.inc b/app/modules/web/themes/material-blue/views/config/accounts.inc index b6959c83..34a9b12a 100644 --- a/app/modules/web/themes/material-blue/views/config/accounts.inc +++ b/app/modules/web/themes/material-blue/views/config/accounts.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/backup.inc b/app/modules/web/themes/material-blue/views/config/backup.inc index 9d184bae..187706b8 100644 --- a/app/modules/web/themes/material-blue/views/config/backup.inc +++ b/app/modules/web/themes/material-blue/views/config/backup.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var callable $_getRoute * @var \SP\Mvc\View\TemplateInterface $this diff --git a/app/modules/web/themes/material-blue/views/config/encryption.inc b/app/modules/web/themes/material-blue/views/config/encryption.inc index a49b3025..1fa1f33b 100644 --- a/app/modules/web/themes/material-blue/views/config/encryption.inc +++ b/app/modules/web/themes/material-blue/views/config/encryption.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/general-auth.inc b/app/modules/web/themes/material-blue/views/config/general-auth.inc index 3d0d4e1b..1590140a 100644 --- a/app/modules/web/themes/material-blue/views/config/general-auth.inc +++ b/app/modules/web/themes/material-blue/views/config/general-auth.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -130,4 +153,4 @@ use SP\Mvc\View\Components\SelectItem; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/config/general-events.inc b/app/modules/web/themes/material-blue/views/config/general-events.inc index dfaa14dc..609f1b38 100644 --- a/app/modules/web/themes/material-blue/views/config/general-events.inc +++ b/app/modules/web/themes/material-blue/views/config/general-events.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -121,4 +144,4 @@ use SP\Mvc\View\Components\SelectItem; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/config/general-proxy.inc b/app/modules/web/themes/material-blue/views/config/general-proxy.inc index 432ab9bb..8822bd9f 100644 --- a/app/modules/web/themes/material-blue/views/config/general-proxy.inc +++ b/app/modules/web/themes/material-blue/views/config/general-proxy.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -100,4 +123,4 @@ use SP\Core\UI\ThemeIcons; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/config/general-site.inc b/app/modules/web/themes/material-blue/views/config/general-site.inc index e3831e77..30fe15a3 100644 --- a/app/modules/web/themes/material-blue/views/config/general-site.inc +++ b/app/modules/web/themes/material-blue/views/config/general-site.inc @@ -24,7 +24,7 @@ /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -252,4 +252,4 @@ use SP\Mvc\View\Components\SelectItem; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/config/general.inc b/app/modules/web/themes/material-blue/views/config/general.inc index 70939fd1..58e230e9 100644 --- a/app/modules/web/themes/material-blue/views/config/general.inc +++ b/app/modules/web/themes/material-blue/views/config/general.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/import.inc b/app/modules/web/themes/material-blue/views/config/import.inc index f995ffc1..5699bdb2 100644 --- a/app/modules/web/themes/material-blue/views/config/import.inc +++ b/app/modules/web/themes/material-blue/views/config/import.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/info.inc b/app/modules/web/themes/material-blue/views/config/info.inc index 205dce50..cde1b28d 100644 --- a/app/modules/web/themes/material-blue/views/config/info.inc +++ b/app/modules/web/themes/material-blue/views/config/info.inc @@ -24,7 +24,7 @@ /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/ldap.inc b/app/modules/web/themes/material-blue/views/config/ldap.inc index bea3684b..43e84d90 100644 --- a/app/modules/web/themes/material-blue/views/config/ldap.inc +++ b/app/modules/web/themes/material-blue/views/config/ldap.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -681,4 +704,4 @@ use SP\Mvc\View\Components\SelectItem; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/config/mail.inc b/app/modules/web/themes/material-blue/views/config/mail.inc index 0e176b6a..1320ed51 100644 --- a/app/modules/web/themes/material-blue/views/config/mail.inc +++ b/app/modules/web/themes/material-blue/views/config/mail.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc b/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc index 42177e2e..4b0fadcc 100644 --- a/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc +++ b/app/modules/web/themes/material-blue/views/config/wiki-dokuwiki.inc @@ -24,7 +24,7 @@ /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/config/wiki.inc b/app/modules/web/themes/material-blue/views/config/wiki.inc index 7371e77c..28fd8132 100644 --- a/app/modules/web/themes/material-blue/views/config/wiki.inc +++ b/app/modules/web/themes/material-blue/views/config/wiki.inc @@ -24,7 +24,7 @@ /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc index 41a91bbf..f28792dc 100644 --- a/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc +++ b/app/modules/web/themes/material-blue/views/eventlog/datagrid-rows.inc @@ -1,8 +1,31 @@ . + */ + /** * @var SP\Html\DataGrid\DataGridTab $data * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -25,4 +48,4 @@ $data = $_getvar('data'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc index fb82a4fd..79fa08aa 100644 --- a/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc +++ b/app/modules/web/themes/material-blue/views/grid/datagrid-grid.inc @@ -1,9 +1,32 @@ . + */ + /** * @var DataGridAction|DataGridActionSearch $action * @var SP\Html\DataGrid\DataGridTab $data * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc index 099728b5..de849fec 100644 --- a/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc +++ b/app/modules/web/themes/material-blue/views/grid/datatabs-grid.inc @@ -1,8 +1,31 @@ . + */ + /** * @var SP\Html\DataGrid\DataGridTab $data * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -28,4 +51,4 @@ $tabs = $_getvar('tabs'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/install/index.inc b/app/modules/web/themes/material-blue/views/install/index.inc index c23ee40c..60bce517 100644 --- a/app/modules/web/themes/material-blue/views/install/index.inc +++ b/app/modules/web/themes/material-blue/views/install/index.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc index 2f41ba57..65266457 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/account_bulkedit.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this * @var SelectItem $client diff --git a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc index 3f4b608b..31c3bdc1 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/auth_token.inc @@ -1,8 +1,31 @@ . + */ + /** * @var AuthTokenData $authToken * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -103,4 +126,4 @@ $authToken = $_getvar('authToken'); getIconSave()->getIcon(); ?> - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/category.inc b/app/modules/web/themes/material-blue/views/itemshow/category.inc index e09135d5..a231500f 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/category.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/category.inc @@ -1,8 +1,31 @@ . + */ + /** * @var CategoryData $category * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/client.inc b/app/modules/web/themes/material-blue/views/itemshow/client.inc index bb3b9a4d..818172a4 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/client.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/client.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ClientData $client * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -92,4 +115,4 @@ $client = $_getvar('client'); getIconSave()->getIcon(); ?> - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc index 28506f2c..58aa9918 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/custom_field.inc @@ -1,8 +1,31 @@ . + */ + /** * @var CustomFieldDefinitionData $field * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/file.inc b/app/modules/web/themes/material-blue/views/itemshow/file.inc index 52397b33..737387fd 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/file.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/file.inc @@ -1,8 +1,31 @@ . + */ + /** * @var FileData $fileData * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -19,4 +42,4 @@ $fileData = $_getvar('fileData');
    getName(), ENT_QUOTES); ?>
    - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc index 11113fd6..4678eada 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-password.inc @@ -1,8 +1,31 @@ . + */ + /** * @var Password $password * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -173,4 +196,4 @@ $password = $_getvar('password'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc index db26ff40..4bcac31b 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -98,4 +121,4 @@ use SP\Mvc\View\Components\SelectItem; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc index e0f0a91a..baa71d88 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-private.inc @@ -1,8 +1,31 @@ . + */ + /** * @var AccountPrivate $private * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -62,4 +85,4 @@ $private = $_getvar('private'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc index 9305a9aa..67a67ce1 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset-session_timeout.inc @@ -1,8 +1,31 @@ . + */ + /** * @var SessionTimeout $sessionTimeout * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -42,4 +65,4 @@ $sessionTimeout = $_getvar('sessionTimeout'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc index 515a4998..278c42ca 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/item_preset.inc @@ -1,8 +1,31 @@ . + */ + /** * @var ItemPresetData $preset * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc index d4b4a7bf..9b02bcda 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/public_link.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/public_link.inc @@ -1,8 +1,31 @@ . + */ + /** * @var PublicLinkListData $publicLink * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/results.inc b/app/modules/web/themes/material-blue/views/itemshow/results.inc index 9215091a..7048d06f 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/results.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/results.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/tag.inc b/app/modules/web/themes/material-blue/views/itemshow/tag.inc index d9a004f9..31dbdcb5 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/tag.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/tag.inc @@ -1,8 +1,31 @@ . + */ + /** * @var TagData $tag * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/user.inc b/app/modules/web/themes/material-blue/views/itemshow/user.inc index d7be6ac5..07e17ff2 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user.inc @@ -1,8 +1,31 @@ . + */ + /** * @var UserData $user * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc index 186930b2..585dcb60 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user_group.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user_group.inc @@ -1,9 +1,32 @@ . + */ + /** * @var UserToUserGroupData $groupUsers * @var UserGroupData $group * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc index 151ca0a3..99292ed1 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user_pass.inc @@ -1,8 +1,31 @@ . + */ + /** * @var UserData $user * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -85,4 +108,4 @@ $user = $_getvar('user'); getIconSave()->getIcon(); ?> - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc index 90cd3201..985b1085 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user_profile.inc @@ -1,9 +1,32 @@ . + */ + /** * @var ProfileData $profileData * @var UserProfileData $profile * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/login/index.inc b/app/modules/web/themes/material-blue/views/login/index.inc index ecfb5ef6..d5b54ebd 100644 --- a/app/modules/web/themes/material-blue/views/login/index.inc +++ b/app/modules/web/themes/material-blue/views/login/index.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -111,4 +134,4 @@ use SP\Core\UI\ThemeIcons; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/main/update.inc b/app/modules/web/themes/material-blue/views/main/update.inc index e2a7f8e1..30610120 100644 --- a/app/modules/web/themes/material-blue/views/main/update.inc +++ b/app/modules/web/themes/material-blue/views/main/update.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -45,4 +68,4 @@ use SP\Core\UI\ThemeIcons; - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/main/upgrade.inc b/app/modules/web/themes/material-blue/views/main/upgrade.inc index 33f89063..93a93a1c 100644 --- a/app/modules/web/themes/material-blue/views/main/upgrade.inc +++ b/app/modules/web/themes/material-blue/views/main/upgrade.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/notification/notification.inc b/app/modules/web/themes/material-blue/views/notification/notification.inc index edd42cef..f162c24b 100644 --- a/app/modules/web/themes/material-blue/views/notification/notification.inc +++ b/app/modules/web/themes/material-blue/views/notification/notification.inc @@ -1,8 +1,31 @@ . + */ + /** * @var NotificationData $notification * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -162,4 +185,4 @@ $notification = $_getvar('notification'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/plugin/plugin.inc b/app/modules/web/themes/material-blue/views/plugin/plugin.inc index 06176008..67ba9c29 100644 --- a/app/modules/web/themes/material-blue/views/plugin/plugin.inc +++ b/app/modules/web/themes/material-blue/views/plugin/plugin.inc @@ -1,9 +1,32 @@ . + */ + /** * @var PluginModel $plugin * @var PluginInterface $pluginInfo * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ @@ -93,4 +116,4 @@ $pluginInfo = $_getvar('pluginInfo'); - \ No newline at end of file + diff --git a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc index 6bb76193..5c97ae6e 100644 --- a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc +++ b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/usersettings/general.inc b/app/modules/web/themes/material-blue/views/usersettings/general.inc index d66c2a79..503995bf 100644 --- a/app/modules/web/themes/material-blue/views/usersettings/general.inc +++ b/app/modules/web/themes/material-blue/views/usersettings/general.inc @@ -1,8 +1,31 @@ . + */ + /** * @var UserPreferencesData $userPreferences * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc index bb7fde55..d39909c5 100644 --- a/app/modules/web/themes/material-blue/views/wiki/wikipage.inc +++ b/app/modules/web/themes/material-blue/views/wiki/wikipage.inc @@ -1,7 +1,30 @@ . + */ + /** * @var ThemeIcons $icons - * @var \SP\Domain\Config\In\ConfigDataInterface $configData + * @var \SP\Domain\Config\Ports\ConfigDataInterface $configData * @var callable $_getvar * @var \SP\Mvc\View\TemplateInterface $this */ diff --git a/lib/SP/Core/Application.php b/lib/SP/Core/Application.php index 204fd99c..cda43f8c 100644 --- a/lib/SP/Core/Application.php +++ b/lib/SP/Core/Application.php @@ -27,7 +27,7 @@ namespace SP\Core; use SP\Core\Context\ContextInterface; use SP\Core\Events\EventDispatcher; -use SP\Domain\Config\ConfigInterface; +use SP\Domain\Config\Ports\ConfigInterface; /** * The Application helper class. It holds all the needed dependencies for the application @@ -69,4 +69,4 @@ final class Application { return $this->context; } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Bootstrap/BootstrapBase.php b/lib/SP/Core/Bootstrap/BootstrapBase.php index 6b647572..8a78c2ce 100644 --- a/lib/SP/Core/Bootstrap/BootstrapBase.php +++ b/lib/SP/Core/Bootstrap/BootstrapBase.php @@ -37,7 +37,7 @@ use SP\Core\Exceptions\InitializationException; use SP\Core\Exceptions\SPException; use SP\Core\Language; use SP\Core\PhpExtensionChecker; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigUtil; use SP\Http\RequestInterface; use SP\Plugin\PluginManager; @@ -339,4 +339,4 @@ abstract class BootstrapBase throw new RuntimeException($e); } } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Bootstrap/UpgradeConfigChecker.php b/lib/SP/Core/Bootstrap/UpgradeConfigChecker.php index 2f88b870..c88e983f 100644 --- a/lib/SP/Core/Bootstrap/UpgradeConfigChecker.php +++ b/lib/SP/Core/Bootstrap/UpgradeConfigChecker.php @@ -25,9 +25,9 @@ namespace SP\Core\Bootstrap; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\UpgradeConfigServiceInterface; use SP\Domain\Config\Services\UpgradeConfigService; -use SP\Domain\Config\UpgradeConfigServiceInterface; use SP\Domain\Upgrade\Services\UpgradeUtil; use SP\Util\VersionUtil; @@ -71,4 +71,4 @@ class UpgradeConfigChecker $this->upgradeConfigService->upgrade($configVersion, $this->configData); } } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Crypt/CSRF.php b/lib/SP/Core/Crypt/CSRF.php index 87bb646e..4a215f82 100644 --- a/lib/SP/Core/Crypt/CSRF.php +++ b/lib/SP/Core/Crypt/CSRF.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Core\Crypt; use SP\Core\Context\ContextInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\Request; use SP\Http\RequestInterface; @@ -46,7 +46,7 @@ class CSRF * * @param ContextInterface $context * @param RequestInterface $request - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData */ public function __construct( ContextInterface $context, @@ -111,4 +111,4 @@ class CSRF logger(sprintf('CSRF key (set): %s', $this->context->getCSRF())); } } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Definitions/CoreDefinitions.php b/lib/SP/Core/Definitions/CoreDefinitions.php index 607319e1..0a2c4748 100644 --- a/lib/SP/Core/Definitions/CoreDefinitions.php +++ b/lib/SP/Core/Definitions/CoreDefinitions.php @@ -42,12 +42,12 @@ use SP\Core\MimeTypesInterface; use SP\Core\ProvidersHelper; use SP\Core\UI\Theme; use SP\Core\UI\ThemeInterface; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Domain\Config\Services\ConfigBackupService; use SP\Domain\Config\Services\ConfigFileService; -use SP\Domain\Install\DatabaseSetupInterface; -use SP\Domain\Install\In\InstallDataFactory; +use SP\Domain\Install\Adapters\InstallDataFactory; +use SP\Domain\Install\Services\DatabaseSetupInterface; use SP\Domain\Install\Services\MysqlSetupBuilder; use SP\Domain\Providers\MailerInterface; use SP\Domain\Providers\MailProviderInterface; @@ -193,4 +193,4 @@ final class CoreDefinitions ->constructor('mysql', QueryFactory::COMMON), ]; } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Definitions/DomainDefinitions.php b/lib/SP/Core/Definitions/DomainDefinitions.php index ac26234b..ed5cd390 100644 --- a/lib/SP/Core/Definitions/DomainDefinitions.php +++ b/lib/SP/Core/Definitions/DomainDefinitions.php @@ -83,7 +83,7 @@ final class DomainDefinitions 'SP\Infrastructure\Security\Repositories\*Repository' ), 'SP\Domain\Config\*ServiceInterface' => autowire('SP\Domain\Config\Services\*Service'), - 'SP\Domain\Config\In\*RepositoryInterface' => autowire( + 'SP\Domain\Config\Ports\*RepositoryInterface' => autowire( 'SP\Infrastructure\Config\Repositories\*Repository' ), 'SP\Domain\Plugin\In\*RepositoryInterface' => autowire( @@ -91,4 +91,4 @@ final class DomainDefinitions ), ]; } -} \ No newline at end of file +} diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php index fc7a3b36..9e8d89ad 100644 --- a/lib/SP/Core/Language.php +++ b/lib/SP/Core/Language.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,8 +25,8 @@ namespace SP\Core; use SP\Core\Context\ContextInterface; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Http\Request; use SP\Http\RequestInterface; diff --git a/lib/SP/Core/ModuleBase.php b/lib/SP/Core/ModuleBase.php index 2abc023d..ad5378ce 100644 --- a/lib/SP/Core/ModuleBase.php +++ b/lib/SP/Core/ModuleBase.php @@ -26,7 +26,7 @@ namespace SP\Core; use SP\Core\Context\ContextInterface; use SP\Core\Events\EventDispatcher; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; /** @@ -91,4 +91,4 @@ abstract class ModuleBase $this->eventDispatcher->attach($this->providersHelper->getAclHandler()); $this->eventDispatcher->attach($this->providersHelper->getNotificationHandler()); } -} \ No newline at end of file +} diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php index 134b005e..273828d4 100644 --- a/lib/SP/Core/UI/Theme.php +++ b/lib/SP/Core/UI/Theme.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,8 +28,8 @@ use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Context\ContextBase; use SP\Core\Context\ContextInterface; use SP\Core\Exceptions\InvalidClassException; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Infrastructure\File\FileCacheInterface; use SP\Infrastructure\File\FileException; @@ -62,7 +62,7 @@ final class Theme implements ThemeInterface * Theme constructor. * * @param string $module - * @param ConfigInterface $config + * @param \SP\Domain\Config\Ports\ConfigInterface $config * @param ContextInterface $context * @param FileCacheInterface $fileCache */ @@ -240,4 +240,4 @@ final class Theme implements ThemeInterface { return $this->viewsPath; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/AccountExtData.php b/lib/SP/DataModel/AccountExtData.php index 3442ae89..616157ea 100644 --- a/lib/SP/DataModel/AccountExtData.php +++ b/lib/SP/DataModel/AccountExtData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Account\Out\AccountData; +use SP\Domain\Account\Adapters\AccountData; /** * Class AccountExtData @@ -79,4 +79,4 @@ class AccountExtData extends AccountData { return $this->userLogin; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/AccountToUserGroupData.php b/lib/SP/DataModel/AccountToUserGroupData.php index 611534ba..cce3f1dd 100644 --- a/lib/SP/DataModel/AccountToUserGroupData.php +++ b/lib/SP/DataModel/AccountToUserGroupData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; defined('APP_ROOT') || die(); @@ -33,7 +33,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class AccountToUserGroupData extends DataModelBase +class AccountToUserGroupData extends DataModel { /** * @var int @@ -103,4 +103,4 @@ class AccountToUserGroupData extends DataModelBase { $this->groups[] = (int)$group; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/AccountVData.php b/lib/SP/DataModel/AccountVData.php index 18b0ed76..70f79601 100644 --- a/lib/SP/DataModel/AccountVData.php +++ b/lib/SP/DataModel/AccountVData.php @@ -24,14 +24,14 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; /** * Class AccountVData * * @package SP\DataModel */ -class AccountVData extends DataModelBase +class AccountVData extends DataModel { protected ?int $id = null; protected ?int $userId = null; diff --git a/lib/SP/DataModel/ActionData.php b/lib/SP/DataModel/ActionData.php index 11143be4..3af0a16b 100644 --- a/lib/SP/DataModel/ActionData.php +++ b/lib/SP/DataModel/ActionData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class ActionData @@ -75,4 +75,4 @@ class ActionData implements DataModelInterface { return $this->route; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/AuthTokenData.php b/lib/SP/DataModel/AuthTokenData.php index 9536b4da..ee0fd031 100644 --- a/lib/SP/DataModel/AuthTokenData.php +++ b/lib/SP/DataModel/AuthTokenData.php @@ -25,15 +25,15 @@ namespace SP\DataModel; use SP\Core\Crypt\Vault; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class AuthTokenData * * @package SP\DataModel */ -class AuthTokenData extends DataModelBase implements DataModelInterface +class AuthTokenData extends DataModel implements DataModelInterface { /** * @var int @@ -203,4 +203,4 @@ class AuthTokenData extends DataModelBase implements DataModelInterface { $this->hash = $hash; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/CategoryData.php b/lib/SP/DataModel/CategoryData.php index 6b97f989..37be52ed 100644 --- a/lib/SP/DataModel/CategoryData.php +++ b/lib/SP/DataModel/CategoryData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class CategoryData extends DataModelBase implements DataModelInterface +class CategoryData extends DataModel implements DataModelInterface { public ?int $id = null; public ?string $name = null; @@ -87,4 +87,4 @@ class CategoryData extends DataModelBase implements DataModelInterface { return $this->hash; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/ClientData.php b/lib/SP/DataModel/ClientData.php index 0e9badb6..dde9463f 100644 --- a/lib/SP/DataModel/ClientData.php +++ b/lib/SP/DataModel/ClientData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class ClientData extends DataModelBase implements DataModelInterface +class ClientData extends DataModel implements DataModelInterface { public ?int $id = null; public ?string $name = null; @@ -97,4 +97,4 @@ class ClientData extends DataModelBase implements DataModelInterface { $this->isGlobal = $isGlobal; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/CustomFieldBaseData.php b/lib/SP/DataModel/CustomFieldBaseData.php index c31e4e17..eb0c7ccd 100644 --- a/lib/SP/DataModel/CustomFieldBaseData.php +++ b/lib/SP/DataModel/CustomFieldBaseData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; defined('APP_ROOT') || die(); @@ -33,7 +33,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class CustomFieldBaseData extends DataModelBase +class CustomFieldBaseData extends DataModel { /** * @var int @@ -249,4 +249,4 @@ class CustomFieldBaseData extends DataModelBase } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/CustomFieldDefDataOld.php b/lib/SP/DataModel/CustomFieldDefDataOld.php index c5b57929..2dc72827 100644 --- a/lib/SP/DataModel/CustomFieldDefDataOld.php +++ b/lib/SP/DataModel/CustomFieldDefDataOld.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class CustomFieldDefDataOld @@ -163,4 +163,4 @@ class CustomFieldDefDataOld extends CustomFieldBaseData implements DataModelInte { return $this->customfielddef_id; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/CustomFieldTypeData.php b/lib/SP/DataModel/CustomFieldTypeData.php index 0be7cbc6..4a8c2531 100644 --- a/lib/SP/DataModel/CustomFieldTypeData.php +++ b/lib/SP/DataModel/CustomFieldTypeData.php @@ -25,15 +25,15 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class CustomFieldTypeData * * @package SP\DataModel */ -class CustomFieldTypeData extends DataModelBase implements DataModelInterface +class CustomFieldTypeData extends DataModel implements DataModelInterface { /** * @var int @@ -94,4 +94,4 @@ class CustomFieldTypeData extends DataModelBase implements DataModelInterface } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/Dto/AccountHistoryCreateDto.php b/lib/SP/DataModel/Dto/AccountHistoryCreateDto.php index 3ec76dae..b80bd900 100644 --- a/lib/SP/DataModel/Dto/AccountHistoryCreateDto.php +++ b/lib/SP/DataModel/Dto/AccountHistoryCreateDto.php @@ -25,7 +25,7 @@ namespace SP\DataModel\Dto; -use SP\Domain\Account\Out\AccountData; +use SP\Domain\Account\Adapters\AccountData; /** * Class AccountHistoryCreateDto @@ -42,7 +42,7 @@ class AccountHistoryCreateDto /** * AccountHistoryCreateDto constructor. * - * @param \SP\Domain\Account\Out\AccountData $accountData + * @param \SP\Domain\Account\Adapters\AccountData $accountData * @param bool $isModify * @param bool $isDelete * @param string $masterPassHash @@ -83,4 +83,4 @@ class AccountHistoryCreateDto { return $this->accountData; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/EventlogData.php b/lib/SP/DataModel/EventlogData.php index 793d5edc..b1d52751 100644 --- a/lib/SP/DataModel/EventlogData.php +++ b/lib/SP/DataModel/EventlogData.php @@ -24,14 +24,14 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; /** * Class EventlogData * * @package SP\DataModel */ -class EventlogData extends DataModelBase +class EventlogData extends DataModel { /** * @var int @@ -185,4 +185,4 @@ class EventlogData extends DataModelBase { $this->level = $level; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/FileData.php b/lib/SP/DataModel/FileData.php index 6658a1a9..7ea02846 100644 --- a/lib/SP/DataModel/FileData.php +++ b/lib/SP/DataModel/FileData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class FileData extends DataModelBase implements DataModelInterface +class FileData extends DataModel implements DataModelInterface { /** * @var int @@ -198,4 +198,4 @@ class FileData extends DataModelBase implements DataModelInterface { return round($this->size / 1000, 2); } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/ItemData.php b/lib/SP/DataModel/ItemData.php index 8c4819e7..01c6663a 100644 --- a/lib/SP/DataModel/ItemData.php +++ b/lib/SP/DataModel/ItemData.php @@ -24,15 +24,15 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class ItemData * * @package SP\DataModel */ -class ItemData extends DataModelBase implements DataModelInterface +class ItemData extends DataModel implements DataModelInterface { protected ?int $id = null; protected ?string $name = null; diff --git a/lib/SP/DataModel/ItemPresetData.php b/lib/SP/DataModel/ItemPresetData.php index 7a7a0103..29cb6059 100644 --- a/lib/SP/DataModel/ItemPresetData.php +++ b/lib/SP/DataModel/ItemPresetData.php @@ -24,15 +24,15 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\HydratableInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\HydratableInterface; /** * Class ItemPresetData * * @package SP\DataModel */ -class ItemPresetData extends DataModelBase implements HydratableInterface +class ItemPresetData extends DataModel implements HydratableInterface { use SerializedModel; @@ -228,4 +228,4 @@ class ItemPresetData extends DataModelBase implements HydratableInterface { $this->type = $type; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/NotificationData.php b/lib/SP/DataModel/NotificationData.php index bd27e111..77d09f5c 100644 --- a/lib/SP/DataModel/NotificationData.php +++ b/lib/SP/DataModel/NotificationData.php @@ -25,7 +25,7 @@ namespace SP\DataModel; use SP\Core\Messages\MessageInterface; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class NoticeData @@ -227,4 +227,4 @@ class NotificationData implements DataModelInterface { return $this->component; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/PublicLinkData.php b/lib/SP/DataModel/PublicLinkData.php index db01e5a7..33da3bb5 100644 --- a/lib/SP/DataModel/PublicLinkData.php +++ b/lib/SP/DataModel/PublicLinkData.php @@ -24,15 +24,15 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class PublicLinkData * * @package SP\DataModel */ -class PublicLinkData extends DataModelBase implements DataModelInterface +class PublicLinkData extends DataModel implements DataModelInterface { protected ?int $id; protected ?int $itemId; diff --git a/lib/SP/DataModel/TagData.php b/lib/SP/DataModel/TagData.php index 7d3e022f..92433f37 100644 --- a/lib/SP/DataModel/TagData.php +++ b/lib/SP/DataModel/TagData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\Mgmt\Tags */ -class TagData extends DataModelBase implements DataModelInterface +class TagData extends DataModel implements DataModelInterface { /** * @var int @@ -105,4 +105,4 @@ class TagData extends DataModelBase implements DataModelInterface { $this->hash = $hash; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/TrackData.php b/lib/SP/DataModel/TrackData.php index 698d0ef4..b8affb15 100644 --- a/lib/SP/DataModel/TrackData.php +++ b/lib/SP/DataModel/TrackData.php @@ -25,7 +25,7 @@ namespace SP\DataModel; use SP\Core\Exceptions\InvalidArgumentException; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; use SP\Http\Address; /** @@ -33,7 +33,7 @@ use SP\Http\Address; * * @package SP\DataModel */ -class TrackData extends DataModelBase +class TrackData extends DataModel { /** * @var int @@ -221,4 +221,4 @@ class TrackData extends DataModelBase { $this->timeUnlock = $timeUnlock; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/UserData.php b/lib/SP/DataModel/UserData.php index ffcd5258..73adb8d5 100644 --- a/lib/SP/DataModel/UserData.php +++ b/lib/SP/DataModel/UserData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -212,4 +212,4 @@ class UserData extends UserPassData implements DataModelInterface { $this->ssoLogin = $ssoLogin; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/UserGroupData.php b/lib/SP/DataModel/UserGroupData.php index 37c77c99..44b8b67e 100644 --- a/lib/SP/DataModel/UserGroupData.php +++ b/lib/SP/DataModel/UserGroupData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class UserGroupData extends DataModelBase implements DataModelInterface +class UserGroupData extends DataModel implements DataModelInterface { public int $id = 0; public ?string $name = null; @@ -80,4 +80,4 @@ class UserGroupData extends DataModelBase implements DataModelInterface { $this->users = $users; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/UserPassData.php b/lib/SP/DataModel/UserPassData.php index aa314e0c..a64f51e5 100644 --- a/lib/SP/DataModel/UserPassData.php +++ b/lib/SP/DataModel/UserPassData.php @@ -24,14 +24,14 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; /** * Class UserPassData * * @package SP\DataModel */ -class UserPassData extends DataModelBase +class UserPassData extends DataModel { protected ?int $id = null; protected ?string $pass = null; @@ -94,4 +94,4 @@ class UserPassData extends DataModelBase { $this->id = (int)$id; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/UserPassRecoverData.php b/lib/SP/DataModel/UserPassRecoverData.php index a5908bec..36b15343 100644 --- a/lib/SP/DataModel/UserPassRecoverData.php +++ b/lib/SP/DataModel/UserPassRecoverData.php @@ -24,14 +24,14 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; /** * Class UserPassRecoverData * * @package SP\DataModel */ -class UserPassRecoverData extends DataModelBase +class UserPassRecoverData extends DataModel { /** * @var int @@ -114,4 +114,4 @@ class UserPassRecoverData extends DataModelBase $this->used = (int)$used; } -} \ No newline at end of file +} diff --git a/lib/SP/DataModel/UserProfileData.php b/lib/SP/DataModel/UserProfileData.php index 2d5321c3..07c63574 100644 --- a/lib/SP/DataModel/UserProfileData.php +++ b/lib/SP/DataModel/UserProfileData.php @@ -24,8 +24,8 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; defined('APP_ROOT') || die(); @@ -34,7 +34,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class UserProfileData extends DataModelBase implements DataModelInterface +class UserProfileData extends DataModel implements DataModelInterface { protected ?int $id = null; protected ?string $name = null; diff --git a/lib/SP/DataModel/UserToUserGroupData.php b/lib/SP/DataModel/UserToUserGroupData.php index 4791d7dd..f2d16b57 100644 --- a/lib/SP/DataModel/UserToUserGroupData.php +++ b/lib/SP/DataModel/UserToUserGroupData.php @@ -24,7 +24,7 @@ namespace SP\DataModel; -use SP\Domain\Common\Out\DataModelBase; +use SP\Domain\Common\Adapters\DataModel; defined('APP_ROOT') || die(); @@ -33,7 +33,7 @@ defined('APP_ROOT') || die(); * * @package SP\DataModel */ -class UserToUserGroupData extends DataModelBase +class UserToUserGroupData extends DataModel { /** * @var int @@ -103,4 +103,4 @@ class UserToUserGroupData extends DataModelBase { $this->users[] = (int)$user; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Out/AccountAdapter.php b/lib/SP/Domain/Account/Adapters/AccountAdapter.php similarity index 92% rename from lib/SP/Domain/Account/Out/AccountAdapter.php rename to lib/SP/Domain/Account/Adapters/AccountAdapter.php index c86aee4f..98569a21 100644 --- a/lib/SP/Domain/Account/Out/AccountAdapter.php +++ b/lib/SP/Domain/Account/Adapters/AccountAdapter.php @@ -22,26 +22,23 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\Out; +namespace SP\Domain\Account\Adapters; use League\Fractal\Resource\Collection; use SP\Core\Acl\ActionsInterface; use SP\DataModel\Dto\AccountEnrichedDto; -use SP\Domain\Common\Out\AdapterBase; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\CustomField\Out\CustomFieldAdapter; +use SP\Domain\Common\Adapters\Adapter; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\CustomField\Adapters\CustomFieldAdapter; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Mvc\Controller\ItemTrait; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Util\Link; /** * Class AccountAdapter - * - * @template T of AccountEnrichedDto - * @template-implements AccountAdapterInterface */ -final class AccountAdapter extends AdapterBase implements AccountAdapterInterface +final class AccountAdapter extends Adapter implements AccountAdapterInterface { use ItemTrait; @@ -121,5 +118,4 @@ final class AccountAdapter extends AdapterBase implements AccountAdapterInterfac ], ]; } - } diff --git a/lib/SP/Domain/Account/Out/AccountAdapterInterface.php b/lib/SP/Domain/Account/Adapters/AccountAdapterInterface.php similarity index 94% rename from lib/SP/Domain/Account/Out/AccountAdapterInterface.php rename to lib/SP/Domain/Account/Adapters/AccountAdapterInterface.php index 5702e696..1cb683f0 100644 --- a/lib/SP/Domain/Account/Out/AccountAdapterInterface.php +++ b/lib/SP/Domain/Account/Adapters/AccountAdapterInterface.php @@ -22,13 +22,13 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\Out; +namespace SP\Domain\Account\Adapters; use League\Fractal\Resource\Collection; use SP\DataModel\Dto\AccountEnrichedDto; /** - * Class AccountAdapter + * Class AccountAdapterInterface */ interface AccountAdapterInterface { diff --git a/lib/SP/Domain/Account/Out/AccountData.php b/lib/SP/Domain/Account/Adapters/AccountData.php similarity index 84% rename from lib/SP/Domain/Account/Out/AccountData.php rename to lib/SP/Domain/Account/Adapters/AccountData.php index c21b6b90..5bf17b5c 100644 --- a/lib/SP/Domain/Account/Out/AccountData.php +++ b/lib/SP/Domain/Account/Adapters/AccountData.php @@ -22,17 +22,17 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\Out; +namespace SP\Domain\Account\Adapters; use JsonSerializable; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; use SP\Http\Json; /** * Class AccountData */ -class AccountData extends DataModelBase implements JsonSerializable, DataModelInterface +class AccountData extends DataModel implements DataModelInterface { protected int $id; protected ?int $userId = null; @@ -85,7 +85,7 @@ class AccountData extends DataModelBase implements JsonSerializable, DataModelIn return $this->pass; } - public function setPass(string $pass) + public function setPass(string $pass): void { $this->pass = $pass; } @@ -95,7 +95,7 @@ class AccountData extends DataModelBase implements JsonSerializable, DataModelIn return $this->key; } - public function setKey(string $key) + public function setKey(string $key): void { $this->key = $key; } @@ -145,23 +145,6 @@ class AccountData extends DataModelBase implements JsonSerializable, DataModelIn return $this->notes; } - /** - * Specify data which should be serialized to JSON - * - * @link http://php.net/manual/en/jsonserializable.jsonserialize.php - * @return mixed data which can be serialized by json_encode, - * which is a value of any type other than a resource. - * @since 5.4.0 - */ - public function jsonSerialize(): mixed - { - $data = get_object_vars($this); - - unset($data['accountPass'], $data['accountIV']); - - return Json::safeJson($data); - } - public function getCountView(): ?int { return $this->countView; diff --git a/lib/SP/Domain/Account/Out/AccountPassData.php b/lib/SP/Domain/Account/Adapters/AccountPassData.php similarity index 74% rename from lib/SP/Domain/Account/Out/AccountPassData.php rename to lib/SP/Domain/Account/Adapters/AccountPassData.php index e8ee8fd6..07e2708d 100644 --- a/lib/SP/Domain/Account/Out/AccountPassData.php +++ b/lib/SP/Domain/Account/Adapters/AccountPassData.php @@ -22,23 +22,23 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\Out; +namespace SP\Domain\Account\Adapters; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class AccountPassData */ -class AccountPassData extends DataModelBase implements DataModelInterface +class AccountPassData extends DataModel implements DataModelInterface { - private ?int $id = null; - private ?string $name = null; - private ?string $login = null; - private ?string $pass = null; - private ?string $key = null; - private ?int $parentId = null; - private ?string $mPassHash = null; + protected ?int $id = null; + protected ?string $name = null; + protected ?string $login = null; + protected ?string $pass = null; + protected ?string $key = null; + protected ?int $parentId = null; + protected ?string $mPassHash = null; public function getId(): ?int { diff --git a/lib/SP/Domain/Account/AccountAclServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountAclServiceInterface.php similarity index 94% rename from lib/SP/Domain/Account/AccountAclServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountAclServiceInterface.php index 46834cc6..66719ccc 100644 --- a/lib/SP/Domain/Account/AccountAclServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountAclServiceInterface.php @@ -22,10 +22,8 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; -use SP\Core\Exceptions\ConstraintException; -use SP\Core\Exceptions\QueryException; use SP\DataModel\Dto\AccountAclDto; use SP\DataModel\ProfileData; use SP\Domain\Account\Services\AccountAcl; diff --git a/lib/SP/Domain/Account/AccountCryptServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountCryptServiceInterface.php similarity index 97% rename from lib/SP/Domain/Account/AccountCryptServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountCryptServiceInterface.php index ddd77d35..6abfb0f3 100644 --- a/lib/SP/Domain/Account/AccountCryptServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountCryptServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; diff --git a/lib/SP/Domain/Account/In/AccountFileRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountFileRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Account/In/AccountFileRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountFileRepositoryInterface.php index 0e3dd574..40805409 100644 --- a/lib/SP/Domain/Account/In/AccountFileRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountFileRepositoryInterface.php @@ -22,13 +22,13 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\FileData; use SP\DataModel\ItemSearchData; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/AccountFileServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountFileServiceInterface.php similarity index 98% rename from lib/SP/Domain/Account/AccountFileServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountFileServiceInterface.php index 35104feb..a6920471 100644 --- a/lib/SP/Domain/Account/AccountFileServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountFileServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\InvalidImageException; diff --git a/lib/SP/Domain/Account/In/AccountHistoryRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountHistoryRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Account/In/AccountHistoryRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountHistoryRepositoryInterface.php index d68e7b4b..21623530 100644 --- a/lib/SP/Domain/Account/In/AccountHistoryRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountHistoryRepositoryInterface.php @@ -22,12 +22,12 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemSearchData; use SP\Domain\Account\Services\AccountPasswordRequest; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/AccountHistoryServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountHistoryServiceInterface.php similarity index 99% rename from lib/SP/Domain/Account/AccountHistoryServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountHistoryServiceInterface.php index 258fdfa1..484b4fdb 100644 --- a/lib/SP/Domain/Account/AccountHistoryServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountHistoryServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; diff --git a/lib/SP/Domain/Account/AccountPresetServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountPresetServiceInterface.php similarity index 97% rename from lib/SP/Domain/Account/AccountPresetServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountPresetServiceInterface.php index 5a76380e..160e7f28 100644 --- a/lib/SP/Domain/Account/AccountPresetServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountPresetServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; diff --git a/lib/SP/Domain/Account/In/AccountRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/Account/In/AccountRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountRepositoryInterface.php index df76bea3..dec440b6 100644 --- a/lib/SP/Domain/Account/In/AccountRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountRepositoryInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -31,8 +31,8 @@ use SP\DataModel\AccountHistoryData; use SP\DataModel\ItemSearchData; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\In\RepositoryInterface; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/In/AccountSearchRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountSearchRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Account/In/AccountSearchRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountSearchRepositoryInterface.php index c0f8dafc..0cdb83af 100644 --- a/lib/SP/Domain/Account/In/AccountSearchRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountSearchRepositoryInterface.php @@ -22,11 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use Aura\SqlQuery\Common\SelectInterface; use SP\Domain\Account\Search\AccountSearchFilter; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -120,4 +120,4 @@ interface AccountSearchRepositoryInterface extends RepositoryInterface public function withFilterForIsPrivate(int $userId, int $userGroupId): SelectInterface; public function withFilterForIsNotPrivate(): SelectInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/AccountSearchServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountSearchServiceInterface.php similarity index 98% rename from lib/SP/Domain/Account/AccountSearchServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountSearchServiceInterface.php index 2785d368..a68c4858 100644 --- a/lib/SP/Domain/Account/AccountSearchServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountSearchServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; diff --git a/lib/SP/Domain/Account/AccountServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountServiceInterface.php similarity index 98% rename from lib/SP/Domain/Account/AccountServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountServiceInterface.php index f1b203e8..f1153aeb 100644 --- a/lib/SP/Domain/Account/AccountServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; @@ -32,8 +32,8 @@ use SP\DataModel\AccountExtData; use SP\DataModel\AccountHistoryData; use SP\DataModel\Dto\AccountEnrichedDto; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\Out\AccountData; -use SP\Domain\Account\Out\AccountPassData; +use SP\Domain\Account\Adapters\AccountData; +use SP\Domain\Account\Adapters\AccountPassData; use SP\Domain\Account\Services\AccountBulkRequest; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Domain\Account\Services\AccountRequest; diff --git a/lib/SP/Domain/Account/In/AccountToFavoriteRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountToFavoriteRepositoryInterface.php similarity index 96% rename from lib/SP/Domain/Account/In/AccountToFavoriteRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountToFavoriteRepositoryInterface.php index 23bcbbdd..da832316 100644 --- a/lib/SP/Domain/Account/In/AccountToFavoriteRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToFavoriteRepositoryInterface.php @@ -22,11 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/AccountToFavoriteServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountToFavoriteServiceInterface.php similarity index 97% rename from lib/SP/Domain/Account/AccountToFavoriteServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountToFavoriteServiceInterface.php index 2dab9000..aa39817e 100644 --- a/lib/SP/Domain/Account/AccountToFavoriteServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToFavoriteServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; diff --git a/lib/SP/Domain/Account/In/AccountToTagRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountToTagRepositoryInterface.php similarity index 95% rename from lib/SP/Domain/Account/In/AccountToTagRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountToTagRepositoryInterface.php index 2bc2fbc0..87b57fa6 100644 --- a/lib/SP/Domain/Account/In/AccountToTagRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToTagRepositoryInterface.php @@ -22,12 +22,12 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/AccountToTagServiceInterface.php b/lib/SP/Domain/Account/Ports/AccountToTagServiceInterface.php similarity index 97% rename from lib/SP/Domain/Account/AccountToTagServiceInterface.php rename to lib/SP/Domain/Account/Ports/AccountToTagServiceInterface.php index 996a910c..84673b3b 100644 --- a/lib/SP/Domain/Account/AccountToTagServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToTagServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use SP\DataModel\ItemData; diff --git a/lib/SP/Domain/Account/In/AccountToUserGroupRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountToUserGroupRepositoryInterface.php similarity index 95% rename from lib/SP/Domain/Account/In/AccountToUserGroupRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountToUserGroupRepositoryInterface.php index 2a24ab7f..868b753c 100644 --- a/lib/SP/Domain/Account/In/AccountToUserGroupRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToUserGroupRepositoryInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/In/AccountToUserRepositoryInterface.php b/lib/SP/Domain/Account/Ports/AccountToUserRepositoryInterface.php similarity index 96% rename from lib/SP/Domain/Account/In/AccountToUserRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/AccountToUserRepositoryInterface.php index 71401b9c..b8313bca 100644 --- a/lib/SP/Domain/Account/In/AccountToUserRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/AccountToUserRepositoryInterface.php @@ -22,11 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** diff --git a/lib/SP/Domain/Account/In/PublicLinkRepositoryInterface.php b/lib/SP/Domain/Account/Ports/PublicLinkRepositoryInterface.php similarity index 99% rename from lib/SP/Domain/Account/In/PublicLinkRepositoryInterface.php rename to lib/SP/Domain/Account/Ports/PublicLinkRepositoryInterface.php index 798b79d6..f0b30dc0 100644 --- a/lib/SP/Domain/Account/In/PublicLinkRepositoryInterface.php +++ b/lib/SP/Domain/Account/Ports/PublicLinkRepositoryInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account\In; +namespace SP\Domain\Account\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; diff --git a/lib/SP/Domain/Account/PublicLinkServiceInterface.php b/lib/SP/Domain/Account/Ports/PublicLinkServiceInterface.php similarity index 99% rename from lib/SP/Domain/Account/PublicLinkServiceInterface.php rename to lib/SP/Domain/Account/Ports/PublicLinkServiceInterface.php index 3dadd19e..23dfc810 100644 --- a/lib/SP/Domain/Account/PublicLinkServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/PublicLinkServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; use Defuse\Crypto\Exception\CryptoException; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; diff --git a/lib/SP/Domain/Account/UpgradePublicLinkServiceInterface.php b/lib/SP/Domain/Account/Ports/UpgradePublicLinkServiceInterface.php similarity index 96% rename from lib/SP/Domain/Account/UpgradePublicLinkServiceInterface.php rename to lib/SP/Domain/Account/Ports/UpgradePublicLinkServiceInterface.php index cf94e3ea..c8d9b65b 100644 --- a/lib/SP/Domain/Account/UpgradePublicLinkServiceInterface.php +++ b/lib/SP/Domain/Account/Ports/UpgradePublicLinkServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Account; +namespace SP\Domain\Account\Ports; /** * Class UpgradePublicLink diff --git a/lib/SP/Domain/Account/Services/AccountAclService.php b/lib/SP/Domain/Account/Services/AccountAclService.php index 10882b56..14c75405 100644 --- a/lib/SP/Domain/Account/Services/AccountAclService.php +++ b/lib/SP/Domain/Account/Services/AccountAclService.php @@ -33,10 +33,10 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\Dto\AccountAclDto; use SP\DataModel\ProfileData; -use SP\Domain\Account\AccountAclServiceInterface; +use SP\Domain\Account\Ports\AccountAclServiceInterface; use SP\Domain\Common\Services\Service; +use SP\Domain\User\Ports\UserToUserGroupServiceInterface; use SP\Domain\User\Services\UserLoginResponse; -use SP\Domain\User\UserToUserGroupServiceInterface; use SP\Infrastructure\File\FileCacheInterface; use SP\Infrastructure\File\FileException; use function SP\processException; diff --git a/lib/SP/Domain/Account/Services/AccountCryptService.php b/lib/SP/Domain/Account/Services/AccountCryptService.php index 8f5761be..0482f790 100644 --- a/lib/SP/Domain/Account/Services/AccountCryptService.php +++ b/lib/SP/Domain/Account/Services/AccountCryptService.php @@ -31,9 +31,9 @@ use SP\Core\Crypt\Crypt; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; -use SP\Domain\Account\AccountCryptServiceInterface; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountCryptServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; diff --git a/lib/SP/Domain/Account/Services/AccountFileService.php b/lib/SP/Domain/Account/Services/AccountFileService.php index d97aba34..b7c39f5a 100644 --- a/lib/SP/Domain/Account/Services/AccountFileService.php +++ b/lib/SP/Domain/Account/Services/AccountFileService.php @@ -31,8 +31,8 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\FileData; use SP\DataModel\FileExtData; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\AccountFileServiceInterface; -use SP\Domain\Account\In\AccountFileRepositoryInterface; +use SP\Domain\Account\Ports\AccountFileRepositoryInterface; +use SP\Domain\Account\Ports\AccountFileServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -157,7 +157,7 @@ final class AccountFileService extends Service implements AccountFileServiceInte * * @param int $id * - * @return \SP\Domain\Account\AccountFileServiceInterface + * @return \SP\Domain\Account\Ports\AccountFileServiceInterface * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException * @throws \SP\Infrastructure\Common\Repositories\NoSuchItemException @@ -194,4 +194,4 @@ final class AccountFileService extends Service implements AccountFileServiceInte { return $this->accountFileRepository->getByAccountId($id)->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountFilterUser.php b/lib/SP/Domain/Account/Services/AccountFilterUser.php index eb6cf15b..5577597f 100644 --- a/lib/SP/Domain/Account/Services/AccountFilterUser.php +++ b/lib/SP/Domain/Account/Services/AccountFilterUser.php @@ -29,7 +29,7 @@ use Aura\SqlQuery\QueryFactory; use SP\Core\Context\ContextInterface; use SP\DataModel\ProfileData; use SP\Domain\Account\Search\AccountSearchConstants; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\User\Services\UserLoginResponse; defined('APP_ROOT') || die(); @@ -157,4 +157,4 @@ final class AccountFilterUser implements AccountFilterUserInterface return $query; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountHistoryService.php b/lib/SP/Domain/Account/Services/AccountHistoryService.php index b8022fa9..a668e046 100644 --- a/lib/SP/Domain/Account/Services/AccountHistoryService.php +++ b/lib/SP/Domain/Account/Services/AccountHistoryService.php @@ -32,10 +32,10 @@ use SP\DataModel\AccountHistoryData; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\In\AccountHistoryRepositoryInterface; -use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface; -use SP\Domain\Account\In\AccountToUserRepositoryInterface; +use SP\Domain\Account\Ports\AccountHistoryRepositoryInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountToUserGroupRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserRepositoryInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -229,4 +229,4 @@ final class AccountHistoryService extends Service implements AccountHistoryServi { return $this->accountHistoryRepository->getAll()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountPresetService.php b/lib/SP/Domain/Account/Services/AccountPresetService.php index 7510e21c..75214d88 100644 --- a/lib/SP/Domain/Account/Services/AccountPresetService.php +++ b/lib/SP/Domain/Account/Services/AccountPresetService.php @@ -29,10 +29,10 @@ use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\ValidationException; use SP\DataModel\ItemPreset\Password; -use SP\Domain\Account\AccountPresetServiceInterface; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\Account\Ports\AccountPresetServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Mvc\Controller\Validators\PasswordValidator; /** @@ -80,4 +80,4 @@ final class AccountPresetService implements AccountPresetServiceInterface } } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountSearchItem.php b/lib/SP/Domain/Account/Services/AccountSearchItem.php index 08cf4bb9..1e6b9dfb 100644 --- a/lib/SP/Domain/Account/Services/AccountSearchItem.php +++ b/lib/SP/Domain/Account/Services/AccountSearchItem.php @@ -29,7 +29,7 @@ defined('APP_ROOT') || die(); use SP\Core\Bootstrap\BootstrapBase; use SP\DataModel\AccountSearchVData; use SP\DataModel\ItemData; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Html\Html; /** diff --git a/lib/SP/Domain/Account/Services/AccountSearchService.php b/lib/SP/Domain/Account/Services/AccountSearchService.php index 40e4230f..8b51c63c 100644 --- a/lib/SP/Domain/Account/Services/AccountSearchService.php +++ b/lib/SP/Domain/Account/Services/AccountSearchService.php @@ -33,20 +33,20 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\AccountSearchVData; use SP\DataModel\Dto\AccountAclDto; use SP\DataModel\Dto\AccountCache; -use SP\Domain\Account\AccountAclServiceInterface; -use SP\Domain\Account\AccountSearchServiceInterface; -use SP\Domain\Account\AccountToFavoriteServiceInterface; -use SP\Domain\Account\In\AccountSearchRepositoryInterface; -use SP\Domain\Account\In\AccountToTagRepositoryInterface; -use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface; -use SP\Domain\Account\In\AccountToUserRepositoryInterface; +use SP\Domain\Account\Ports\AccountAclServiceInterface; +use SP\Domain\Account\Ports\AccountSearchRepositoryInterface; +use SP\Domain\Account\Ports\AccountSearchServiceInterface; +use SP\Domain\Account\Ports\AccountToFavoriteServiceInterface; +use SP\Domain\Account\Ports\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserGroupRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserRepositoryInterface; use SP\Domain\Account\Search\AccountSearchConstants; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Domain\Account\Search\AccountSearchTokenizer; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\File\FileCache; use SP\Infrastructure\File\FileCacheInterface; @@ -379,4 +379,4 @@ final class AccountSearchService extends Service implements AccountSearchService { return $this->cleanString; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountService.php b/lib/SP/Domain/Account/Services/AccountService.php index 81dd36fa..9408265a 100644 --- a/lib/SP/Domain/Account/Services/AccountService.php +++ b/lib/SP/Domain/Account/Services/AccountService.php @@ -39,20 +39,20 @@ use SP\DataModel\ItemPreset\AccountPermission; use SP\DataModel\ItemPreset\AccountPrivate; use SP\DataModel\ItemSearchData; use SP\DataModel\ProfileData; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\In\AccountRepositoryInterface; -use SP\Domain\Account\In\AccountToTagRepositoryInterface; -use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface; -use SP\Domain\Account\In\AccountToUserRepositoryInterface; -use SP\Domain\Account\Out\AccountData; -use SP\Domain\Account\Out\AccountPassData; +use SP\Domain\Account\Adapters\AccountData; +use SP\Domain\Account\Adapters\AccountPassData; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountRepositoryInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserGroupRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserRepositoryInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\ItemPreset\ItemPresetInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use function SP\__u; diff --git a/lib/SP/Domain/Account/Services/AccountToFavoriteService.php b/lib/SP/Domain/Account/Services/AccountToFavoriteService.php index b18a3137..f41d0d21 100644 --- a/lib/SP/Domain/Account/Services/AccountToFavoriteService.php +++ b/lib/SP/Domain/Account/Services/AccountToFavoriteService.php @@ -27,8 +27,8 @@ namespace SP\Domain\Account\Services; use SP\Core\Application; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountToFavoriteServiceInterface; -use SP\Domain\Account\In\AccountToFavoriteRepositoryInterface; +use SP\Domain\Account\Ports\AccountToFavoriteRepositoryInterface; +use SP\Domain\Account\Ports\AccountToFavoriteServiceInterface; use SP\Domain\Common\Services\Service; /** @@ -83,4 +83,4 @@ final class AccountToFavoriteService extends Service implements AccountToFavorit { return $this->accountFavoriteRepository->delete($accountId, $userId); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/AccountToTagService.php b/lib/SP/Domain/Account/Services/AccountToTagService.php index 53d0c170..798ac99a 100644 --- a/lib/SP/Domain/Account/Services/AccountToTagService.php +++ b/lib/SP/Domain/Account/Services/AccountToTagService.php @@ -26,8 +26,8 @@ namespace SP\Domain\Account\Services; use SP\Core\Application; use SP\DataModel\ItemData; -use SP\Domain\Account\AccountToTagServiceInterface; -use SP\Domain\Account\In\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToTagServiceInterface; use SP\Domain\Common\Services\Service; /** @@ -59,4 +59,4 @@ final class AccountToTagService extends Service implements AccountToTagServiceIn ->getTagsByAccountId($id) ->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Account/Services/PublicLinkService.php b/lib/SP/Domain/Account/Services/PublicLinkService.php index ca14c803..1c054972 100644 --- a/lib/SP/Domain/Account/Services/PublicLinkService.php +++ b/lib/SP/Domain/Account/Services/PublicLinkService.php @@ -35,13 +35,13 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\PublicLinkData; use SP\DataModel\PublicLinkListData; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\In\PublicLinkRepositoryInterface; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Account\Ports\PublicLinkRepositoryInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\Config\ConfigInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -205,7 +205,7 @@ final class PublicLinkService extends Service implements PublicLinkServiceInterf /** * @param int $id * - * @return \SP\Domain\Account\PublicLinkServiceInterface + * @return \SP\Domain\Account\Ports\PublicLinkServiceInterface * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ diff --git a/lib/SP/Domain/Account/Services/UpgradePublicLinkService.php b/lib/SP/Domain/Account/Services/UpgradePublicLinkService.php index fdda88d7..27a15a58 100644 --- a/lib/SP/Domain/Account/Services/UpgradePublicLinkService.php +++ b/lib/SP/Domain/Account/Services/UpgradePublicLinkService.php @@ -30,8 +30,8 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\DataModel\PublickLinkOldData; use SP\DataModel\PublicLinkData; -use SP\Domain\Account\PublicLinkServiceInterface; -use SP\Domain\Account\UpgradePublicLinkServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\UpgradePublicLinkServiceInterface; use SP\Domain\Common\Services\Service; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; @@ -132,4 +132,4 @@ final class UpgradePublicLinkService extends Service implements UpgradePublicLin ) ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Api/ApiServiceInterface.php b/lib/SP/Domain/Api/Ports/ApiServiceInterface.php similarity index 98% rename from lib/SP/Domain/Api/ApiServiceInterface.php rename to lib/SP/Domain/Api/Ports/ApiServiceInterface.php index 935ec764..db0256c8 100644 --- a/lib/SP/Domain/Api/ApiServiceInterface.php +++ b/lib/SP/Domain/Api/Ports/ApiServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Api; +namespace SP\Domain\Api\Ports; use Exception; @@ -110,4 +110,4 @@ interface ApiServiceInterface * @throws InvalidClassException */ public function setHelpClass(string $helpClass): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Api/Services/ApiService.php b/lib/SP/Domain/Api/Services/ApiService.php index d81ebabe..9f656a44 100644 --- a/lib/SP/Domain/Api/Services/ApiService.php +++ b/lib/SP/Domain/Api/Services/ApiService.php @@ -33,16 +33,16 @@ use SP\Core\Crypt\Vault; use SP\Core\Exceptions\InvalidClassException; use SP\Core\Exceptions\SPException; use SP\DataModel\AuthTokenData; -use SP\Domain\Api\ApiServiceInterface; -use SP\Domain\Auth\AuthTokenServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; use SP\Domain\Auth\Services\AuthTokenService; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; +use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Domain\Security\Services\TrackService; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserService; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Security\Repositories\TrackRequest; use SP\Util\Filter; @@ -363,4 +363,4 @@ final class ApiService extends Service implements ApiServiceInterface throw new InvalidClassException('Invalid class for helper'); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/AuthTokenServiceInterface.php b/lib/SP/Domain/Auth/Ports/AuthTokenServiceInterface.php similarity index 99% rename from lib/SP/Domain/Auth/AuthTokenServiceInterface.php rename to lib/SP/Domain/Auth/Ports/AuthTokenServiceInterface.php index 41062d4c..ae3b42a8 100644 --- a/lib/SP/Domain/Auth/AuthTokenServiceInterface.php +++ b/lib/SP/Domain/Auth/Ports/AuthTokenServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Auth; +namespace SP\Domain\Auth\Ports; use Defuse\Crypto\Exception\CryptoException; @@ -120,4 +120,4 @@ interface AuthTokenServiceInterface * @throws QueryException */ public function getAllBasic(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/LdapCheckServiceInterface.php b/lib/SP/Domain/Auth/Ports/LdapCheckServiceInterface.php similarity index 98% rename from lib/SP/Domain/Auth/LdapCheckServiceInterface.php rename to lib/SP/Domain/Auth/Ports/LdapCheckServiceInterface.php index 893bc7dd..9a2aec5c 100644 --- a/lib/SP/Domain/Auth/LdapCheckServiceInterface.php +++ b/lib/SP/Domain/Auth/Ports/LdapCheckServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Auth; +namespace SP\Domain\Auth\Ports; use SP\Providers\Auth\Ldap\LdapException; @@ -61,4 +61,4 @@ interface LdapCheckServiceInterface * @throws \SP\Providers\Auth\Ldap\LdapException */ public function getObjectsByFilter(string $filter): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/LoginServiceInterface.php b/lib/SP/Domain/Auth/Ports/LoginServiceInterface.php similarity index 98% rename from lib/SP/Domain/Auth/LoginServiceInterface.php rename to lib/SP/Domain/Auth/Ports/LoginServiceInterface.php index 94dd7058..d84139e7 100644 --- a/lib/SP/Domain/Auth/LoginServiceInterface.php +++ b/lib/SP/Domain/Auth/Ports/LoginServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Auth; +namespace SP\Domain\Auth\Ports; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; @@ -61,4 +61,4 @@ interface LoginServiceInterface * @param string|null $from */ public function setFrom(?string $from): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/UpgradeAuthTokenServiceInterface.php b/lib/SP/Domain/Auth/Ports/UpgradeAuthTokenServiceInterface.php similarity index 96% rename from lib/SP/Domain/Auth/UpgradeAuthTokenServiceInterface.php rename to lib/SP/Domain/Auth/Ports/UpgradeAuthTokenServiceInterface.php index 77ffd156..a2c0de10 100644 --- a/lib/SP/Domain/Auth/UpgradeAuthTokenServiceInterface.php +++ b/lib/SP/Domain/Auth/Ports/UpgradeAuthTokenServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Auth; +namespace SP\Domain\Auth\Ports; use Exception; @@ -40,4 +40,4 @@ interface UpgradeAuthTokenServiceInterface * @throws Exception */ public function upgrade_300_18072901(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/Services/AuthTokenService.php b/lib/SP/Domain/Auth/Services/AuthTokenService.php index c75a652b..3b95f17f 100644 --- a/lib/SP/Domain/Auth/Services/AuthTokenService.php +++ b/lib/SP/Domain/Auth/Services/AuthTokenService.php @@ -37,7 +37,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\AuthTokenData; use SP\DataModel\ItemSearchData; -use SP\Domain\Auth\AuthTokenServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; @@ -331,4 +331,4 @@ final class AuthTokenService extends Service implements AuthTokenServiceInterfac { return $this->authTokenRepository->getAll()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/Services/LdapCheckService.php b/lib/SP/Domain/Auth/Services/LdapCheckService.php index be71a6c5..71e2089c 100644 --- a/lib/SP/Domain/Auth/Services/LdapCheckService.php +++ b/lib/SP/Domain/Auth/Services/LdapCheckService.php @@ -24,7 +24,7 @@ namespace SP\Domain\Auth\Services; -use SP\Domain\Auth\LdapCheckServiceInterface; +use SP\Domain\Auth\Ports\LdapCheckServiceInterface; use SP\Domain\Common\Services\Service; use SP\Providers\Auth\Ldap\Ldap; use SP\Providers\Auth\Ldap\LdapException; @@ -155,4 +155,4 @@ final class LdapCheckService extends Service implements LdapCheckServiceInterfac return $data; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/Services/LoginService.php b/lib/SP/Domain/Auth/Services/LoginService.php index 0ad4e1d2..07478c07 100644 --- a/lib/SP/Domain/Auth/Services/LoginService.php +++ b/lib/SP/Domain/Auth/Services/LoginService.php @@ -39,17 +39,17 @@ use SP\Core\LanguageInterface; use SP\Core\UI\ThemeInterface; use SP\DataModel\UserLoginData; use SP\DataModel\UserPreferencesData; -use SP\Domain\Auth\LoginServiceInterface; +use SP\Domain\Auth\Ports\LoginServiceInterface; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Crypt\TemporaryMasterPassServiceInterface; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; +use SP\Domain\User\Ports\UserPassRecoverServiceInterface; +use SP\Domain\User\Ports\UserPassServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserLoginRequest; use SP\Domain\User\Services\UserPassService; -use SP\Domain\User\UserPassRecoverServiceInterface; -use SP\Domain\User\UserPassServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; use SP\Http\RequestInterface; use SP\Http\Uri; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -707,4 +707,4 @@ final class LoginService extends Service implements LoginServiceInterface return true; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Auth/Services/UpgradeAuthTokenService.php b/lib/SP/Domain/Auth/Services/UpgradeAuthTokenService.php index 2b4f7f3a..a1a5f868 100644 --- a/lib/SP/Domain/Auth/Services/UpgradeAuthTokenService.php +++ b/lib/SP/Domain/Auth/Services/UpgradeAuthTokenService.php @@ -29,8 +29,8 @@ use SP\Core\Acl\ActionsInterface; use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Auth\AuthTokenServiceInterface; -use SP\Domain\Auth\UpgradeAuthTokenServiceInterface; +use SP\Domain\Auth\Ports\AuthTokenServiceInterface; +use SP\Domain\Auth\Ports\UpgradeAuthTokenServiceInterface; use SP\Domain\Common\Services\Service; use SP\Infrastructure\Database\DatabaseInterface; @@ -168,4 +168,4 @@ final class UpgradeAuthTokenService extends Service return $moduleId; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Category/Out/CategoryAdapter.php b/lib/SP/Domain/Category/Adapters/CategoryAdapter.php similarity index 87% rename from lib/SP/Domain/Category/Out/CategoryAdapter.php rename to lib/SP/Domain/Category/Adapters/CategoryAdapter.php index 85942b04..aeb42a3e 100644 --- a/lib/SP/Domain/Category/Out/CategoryAdapter.php +++ b/lib/SP/Domain/Category/Adapters/CategoryAdapter.php @@ -22,14 +22,15 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Category\Out; +namespace SP\Domain\Category\Adapters; use League\Fractal\Resource\Collection; use SP\Core\Acl\ActionsInterface; use SP\DataModel\CategoryData; -use SP\Domain\Common\Out\AdapterBase; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\CustomField\Out\CustomFieldAdapter; +use SP\Domain\Category\Ports\CategoryAdapterInterface; +use SP\Domain\Common\Adapters\Adapter; +use SP\Domain\CustomField\Adapters\CustomFieldAdapter; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Mvc\Controller\ItemTrait; use SP\Util\Link; @@ -38,7 +39,7 @@ use SP\Util\Link; * * @package SP\Adapters */ -final class CategoryAdapter extends AdapterBase implements CategoryAdapterInterface +final class CategoryAdapter extends Adapter implements CategoryAdapterInterface { use ItemTrait; diff --git a/lib/SP/Domain/Category/Out/CategoryAdapterInterface.php b/lib/SP/Domain/Category/Ports/CategoryAdapterInterface.php similarity index 93% rename from lib/SP/Domain/Category/Out/CategoryAdapterInterface.php rename to lib/SP/Domain/Category/Ports/CategoryAdapterInterface.php index 78dd6264..d64f74a3 100644 --- a/lib/SP/Domain/Category/Out/CategoryAdapterInterface.php +++ b/lib/SP/Domain/Category/Ports/CategoryAdapterInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Category\Out; - +namespace SP\Domain\Category\Ports; use League\Fractal\Resource\Collection; use SP\DataModel\CategoryData; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; /** * Class CategoryAdapter @@ -48,4 +47,4 @@ interface CategoryAdapterInterface ): Collection; public function transform(CategoryData $data): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Category/In/CategoryRepositoryInterface.php b/lib/SP/Domain/Category/Ports/CategoryRepositoryInterface.php similarity index 94% rename from lib/SP/Domain/Category/In/CategoryRepositoryInterface.php rename to lib/SP/Domain/Category/Ports/CategoryRepositoryInterface.php index dc10a44e..b8c955b2 100644 --- a/lib/SP/Domain/Category/In/CategoryRepositoryInterface.php +++ b/lib/SP/Domain/Category/Ports/CategoryRepositoryInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Category\In; - +namespace SP\Domain\Category\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -47,4 +46,4 @@ interface CategoryRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getByName(string $name): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Category/CategoryServiceInterface.php b/lib/SP/Domain/Category/Ports/CategoryServiceInterface.php similarity index 98% rename from lib/SP/Domain/Category/CategoryServiceInterface.php rename to lib/SP/Domain/Category/Ports/CategoryServiceInterface.php index f02fe7b7..6aa7a33c 100644 --- a/lib/SP/Domain/Category/CategoryServiceInterface.php +++ b/lib/SP/Domain/Category/Ports/CategoryServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Category; +namespace SP\Domain\Category\Ports; use SP\Core\Exceptions\ConstraintException; @@ -100,4 +100,4 @@ interface CategoryServiceInterface * @throws QueryException */ public function getAllBasic(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Category/Services/CategoryService.php b/lib/SP/Domain/Category/Services/CategoryService.php index bce81ce6..65b1e78c 100644 --- a/lib/SP/Domain/Category/Services/CategoryService.php +++ b/lib/SP/Domain/Category/Services/CategoryService.php @@ -30,8 +30,8 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ItemSearchData; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Category\In\CategoryRepositoryInterface; +use SP\Domain\Category\Ports\CategoryRepositoryInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; @@ -162,4 +162,4 @@ final class CategoryService extends Service implements CategoryServiceInterface { return $this->categoryRepository->getAll()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Client/Out/ClientAdapter.php b/lib/SP/Domain/Client/Adapters/ClientAdapter.php similarity index 88% rename from lib/SP/Domain/Client/Out/ClientAdapter.php rename to lib/SP/Domain/Client/Adapters/ClientAdapter.php index 7e9495de..2837710f 100644 --- a/lib/SP/Domain/Client/Out/ClientAdapter.php +++ b/lib/SP/Domain/Client/Adapters/ClientAdapter.php @@ -22,14 +22,15 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Client\Out; +namespace SP\Domain\Client\Adapters; use League\Fractal\Resource\Collection; use SP\Core\Acl\ActionsInterface; use SP\DataModel\ClientData; -use SP\Domain\Common\Out\AdapterBase; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\CustomField\Out\CustomFieldAdapter; +use SP\Domain\Client\Ports\ClientAdapterInterface; +use SP\Domain\Common\Adapters\Adapter; +use SP\Domain\CustomField\Adapters\CustomFieldAdapter; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Mvc\Controller\ItemTrait; use SP\Util\Link; @@ -38,7 +39,7 @@ use SP\Util\Link; * * @package SP\Adapters */ -final class ClientAdapter extends AdapterBase implements ClientAdapterInterface +final class ClientAdapter extends Adapter implements ClientAdapterInterface { use ItemTrait; diff --git a/lib/SP/Domain/Client/Out/ClientAdapterInterface.php b/lib/SP/Domain/Client/Ports/ClientAdapterInterface.php similarity index 93% rename from lib/SP/Domain/Client/Out/ClientAdapterInterface.php rename to lib/SP/Domain/Client/Ports/ClientAdapterInterface.php index 6bea8a55..7fcecd4e 100644 --- a/lib/SP/Domain/Client/Out/ClientAdapterInterface.php +++ b/lib/SP/Domain/Client/Ports/ClientAdapterInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Client\Out; - +namespace SP\Domain\Client\Ports; use League\Fractal\Resource\Collection; use SP\DataModel\ClientData; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; /** * Class ClientAdapter @@ -45,4 +44,4 @@ interface ClientAdapterInterface public function includeCustomFields(ClientData $data, CustomFieldServiceInterface $customFieldService): Collection; public function transform(ClientData $data): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Client/In/ClientRepositoryInterface.php b/lib/SP/Domain/Client/Ports/ClientRepositoryInterface.php similarity index 95% rename from lib/SP/Domain/Client/In/ClientRepositoryInterface.php rename to lib/SP/Domain/Client/Ports/ClientRepositoryInterface.php index 879a8a58..3cbf6a38 100644 --- a/lib/SP/Domain/Client/In/ClientRepositoryInterface.php +++ b/lib/SP/Domain/Client/Ports/ClientRepositoryInterface.php @@ -22,12 +22,12 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Client\In; +namespace SP\Domain\Client\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; use SP\Mvc\Model\QueryCondition; @@ -59,4 +59,4 @@ interface ClientRepositoryInterface extends RepositoryInterface * @throws ConstraintException */ public function getAllForFilter(QueryCondition $queryFilter): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Client/ClientServiceInterface.php b/lib/SP/Domain/Client/Ports/ClientServiceInterface.php similarity index 98% rename from lib/SP/Domain/Client/ClientServiceInterface.php rename to lib/SP/Domain/Client/Ports/ClientServiceInterface.php index b1d5a8c7..c12db9bf 100644 --- a/lib/SP/Domain/Client/ClientServiceInterface.php +++ b/lib/SP/Domain/Client/Ports/ClientServiceInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Client; +namespace SP\Domain\Client\Ports; use SP\Core\Exceptions\ConstraintException; @@ -114,4 +114,4 @@ interface ClientServiceInterface * @throws ConstraintException */ public function getAllForUser(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Client/Services/ClientService.php b/lib/SP/Domain/Client/Services/ClientService.php index fb529423..93d2afb7 100644 --- a/lib/SP/Domain/Client/Services/ClientService.php +++ b/lib/SP/Domain/Client/Services/ClientService.php @@ -32,8 +32,8 @@ use SP\DataModel\ClientData; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; use SP\Domain\Account\Services\AccountFilterUserInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Client\In\ClientRepositoryInterface; +use SP\Domain\Client\Ports\ClientRepositoryInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; @@ -110,7 +110,7 @@ final class ClientService extends Service implements ClientServiceInterface /** * @param int $id * - * @return \SP\Domain\Client\ClientServiceInterface + * @return \SP\Domain\Client\Ports\ClientServiceInterface * @throws \SP\Infrastructure\Common\Repositories\NoSuchItemException */ public function delete(int $id): ClientServiceInterface @@ -185,4 +185,4 @@ final class ClientService extends Service implements ClientServiceInterface { return $this->clientRepository->getAllForFilter($this->accountFilterUser->buildFilter())->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Common/Out/AdapterBase.php b/lib/SP/Domain/Common/Adapters/Adapter.php similarity index 90% rename from lib/SP/Domain/Common/Out/AdapterBase.php rename to lib/SP/Domain/Common/Adapters/Adapter.php index 0c38508b..96a5d624 100644 --- a/lib/SP/Domain/Common/Out/AdapterBase.php +++ b/lib/SP/Domain/Common/Adapters/Adapter.php @@ -22,18 +22,18 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\Out; +namespace SP\Domain\Common\Adapters; use League\Fractal\TransformerAbstract; use RuntimeException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Class AdapterBase * * @package SP\Adapters */ -abstract class AdapterBase extends TransformerAbstract +abstract class Adapter extends TransformerAbstract { protected ConfigDataInterface $configData; diff --git a/lib/SP/Domain/Common/Out/DataModelBase.php b/lib/SP/Domain/Common/Adapters/DataModel.php similarity index 79% rename from lib/SP/Domain/Common/Out/DataModelBase.php rename to lib/SP/Domain/Common/Adapters/DataModel.php index f88df252..49d6a641 100644 --- a/lib/SP/Domain/Common/Out/DataModelBase.php +++ b/lib/SP/Domain/Common/Adapters/DataModel.php @@ -22,12 +22,14 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\Out; +namespace SP\Domain\Common\Adapters; + +use JsonSerializable; /** * Class DataModelBase */ -abstract class DataModelBase +abstract class DataModel implements JsonSerializable { private array $properties; @@ -70,6 +72,19 @@ abstract class DataModelBase return property_exists($this, $name) || isset($this->properties[$name]); } + /** + * Specify data which should be serialized to JSON + * + * @link http://php.net/manual/en/jsonserializable.jsonserialize.php + * @return array data which can be serialized by json_encode, + * which is a value of any type other than a resource. + * @since 5.4.0 + */ + public function jsonSerialize(): array + { + return $this->toArray(); + } + final public function toArray(): array { if (count($this->properties) !== 0) { diff --git a/lib/SP/Domain/Common/Out/DataModelInterface.php b/lib/SP/Domain/Common/Adapters/DataModelInterface.php similarity index 96% rename from lib/SP/Domain/Common/Out/DataModelInterface.php rename to lib/SP/Domain/Common/Adapters/DataModelInterface.php index 641616e5..18cd2e1a 100644 --- a/lib/SP/Domain/Common/Out/DataModelInterface.php +++ b/lib/SP/Domain/Common/Adapters/DataModelInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\Out; +namespace SP\Domain\Common\Adapters; /** * Interface DataModelInterface diff --git a/lib/SP/Domain/Common/Out/HydratableInterface.php b/lib/SP/Domain/Common/Adapters/HydratableInterface.php similarity index 96% rename from lib/SP/Domain/Common/Out/HydratableInterface.php rename to lib/SP/Domain/Common/Adapters/HydratableInterface.php index 0e394aef..417c4966 100644 --- a/lib/SP/Domain/Common/Out/HydratableInterface.php +++ b/lib/SP/Domain/Common/Adapters/HydratableInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\Out; +namespace SP\Domain\Common\Adapters; /** * Interface HydratableInterface diff --git a/lib/SP/Domain/Common/Out/SimpleModel.php b/lib/SP/Domain/Common/Adapters/SimpleModel.php similarity index 92% rename from lib/SP/Domain/Common/Out/SimpleModel.php rename to lib/SP/Domain/Common/Adapters/SimpleModel.php index b16e879e..23f7396e 100644 --- a/lib/SP/Domain/Common/Out/SimpleModel.php +++ b/lib/SP/Domain/Common/Adapters/SimpleModel.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\Out; +namespace SP\Domain\Common\Adapters; /** * Class SimpleModel @@ -31,7 +31,7 @@ namespace SP\Domain\Common\Out; * * It's intended to be used when returned non-well defined objects from the repository. */ -final class SimpleModel extends DataModelBase +final class SimpleModel extends DataModel { } diff --git a/lib/SP/Domain/Common/In/RepositoryInterface.php b/lib/SP/Domain/Common/Ports/RepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Common/In/RepositoryInterface.php rename to lib/SP/Domain/Common/Ports/RepositoryInterface.php index ba7b7a89..07fc3451 100644 --- a/lib/SP/Domain/Common/In/RepositoryInterface.php +++ b/lib/SP/Domain/Common/Ports/RepositoryInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\In; +namespace SP\Domain\Common\Ports; use Closure; diff --git a/lib/SP/Domain/Common/Services/Service.php b/lib/SP/Domain/Common/Services/Service.php index 1a37fddf..6ee91f9f 100644 --- a/lib/SP/Domain/Common/Services/Service.php +++ b/lib/SP/Domain/Common/Services/Service.php @@ -31,7 +31,7 @@ use SP\Core\Context\ContextInterface; use SP\Core\Context\SessionContext; use SP\Core\Crypt\Session; use SP\Core\Events\EventDispatcher; -use SP\Domain\Config\ConfigInterface; +use SP\Domain\Config\Ports\ConfigInterface; use function SP\__u; use function SP\logger; diff --git a/lib/SP/Domain/Config/Adapters/ConfigData.php b/lib/SP/Domain/Config/Adapters/ConfigData.php index bfadf354..04730761 100644 --- a/lib/SP/Domain/Config/Adapters/ConfigData.php +++ b/lib/SP/Domain/Config/Adapters/ConfigData.php @@ -26,7 +26,7 @@ namespace SP\Domain\Config\Adapters; use JsonSerializable; use SP\Core\DataCollection; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Util\VersionUtil; /** diff --git a/lib/SP/Domain/Config/ConfigBackupServiceInterface.php b/lib/SP/Domain/Config/Ports/ConfigBackupServiceInterface.php similarity index 94% rename from lib/SP/Domain/Config/ConfigBackupServiceInterface.php rename to lib/SP/Domain/Config/Ports/ConfigBackupServiceInterface.php index 64cc19e3..ab92c32d 100644 --- a/lib/SP/Domain/Config/ConfigBackupServiceInterface.php +++ b/lib/SP/Domain/Config/Ports/ConfigBackupServiceInterface.php @@ -22,11 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config; - +namespace SP\Domain\Config\Ports; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\In\ConfigDataInterface; use SP\Infrastructure\File\FileException; /** @@ -51,4 +49,4 @@ interface ConfigBackupServiceInterface * @throws \SP\Domain\Common\Services\ServiceException */ public function getBackup(): string; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/In/ConfigDataInterface.php b/lib/SP/Domain/Config/Ports/ConfigDataInterface.php similarity index 99% rename from lib/SP/Domain/Config/In/ConfigDataInterface.php rename to lib/SP/Domain/Config/Ports/ConfigDataInterface.php index 5891b1b7..add43d58 100644 --- a/lib/SP/Domain/Config/In/ConfigDataInterface.php +++ b/lib/SP/Domain/Config/Ports/ConfigDataInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config\In; - +namespace SP\Domain\Config\Ports; /** * Interface ConfigDataInterface @@ -512,4 +511,4 @@ interface ConfigDataInterface public function isLdapDatabaseEnabled(): bool; public function setLdapDatabaseEnabled(?bool $ldapDatabaseEnabled): ConfigDataInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/ConfigInterface.php b/lib/SP/Domain/Config/Ports/ConfigInterface.php similarity index 86% rename from lib/SP/Domain/Config/ConfigInterface.php rename to lib/SP/Domain/Config/Ports/ConfigInterface.php index 7279c4da..a264199b 100644 --- a/lib/SP/Domain/Config/ConfigInterface.php +++ b/lib/SP/Domain/Config/Ports/ConfigInterface.php @@ -22,11 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config; - +namespace SP\Domain\Config\Ports; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; -use SP\Domain\Config\In\ConfigDataInterface; use SP\Infrastructure\File\FileException; /** @@ -44,13 +42,16 @@ interface ConfigInterface /** * Guardar la configuración * - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param ConfigDataInterface $configData * @param bool|null $backup * * @return ConfigInterface * @throws \SP\Infrastructure\File\FileException */ - public function saveConfig(In\ConfigDataInterface $configData, ?bool $backup = true): ConfigInterface; + public function saveConfig( + ConfigDataInterface $configData, + ?bool $backup = true + ): ConfigInterface; /** * Commits a config data @@ -65,7 +66,7 @@ interface ConfigInterface /** * Returns a clone of the configuration data * - * @return \SP\Domain\Config\In\ConfigDataInterface + * @return \SP\Domain\Config\Ports\ConfigDataInterface */ public function getConfigData(): ConfigDataInterface; @@ -74,4 +75,4 @@ interface ConfigInterface * @throws EnvironmentIsBrokenException */ public function generateUpgradeKey(): ConfigInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/In/ConfigRepositoryInterface.php b/lib/SP/Domain/Config/Ports/ConfigRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/Config/In/ConfigRepositoryInterface.php rename to lib/SP/Domain/Config/Ports/ConfigRepositoryInterface.php index b644cef0..ec66dfac 100644 --- a/lib/SP/Domain/Config/In/ConfigRepositoryInterface.php +++ b/lib/SP/Domain/Config/Ports/ConfigRepositoryInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config\In; +namespace SP\Domain\Config\Ports; use SP\Core\Exceptions\ConstraintException; @@ -90,4 +90,4 @@ interface ConfigRepositoryInterface * @throws \SP\Core\Exceptions\QueryException */ public function deleteByParam(string $param): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/ConfigServiceInterface.php b/lib/SP/Domain/Config/Ports/ConfigServiceInterface.php similarity index 98% rename from lib/SP/Domain/Config/ConfigServiceInterface.php rename to lib/SP/Domain/Config/Ports/ConfigServiceInterface.php index bfb1fd70..f0b0f046 100644 --- a/lib/SP/Domain/Config/ConfigServiceInterface.php +++ b/lib/SP/Domain/Config/Ports/ConfigServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config; - +namespace SP\Domain\Config\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -76,4 +75,4 @@ interface ConfigServiceInterface * @throws \SP\Infrastructure\Common\Repositories\NoSuchItemException */ public function deleteByParam(string $param): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/UpgradeConfigServiceInterface.php b/lib/SP/Domain/Config/Ports/UpgradeConfigServiceInterface.php similarity index 93% rename from lib/SP/Domain/Config/UpgradeConfigServiceInterface.php rename to lib/SP/Domain/Config/Ports/UpgradeConfigServiceInterface.php index d97d88e9..3d0f7a4f 100644 --- a/lib/SP/Domain/Config/UpgradeConfigServiceInterface.php +++ b/lib/SP/Domain/Config/Ports/UpgradeConfigServiceInterface.php @@ -22,10 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Config; +namespace SP\Domain\Config\Ports; - -use SP\Domain\Upgrade\UpgradeInterface; +use SP\Domain\Upgrade\Services\UpgradeInterface; /** * Class UpgradeService @@ -40,4 +39,4 @@ interface UpgradeConfigServiceInterface extends UpgradeInterface * @throws \SP\Domain\Upgrade\Services\UpgradeException */ public function upgradeOldConfigFile(string $version): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/Services/ConfigBackupService.php b/lib/SP/Domain/Config/Services/ConfigBackupService.php index 7071e208..86d5aad4 100644 --- a/lib/SP/Domain/Config/Services/ConfigBackupService.php +++ b/lib/SP/Domain/Config/Services/ConfigBackupService.php @@ -28,9 +28,9 @@ use Exception; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Config\Adapters\ConfigData; -use SP\Domain\Config\ConfigBackupServiceInterface; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigBackupServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Http\Json; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\File\FileException; @@ -108,4 +108,4 @@ class ConfigBackupService implements ConfigBackupServiceInterface throw new ServiceException(__u('Unable to restore the configuration')); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/Services/ConfigFileService.php b/lib/SP/Domain/Config/Services/ConfigFileService.php index b3c3f740..96a3feb8 100644 --- a/lib/SP/Domain/Config/Services/ConfigFileService.php +++ b/lib/SP/Domain/Config/Services/ConfigFileService.php @@ -31,9 +31,9 @@ use SP\Core\Context\ContextInterface; use SP\Core\Exceptions\ConfigException; use SP\Core\Exceptions\SPException; use SP\Domain\Config\Adapters\ConfigData; -use SP\Domain\Config\ConfigBackupServiceInterface; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigBackupServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Infrastructure\File\FileCacheInterface; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\XmlFileStorageInterface; @@ -172,7 +172,7 @@ class ConfigFileService implements ConfigInterface /** * Guardar la configuración * - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param bool|null $backup * * @return ConfigInterface @@ -250,7 +250,7 @@ class ConfigFileService implements ConfigInterface /** * Returns a clone of the configuration data * - * @return \SP\Domain\Config\In\ConfigDataInterface + * @return \SP\Domain\Config\Ports\ConfigDataInterface */ public function getConfigData(): ConfigDataInterface { diff --git a/lib/SP/Domain/Config/Services/ConfigService.php b/lib/SP/Domain/Config/Services/ConfigService.php index b3dd16aa..80b25ae1 100644 --- a/lib/SP/Domain/Config/Services/ConfigService.php +++ b/lib/SP/Domain/Config/Services/ConfigService.php @@ -33,8 +33,8 @@ use SP\DataModel\ConfigData; use SP\DataModel\Dto\ConfigRequest; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Config\In\ConfigRepositoryInterface; +use SP\Domain\Config\Ports\ConfigRepositoryInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Config\Repositories\ConfigRepository; @@ -164,4 +164,4 @@ final class ConfigService extends Service implements ConfigServiceInterface ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Config/Services/UpgradeConfigService.php b/lib/SP/Domain/Config/Services/UpgradeConfigService.php index 50db009d..e779fb47 100644 --- a/lib/SP/Domain/Config/Services/UpgradeConfigService.php +++ b/lib/SP/Domain/Config/Services/UpgradeConfigService.php @@ -30,8 +30,8 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\MimeTypesInterface; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Config\UpgradeConfigServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\UpgradeConfigServiceInterface; use SP\Domain\Upgrade\Services\UpgradeException; use SP\Infrastructure\File\FileException; use SP\Providers\Auth\Ldap\LdapTypeInterface; @@ -371,4 +371,4 @@ final class UpgradeConfigService extends Service implements UpgradeConfigService ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/MasterPassServiceInterface.php b/lib/SP/Domain/Crypt/Ports/MasterPassServiceInterface.php similarity index 98% rename from lib/SP/Domain/Crypt/MasterPassServiceInterface.php rename to lib/SP/Domain/Crypt/Ports/MasterPassServiceInterface.php index 55f4f755..7f94dc24 100644 --- a/lib/SP/Domain/Crypt/MasterPassServiceInterface.php +++ b/lib/SP/Domain/Crypt/Ports/MasterPassServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Crypt; - +namespace SP\Domain\Crypt\Ports; use Exception; use SP\Core\Exceptions\ConstraintException; @@ -61,4 +60,4 @@ interface MasterPassServiceInterface * @throws QueryException */ public function updateConfig($hash): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/SecureSessionServiceInterface.php b/lib/SP/Domain/Crypt/Ports/SecureSessionServiceInterface.php similarity index 92% rename from lib/SP/Domain/Crypt/SecureSessionServiceInterface.php rename to lib/SP/Domain/Crypt/Ports/SecureSessionServiceInterface.php index 93cf7645..174290f1 100644 --- a/lib/SP/Domain/Crypt/SecureSessionServiceInterface.php +++ b/lib/SP/Domain/Crypt/Ports/SecureSessionServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Crypt; - +namespace SP\Domain\Crypt\Ports; use Defuse\Crypto\Key; use SP\Core\Crypt\UUIDCookie; @@ -42,7 +41,7 @@ interface SecureSessionServiceInterface * * @return Key|false */ - public function getKey(UUIDCookie $cookie); + public function getKey(UUIDCookie $cookie): Key|bool; public function getFilename(): string; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/TemporaryMasterPassServiceInterface.php b/lib/SP/Domain/Crypt/Ports/TemporaryMasterPassServiceInterface.php similarity index 98% rename from lib/SP/Domain/Crypt/TemporaryMasterPassServiceInterface.php rename to lib/SP/Domain/Crypt/Ports/TemporaryMasterPassServiceInterface.php index 7063dba7..5084dd40 100644 --- a/lib/SP/Domain/Crypt/TemporaryMasterPassServiceInterface.php +++ b/lib/SP/Domain/Crypt/Ports/TemporaryMasterPassServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Crypt; - +namespace SP\Domain\Crypt\Ports; use Defuse\Crypto\Exception\CryptoException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -82,4 +81,4 @@ interface TemporaryMasterPassServiceInterface * @throws CryptoException */ public function getUsingKey(string $key): string; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/Services/MasterPassService.php b/lib/SP/Domain/Crypt/Services/MasterPassService.php index b8bee7b8..cb78c0ed 100644 --- a/lib/SP/Domain/Crypt/Services/MasterPassService.php +++ b/lib/SP/Domain/Crypt/Services/MasterPassService.php @@ -29,13 +29,13 @@ use SP\Core\Application; use SP\Core\Crypt\Hash; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountCryptServiceInterface; +use SP\Domain\Account\Ports\AccountCryptServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\ConfigServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Config\Services\ConfigService; -use SP\Domain\Crypt\MasterPassServiceInterface; -use SP\Domain\CustomField\CustomFieldCryptServiceInterface; +use SP\Domain\Crypt\Ports\MasterPassServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldCryptServiceInterface; use SP\Domain\CustomField\Services\CustomFieldCryptService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -115,4 +115,4 @@ final class MasterPassService extends Service implements MasterPassServiceInterf $this->configService->save(self::PARAM_MASTER_PASS_HASH, $hash); $this->configService->save(self::PARAM_MASTER_PASS_TIME, time()); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/Services/SecureSessionService.php b/lib/SP/Domain/Crypt/Services/SecureSessionService.php index f066adc7..77fc3b12 100644 --- a/lib/SP/Domain/Crypt/Services/SecureSessionService.php +++ b/lib/SP/Domain/Crypt/Services/SecureSessionService.php @@ -31,7 +31,7 @@ use SP\Core\Crypt\UUIDCookie; use SP\Core\Crypt\Vault; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Crypt\SecureSessionServiceInterface; +use SP\Domain\Crypt\Ports\SecureSessionServiceInterface; use SP\Http\RequestInterface; use SP\Infrastructure\File\FileCache; use SP\Infrastructure\File\FileException; @@ -161,4 +161,4 @@ final class SecureSessionService extends Service implements SecureSessionService { return $this->filename; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php b/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php index 124f5b67..94e12e87 100644 --- a/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php +++ b/lib/SP/Domain/Crypt/Services/TemporaryMasterPassService.php @@ -36,10 +36,10 @@ use SP\Core\Messages\MailMessage; use SP\DataModel\Dto\ConfigRequest; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Crypt\TemporaryMasterPassServiceInterface; -use SP\Domain\Notification\MailServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; +use SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Util\PasswordUtil; @@ -291,4 +291,4 @@ final class TemporaryMasterPassService extends Service $key ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Out/CustomFieldAdapter.php b/lib/SP/Domain/CustomField/Adapters/CustomFieldAdapter.php similarity index 89% rename from lib/SP/Domain/CustomField/Out/CustomFieldAdapter.php rename to lib/SP/Domain/CustomField/Adapters/CustomFieldAdapter.php index 7576374f..0b0a5013 100644 --- a/lib/SP/Domain/CustomField/Out/CustomFieldAdapter.php +++ b/lib/SP/Domain/CustomField/Adapters/CustomFieldAdapter.php @@ -22,9 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField\Out; +namespace SP\Domain\CustomField\Adapters; -use SP\Domain\Common\Out\AdapterBase; +use SP\Domain\Common\Adapters\Adapter; use SP\Domain\CustomField\Services\CustomFieldItem; /** @@ -32,7 +32,7 @@ use SP\Domain\CustomField\Services\CustomFieldItem; * * @package SP\Adapters */ -final class CustomFieldAdapter extends AdapterBase implements CustomFieldAdapterInterface +final class CustomFieldAdapter extends Adapter implements CustomFieldAdapterInterface { public function transform(CustomFieldItem $data): array { diff --git a/lib/SP/Domain/CustomField/Out/CustomFieldAdapterInterface.php b/lib/SP/Domain/CustomField/Adapters/CustomFieldAdapterInterface.php similarity index 96% rename from lib/SP/Domain/CustomField/Out/CustomFieldAdapterInterface.php rename to lib/SP/Domain/CustomField/Adapters/CustomFieldAdapterInterface.php index bf7d7c1e..a9077291 100644 --- a/lib/SP/Domain/CustomField/Out/CustomFieldAdapterInterface.php +++ b/lib/SP/Domain/CustomField/Adapters/CustomFieldAdapterInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField\Out; +namespace SP\Domain\CustomField\Adapters; use SP\Domain\CustomField\Services\CustomFieldItem; diff --git a/lib/SP/Domain/CustomField/CustomFieldCryptServiceInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldCryptServiceInterface.php similarity index 96% rename from lib/SP/Domain/CustomField/CustomFieldCryptServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldCryptServiceInterface.php index f63f245c..b03a3a4a 100644 --- a/lib/SP/Domain/CustomField/CustomFieldCryptServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldCryptServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; @@ -43,4 +42,4 @@ interface CustomFieldCryptServiceInterface * @throws ServiceException */ public function updateMasterPassword(UpdateMasterPassRequest $request): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/In/CustomFieldDefRepositoryInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldDefRepositoryInterface.php similarity index 86% rename from lib/SP/Domain/CustomField/In/CustomFieldDefRepositoryInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldDefRepositoryInterface.php index fc587697..873679d6 100644 --- a/lib/SP/Domain/CustomField/In/CustomFieldDefRepositoryInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldDefRepositoryInterface.php @@ -22,20 +22,17 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField\In; - - -use SP\Domain\Common\In\RepositoryInterface; +namespace SP\Domain\CustomField\Ports; /** * Class CustomFieldDefRepository * * @package SP\Infrastructure\CustomField\Repositories */ -interface CustomFieldDefRepositoryInterface extends RepositoryInterface +interface CustomFieldDefRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { /** * Resets the custom fields collection cache */ public function resetCollection(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/CustomFieldDefServiceInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldDefServiceInterface.php similarity index 98% rename from lib/SP/Domain/CustomField/CustomFieldDefServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldDefServiceInterface.php index 704de1f7..c821541c 100644 --- a/lib/SP/Domain/CustomField/CustomFieldDefServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldDefServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -96,4 +95,4 @@ interface CustomFieldDefServiceInterface * @throws QueryException */ public function getAllBasic(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/In/CustomFieldRepositoryInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/CustomField/In/CustomFieldRepositoryInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldRepositoryInterface.php index 40035707..eef9d9cb 100644 --- a/lib/SP/Domain/CustomField/In/CustomFieldRepositoryInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldRepositoryInterface.php @@ -22,13 +22,12 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField\In; - +namespace SP\Domain\CustomField\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\CustomFieldData; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -128,4 +127,4 @@ interface CustomFieldRepositoryInterface extends RepositoryInterface * @throws \SP\Core\Exceptions\QueryException */ public function getForModuleAndItemId(int $moduleId, ?int $itemId): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/CustomFieldServiceInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldServiceInterface.php similarity index 98% rename from lib/SP/Domain/CustomField/CustomFieldServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldServiceInterface.php index f833d19e..6004acd5 100644 --- a/lib/SP/Domain/CustomField/CustomFieldServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use Defuse\Crypto\Exception\CryptoException; use SP\Core\Exceptions\ConstraintException; @@ -137,4 +136,4 @@ interface CustomFieldServiceInterface * @throws ConstraintException */ public function getAllEncrypted(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/In/CustomFieldTypeRepositoryInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldTypeRepositoryInterface.php similarity index 85% rename from lib/SP/Domain/CustomField/In/CustomFieldTypeRepositoryInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldTypeRepositoryInterface.php index a2d1ebcb..042dfbd7 100644 --- a/lib/SP/Domain/CustomField/In/CustomFieldTypeRepositoryInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldTypeRepositoryInterface.php @@ -22,16 +22,13 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField\In; - - -use SP\Domain\Common\In\RepositoryInterface; +namespace SP\Domain\CustomField\Ports; /** * Class CustomFieldTypeRepository * * @package SP\Infrastructure\CustomField\Repositories */ -interface CustomFieldTypeRepositoryInterface extends RepositoryInterface +interface CustomFieldTypeRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/CustomFieldTypeServiceInterface.php b/lib/SP/Domain/CustomField/Ports/CustomFieldTypeServiceInterface.php similarity index 97% rename from lib/SP/Domain/CustomField/CustomFieldTypeServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/CustomFieldTypeServiceInterface.php index 2357e1ef..ccbf6f0b 100644 --- a/lib/SP/Domain/CustomField/CustomFieldTypeServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/CustomFieldTypeServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -60,4 +59,4 @@ interface CustomFieldTypeServiceInterface * @throws \SP\Infrastructure\Common\Repositories\NoSuchItemException */ public function getById(int $id); -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/UpgradeCustomFieldDataServiceInterface.php b/lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDataServiceInterface.php similarity index 96% rename from lib/SP/Domain/CustomField/UpgradeCustomFieldDataServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDataServiceInterface.php index 665aafe2..2d32d0d6 100644 --- a/lib/SP/Domain/CustomField/UpgradeCustomFieldDataServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDataServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use Exception; @@ -40,4 +39,4 @@ interface UpgradeCustomFieldDataServiceInterface * @throws Exception */ public function upgrade_300_18072902(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/UpgradeCustomFieldDefinitionServiceInterface.php b/lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDefinitionServiceInterface.php similarity index 97% rename from lib/SP/Domain/CustomField/UpgradeCustomFieldDefinitionServiceInterface.php rename to lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDefinitionServiceInterface.php index d902fbaf..7e042f0c 100644 --- a/lib/SP/Domain/CustomField/UpgradeCustomFieldDefinitionServiceInterface.php +++ b/lib/SP/Domain/CustomField/Ports/UpgradeCustomFieldDefinitionServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\CustomField; - +namespace SP\Domain\CustomField\Ports; use Exception; @@ -54,4 +53,4 @@ interface UpgradeCustomFieldDefinitionServiceInterface * @throws Exception */ public function upgrade_310_19042701(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/CustomFieldCryptService.php b/lib/SP/Domain/CustomField/Services/CustomFieldCryptService.php index 40023b69..602c8f67 100644 --- a/lib/SP/Domain/CustomField/Services/CustomFieldCryptService.php +++ b/lib/SP/Domain/CustomField/Services/CustomFieldCryptService.php @@ -38,8 +38,8 @@ use SP\DataModel\CustomFieldData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; -use SP\Domain\CustomField\CustomFieldCryptServiceInterface; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldCryptServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Domain\Task\Services\TaskFactory; /** @@ -167,4 +167,4 @@ final class CustomFieldCryptService extends Service implements CustomFieldCryptS ) ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/CustomFieldDefService.php b/lib/SP/Domain/CustomField/Services/CustomFieldDefService.php index eb8dddba..7ee7499f 100644 --- a/lib/SP/Domain/CustomField/Services/CustomFieldDefService.php +++ b/lib/SP/Domain/CustomField/Services/CustomFieldDefService.php @@ -34,9 +34,9 @@ use SP\DataModel\ItemSearchData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; -use SP\Domain\CustomField\In\CustomFieldDefRepositoryInterface; -use SP\Domain\CustomField\In\CustomFieldRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldRepositoryInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryResult; @@ -213,4 +213,4 @@ final class CustomFieldDefService extends Service implements CustomFieldDefServi { return $this->customFieldDefRepository->getAll()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/CustomFieldService.php b/lib/SP/Domain/CustomField/Services/CustomFieldService.php index 21894fc6..8ac8069f 100644 --- a/lib/SP/Domain/CustomField/Services/CustomFieldService.php +++ b/lib/SP/Domain/CustomField/Services/CustomFieldService.php @@ -33,9 +33,9 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\CustomField\In\CustomFieldDefRepositoryInterface; -use SP\Domain\CustomField\In\CustomFieldRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; /** @@ -272,4 +272,4 @@ final class CustomFieldService extends Service implements CustomFieldServiceInte { return $this->customFieldRepository->getAllEncrypted()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/CustomFieldTypeService.php b/lib/SP/Domain/CustomField/Services/CustomFieldTypeService.php index 35a6775d..664eb03f 100644 --- a/lib/SP/Domain/CustomField/Services/CustomFieldTypeService.php +++ b/lib/SP/Domain/CustomField/Services/CustomFieldTypeService.php @@ -30,8 +30,8 @@ use SP\Core\Exceptions\QueryException; use SP\DataModel\CustomFieldTypeData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\CustomField\CustomFieldTypeServiceInterface; -use SP\Domain\CustomField\In\CustomFieldTypeRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\CustomField\Repositories\CustomFieldTypeRepository; @@ -92,4 +92,4 @@ final class CustomFieldTypeService extends Service implements CustomFieldTypeSer return $result->getData(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDataService.php b/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDataService.php index cec54cc2..81319f6c 100644 --- a/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDataService.php +++ b/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDataService.php @@ -31,8 +31,8 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Common\Services\Service; -use SP\Domain\CustomField\CustomFieldServiceInterface; -use SP\Domain\CustomField\UpgradeCustomFieldDataServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\UpgradeCustomFieldDataServiceInterface; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; @@ -129,4 +129,4 @@ final class UpgradeCustomFieldDataService extends Service return $moduleId; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDefinitionService.php b/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDefinitionService.php index 947a7e11..9571f46f 100644 --- a/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDefinitionService.php +++ b/lib/SP/Domain/CustomField/Services/UpgradeCustomFieldDefinitionService.php @@ -32,9 +32,9 @@ use SP\Core\Events\EventMessage; use SP\DataModel\CustomFieldDefDataOld; use SP\DataModel\CustomFieldDefinitionData; use SP\Domain\Common\Services\Service; -use SP\Domain\CustomField\CustomFieldDefServiceInterface; -use SP\Domain\CustomField\CustomFieldTypeServiceInterface; -use SP\Domain\CustomField\UpgradeCustomFieldDefinitionServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeServiceInterface; +use SP\Domain\CustomField\Ports\UpgradeCustomFieldDefinitionServiceInterface; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; use SP\Util\Util; @@ -331,4 +331,4 @@ final class UpgradeCustomFieldDefinitionService extends Service ) ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/FileBackupServiceInterface.php b/lib/SP/Domain/Export/Ports/FileBackupServiceInterface.php similarity index 97% rename from lib/SP/Domain/Export/FileBackupServiceInterface.php rename to lib/SP/Domain/Export/Ports/FileBackupServiceInterface.php index 40c0e4e1..aa00f5ee 100644 --- a/lib/SP/Domain/Export/FileBackupServiceInterface.php +++ b/lib/SP/Domain/Export/Ports/FileBackupServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Export; - +namespace SP\Domain\Export\Ports; /** * Esta clase es la encargada de realizar la copia de sysPass. @@ -38,4 +37,4 @@ interface FileBackupServiceInterface public function doBackup(string $backupPath = BACKUP_PATH, string $applicationPath = APP_ROOT): void; public function getHash(): string; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/XmlExportServiceInterface.php b/lib/SP/Domain/Export/Ports/XmlExportServiceInterface.php similarity index 97% rename from lib/SP/Domain/Export/XmlExportServiceInterface.php rename to lib/SP/Domain/Export/Ports/XmlExportServiceInterface.php index b8dda036..8bfdbb15 100644 --- a/lib/SP/Domain/Export/XmlExportServiceInterface.php +++ b/lib/SP/Domain/Export/Ports/XmlExportServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Export; - +namespace SP\Domain\Export\Ports; use SP\Core\Exceptions\CheckException; use SP\Infrastructure\File\FileException; @@ -55,4 +54,4 @@ interface XmlExportServiceInterface public function getExportFile(): string; public function isEncrypted(): bool; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/XmlVerifyServiceInterface.php b/lib/SP/Domain/Export/Ports/XmlVerifyServiceInterface.php similarity index 97% rename from lib/SP/Domain/Export/XmlVerifyServiceInterface.php rename to lib/SP/Domain/Export/Ports/XmlVerifyServiceInterface.php index 1bfd1e06..62157537 100644 --- a/lib/SP/Domain/Export/XmlVerifyServiceInterface.php +++ b/lib/SP/Domain/Export/Ports/XmlVerifyServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Export; - +namespace SP\Domain\Export\Ports; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Export\Services\VerifyResult; @@ -52,4 +51,4 @@ interface XmlVerifyServiceInterface * @throws \SP\Domain\Common\Services\ServiceException */ public function verifyEncrypted(string $xmlFile, string $password): VerifyResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/Services/FileBackupService.php b/lib/SP/Domain/Export/Services/FileBackupService.php index bda690b6..8dc76e34 100644 --- a/lib/SP/Domain/Export/Services/FileBackupService.php +++ b/lib/SP/Domain/Export/Services/FileBackupService.php @@ -34,9 +34,9 @@ use SP\Core\Events\EventMessage; use SP\Core\Exceptions\CheckException; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigFileService; -use SP\Domain\Export\FileBackupServiceInterface; +use SP\Domain\Export\Ports\FileBackupServiceInterface; use SP\Infrastructure\Database\Database; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\Database\QueryData; @@ -337,4 +337,4 @@ final class FileBackupService implements FileBackupServiceInterface { return $this->backupFiles->getHash(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/Services/XmlExportService.php b/lib/SP/Domain/Export/Services/XmlExportService.php index 71fcdba6..921f2548 100644 --- a/lib/SP/Domain/Export/Services/XmlExportService.php +++ b/lib/SP/Domain/Export/Services/XmlExportService.php @@ -38,15 +38,15 @@ use SP\Core\Exceptions\CheckException; use SP\Core\Exceptions\SPException; use SP\Core\PhpExtensionChecker; use SP\DataModel\CategoryData; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\AccountToTagServiceInterface; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountToTagServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Export\XmlExportServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Export\Ports\XmlExportServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Infrastructure\File\ArchiveHandler; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; @@ -603,4 +603,4 @@ final class XmlExportService extends Service implements XmlExportServiceInterfac { return $this->encrypted; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Export/Services/XmlVerifyService.php b/lib/SP/Domain/Export/Services/XmlVerifyService.php index b48e906d..f4ea9bc5 100644 --- a/lib/SP/Domain/Export/Services/XmlVerifyService.php +++ b/lib/SP/Domain/Export/Services/XmlVerifyService.php @@ -33,7 +33,7 @@ use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Hash; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Export\XmlVerifyServiceInterface; +use SP\Domain\Export\Ports\XmlVerifyServiceInterface; use SP\Domain\Import\Services\FileImport; use SP\Domain\Import\Services\ImportException; use SP\Domain\Import\Services\XmlFileImport; @@ -261,4 +261,4 @@ final class XmlVerifyService extends Service implements XmlVerifyServiceInterfac return $this->xml; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/ImportServiceInterface.php b/lib/SP/Domain/Import/Ports/ImportServiceInterface.php similarity index 93% rename from lib/SP/Domain/Import/ImportServiceInterface.php rename to lib/SP/Domain/Import/Ports/ImportServiceInterface.php index b8438e0d..d0092ef2 100644 --- a/lib/SP/Domain/Import/ImportServiceInterface.php +++ b/lib/SP/Domain/Import/Ports/ImportServiceInterface.php @@ -22,10 +22,10 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; - +namespace SP\Domain\Import\Ports; use Exception; +use SP\Domain\Import\Services\FileImportInterface; use SP\Domain\Import\Services\ImportParams; /** @@ -40,4 +40,4 @@ interface ImportServiceInterface * @throws Exception */ public function doImport(ImportParams $importParams, FileImportInterface $fileImport): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/LdapImportServiceInterface.php b/lib/SP/Domain/Import/Ports/LdapImportServiceInterface.php similarity index 97% rename from lib/SP/Domain/Import/LdapImportServiceInterface.php rename to lib/SP/Domain/Import/Ports/LdapImportServiceInterface.php index e8801549..df382074 100644 --- a/lib/SP/Domain/Import/LdapImportServiceInterface.php +++ b/lib/SP/Domain/Import/Ports/LdapImportServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; - +namespace SP\Domain\Import\Ports; use SP\Domain\Import\Services\LdapImportParams; use SP\Providers\Auth\Ldap\LdapException; @@ -53,4 +52,4 @@ interface LdapImportServiceInterface * @throws LdapException */ public function importUsers(LdapParams $ldapParams, LdapImportParams $ldapImportParams): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/CsvImport.php b/lib/SP/Domain/Import/Services/CsvImport.php index 6cf32c27..f570e265 100644 --- a/lib/SP/Domain/Import/Services/CsvImport.php +++ b/lib/SP/Domain/Import/Services/CsvImport.php @@ -26,7 +26,6 @@ namespace SP\Domain\Import\Services; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; -use SP\Domain\Import\ImportInterface; use SP\Infrastructure\File\FileException; defined('APP_ROOT') || die(); @@ -59,4 +58,4 @@ final class CsvImport extends CsvImportBase implements ImportInterface return $this; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/CsvImportBase.php b/lib/SP/Domain/Import/Services/CsvImportBase.php index e201d4bf..d0300574 100644 --- a/lib/SP/Domain/Import/Services/CsvImportBase.php +++ b/lib/SP/Domain/Import/Services/CsvImportBase.php @@ -33,7 +33,6 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ClientData; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Import\FileImportInterface; use SP\Infrastructure\File\FileException; defined('APP_ROOT') || die(); @@ -159,4 +158,4 @@ abstract class CsvImportBase ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/FileImport.php b/lib/SP/Domain/Import/Services/FileImport.php index 1eb82cc4..e002c48c 100644 --- a/lib/SP/Domain/Import/Services/FileImport.php +++ b/lib/SP/Domain/Import/Services/FileImport.php @@ -25,7 +25,6 @@ namespace SP\Domain\Import\Services; use SP\Core\Exceptions\SPException; -use SP\Domain\Import\FileImportInterface; use SP\Http\RequestInterface; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; @@ -161,4 +160,4 @@ final class FileImport implements FileImportInterface { return $this->fileHandler; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/FileImportInterface.php b/lib/SP/Domain/Import/Services/FileImportInterface.php similarity index 97% rename from lib/SP/Domain/Import/FileImportInterface.php rename to lib/SP/Domain/Import/Services/FileImportInterface.php index 15f49a7f..c55ab5ed 100644 --- a/lib/SP/Domain/Import/FileImportInterface.php +++ b/lib/SP/Domain/Import/Services/FileImportInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; - +namespace SP\Domain\Import\Services; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandlerInterface; @@ -57,4 +56,4 @@ interface FileImportInterface public function readFileToString(): string; public function getFileHandler(): FileHandlerInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/ImportHelper.php b/lib/SP/Domain/Import/Services/ImportHelper.php index 532e1e80..a6a1c93b 100644 --- a/lib/SP/Domain/Import/Services/ImportHelper.php +++ b/lib/SP/Domain/Import/Services/ImportHelper.php @@ -25,10 +25,10 @@ namespace SP\Domain\Import\Services; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; /** * A helper class to provide the needed services. @@ -71,4 +71,4 @@ final class ImportHelper { return $this->tagService; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/ImportInterface.php b/lib/SP/Domain/Import/Services/ImportInterface.php similarity index 96% rename from lib/SP/Domain/Import/ImportInterface.php rename to lib/SP/Domain/Import/Services/ImportInterface.php index b4af5a2a..9ef89983 100644 --- a/lib/SP/Domain/Import/ImportInterface.php +++ b/lib/SP/Domain/Import/Services/ImportInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; +namespace SP\Domain\Import\Services; /** * Interface ImportInterface @@ -44,4 +44,4 @@ interface ImportInterface * @return int */ public function getCounter(): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/ImportService.php b/lib/SP/Domain/Import/Services/ImportService.php index 70936043..4d680284 100644 --- a/lib/SP/Domain/Import/Services/ImportService.php +++ b/lib/SP/Domain/Import/Services/ImportService.php @@ -29,10 +29,8 @@ use Exception; use SP\Core\Application; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Import\FileImportInterface; -use SP\Domain\Import\ImportInterface; -use SP\Domain\Import\ImportServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; +use SP\Domain\Import\Ports\ImportServiceInterface; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\File\FileException; @@ -127,4 +125,4 @@ final class ImportService extends Service implements ImportServiceInterface __u('Please, check the file format') ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/ImportTrait.php b/lib/SP/Domain/Import/Services/ImportTrait.php index 1e657c30..d57256f0 100644 --- a/lib/SP/Domain/Import/Services/ImportTrait.php +++ b/lib/SP/Domain/Import/Services/ImportTrait.php @@ -33,11 +33,11 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ClientData; use SP\DataModel\TagData; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountServiceInterface; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Category\CategoryServiceInterface; -use SP\Domain\Client\ClientServiceInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Category\Ports\CategoryServiceInterface; +use SP\Domain\Client\Ports\ClientServiceInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; /** @@ -227,4 +227,4 @@ trait ImportTrait ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/KeepassImport.php b/lib/SP/Domain/Import/Services/KeepassImport.php index 8e55215f..484ce694 100644 --- a/lib/SP/Domain/Import/Services/KeepassImport.php +++ b/lib/SP/Domain/Import/Services/KeepassImport.php @@ -33,7 +33,6 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ClientData; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Import\ImportInterface; use SP\Util\Filter; defined('APP_ROOT') || die(); @@ -184,4 +183,4 @@ final class KeepassImport extends XmlImportBase implements ImportInterface return $accountRequest; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/LdapImportService.php b/lib/SP/Domain/Import/Services/LdapImportService.php index 5af68e52..e5dabe90 100644 --- a/lib/SP/Domain/Import/Services/LdapImportService.php +++ b/lib/SP/Domain/Import/Services/LdapImportService.php @@ -31,9 +31,9 @@ use SP\Core\Events\EventMessage; use SP\DataModel\UserData; use SP\DataModel\UserGroupData; use SP\Domain\Common\Services\Service; -use SP\Domain\Import\LdapImportServiceInterface; +use SP\Domain\Import\Ports\LdapImportServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserGroupService; -use SP\Domain\User\UserServiceInterface; use SP\Providers\Auth\Ldap\Ldap; use SP\Providers\Auth\Ldap\LdapException; use SP\Providers\Auth\Ldap\LdapInterface; @@ -244,4 +244,4 @@ final class LdapImportService extends Service implements LdapImportServiceInterf } } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/SyspassImport.php b/lib/SP/Domain/Import/Services/SyspassImport.php index cb0d05a4..811a03d3 100644 --- a/lib/SP/Domain/Import/Services/SyspassImport.php +++ b/lib/SP/Domain/Import/Services/SyspassImport.php @@ -40,7 +40,6 @@ use SP\DataModel\ClientData; use SP\DataModel\TagData; use SP\Domain\Account\Services\AccountRequest; use SP\Domain\Export\Services\XmlVerifyService; -use SP\Domain\Import\ImportInterface; use SP\Util\VersionUtil; defined('APP_ROOT') || die(); @@ -499,4 +498,4 @@ final class SyspassImport extends XmlImportBase implements ImportInterface return $tags; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/XmlFileImport.php b/lib/SP/Domain/Import/Services/XmlFileImport.php index 9ee95b86..20d26e5c 100644 --- a/lib/SP/Domain/Import/Services/XmlFileImport.php +++ b/lib/SP/Domain/Import/Services/XmlFileImport.php @@ -26,8 +26,6 @@ namespace SP\Domain\Import\Services; use DOMDocument; use SP\Core\Exceptions\SPException; -use SP\Domain\Import\FileImportInterface; -use SP\Domain\Import\XmlFileImportInterface; use SP\Infrastructure\File\FileException; /** @@ -43,7 +41,7 @@ final class XmlFileImport implements XmlFileImportInterface /** * XmlFileImport constructor. * - * @param \SP\Domain\Import\FileImportInterface $fileImport + * @param \SP\Domain\Import\Services\FileImportInterface $fileImport * * @throws ImportException * @throws FileException @@ -132,4 +130,4 @@ final class XmlFileImport implements XmlFileImportInterface return null; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/XmlFileImportInterface.php b/lib/SP/Domain/Import/Services/XmlFileImportInterface.php similarity index 93% rename from lib/SP/Domain/Import/XmlFileImportInterface.php rename to lib/SP/Domain/Import/Services/XmlFileImportInterface.php index fe2bb332..c1959f49 100644 --- a/lib/SP/Domain/Import/XmlFileImportInterface.php +++ b/lib/SP/Domain/Import/Services/XmlFileImportInterface.php @@ -22,11 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; - +namespace SP\Domain\Import\Services; use DOMDocument; -use SP\Domain\Import\Services\ImportException; /** * Class XmlFileImport @@ -43,4 +41,4 @@ interface XmlFileImportInterface public function detectXMLFormat(): string; public function getXmlDOM(): DOMDocument; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/XmlImport.php b/lib/SP/Domain/Import/Services/XmlImport.php index 32ac0322..2e941719 100644 --- a/lib/SP/Domain/Import/Services/XmlImport.php +++ b/lib/SP/Domain/Import/Services/XmlImport.php @@ -26,10 +26,7 @@ namespace SP\Domain\Import\Services; use SP\Core\Application; use SP\Core\Exceptions\SPException; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Import\ImportInterface; -use SP\Domain\Import\XmlFileImportInterface; -use SP\Domain\Import\XmlImportInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; defined('APP_ROOT') || die(); @@ -114,4 +111,4 @@ final class XmlImport implements XmlImportInterface { throw new ImportException(__u('Not implemented')); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/Services/XmlImportBase.php b/lib/SP/Domain/Import/Services/XmlImportBase.php index 1e60d304..c3f7a816 100644 --- a/lib/SP/Domain/Import/Services/XmlImportBase.php +++ b/lib/SP/Domain/Import/Services/XmlImportBase.php @@ -29,9 +29,8 @@ use DOMElement; use SP\Core\Application; use SP\Core\Events\EventDispatcher; use SP\Core\Exceptions\SPException; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Import\XmlFileImportInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; /** * Class XmlImportBase @@ -109,4 +108,4 @@ abstract class XmlImportBase ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Import/XmlImportInterface.php b/lib/SP/Domain/Import/Services/XmlImportInterface.php similarity index 96% rename from lib/SP/Domain/Import/XmlImportInterface.php rename to lib/SP/Domain/Import/Services/XmlImportInterface.php index f10c7528..9cbe4ce9 100644 --- a/lib/SP/Domain/Import/XmlImportInterface.php +++ b/lib/SP/Domain/Import/Services/XmlImportInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Import; - +namespace SP\Domain\Import\Services; /** * Clase XmlImport para usarla como envoltorio para llamar a la clase que corresponda @@ -33,4 +32,4 @@ namespace SP\Domain\Import; */ interface XmlImportInterface extends ImportInterface { -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/In/InstallData.php b/lib/SP/Domain/Install/Adapters/InstallData.php similarity index 99% rename from lib/SP/Domain/Install/In/InstallData.php rename to lib/SP/Domain/Install/Adapters/InstallData.php index de94864c..98aee3a4 100644 --- a/lib/SP/Domain/Install/In/InstallData.php +++ b/lib/SP/Domain/Install/Adapters/InstallData.php @@ -23,7 +23,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Install\In; +namespace SP\Domain\Install\Adapters; /** * Class InstallData @@ -188,4 +188,4 @@ final class InstallData { $this->backendType = $backendType; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/In/InstallDataFactory.php b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php similarity index 97% rename from lib/SP/Domain/Install/In/InstallDataFactory.php rename to lib/SP/Domain/Install/Adapters/InstallDataFactory.php index 87b3c8e4..8e19717d 100644 --- a/lib/SP/Domain/Install/In/InstallDataFactory.php +++ b/lib/SP/Domain/Install/Adapters/InstallDataFactory.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Install\In; +namespace SP\Domain\Install\Adapters; use SP\Http\RequestInterface; @@ -46,4 +46,4 @@ final class InstallDataFactory return $installData; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/InstallerServiceInterface.php b/lib/SP/Domain/Install/Ports/InstallerServiceInterface.php similarity index 93% rename from lib/SP/Domain/Install/InstallerServiceInterface.php rename to lib/SP/Domain/Install/Ports/InstallerServiceInterface.php index acb2e00a..21da2b4c 100644 --- a/lib/SP/Domain/Install/InstallerServiceInterface.php +++ b/lib/SP/Domain/Install/Ports/InstallerServiceInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Install; - +namespace SP\Domain\Install\Ports; use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Exceptions\SPException; -use SP\Domain\Install\In\InstallData; +use SP\Domain\Install\Adapters\InstallData; /** * Installer class @@ -39,4 +38,4 @@ interface InstallerServiceInterface * @throws SPException */ public function run(InstallData $installData): InstallerServiceInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/DatabaseSetupInterface.php b/lib/SP/Domain/Install/Services/DatabaseSetupInterface.php similarity index 95% rename from lib/SP/Domain/Install/DatabaseSetupInterface.php rename to lib/SP/Domain/Install/Services/DatabaseSetupInterface.php index ca046f32..7d036996 100644 --- a/lib/SP/Domain/Install/DatabaseSetupInterface.php +++ b/lib/SP/Domain/Install/Services/DatabaseSetupInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Install; +namespace SP\Domain\Install\Services; /** * Interface DatabaseInterface @@ -58,7 +58,7 @@ interface DatabaseSetupInterface /** * @return mixed */ - public function checkDatabaseExists(); + public function checkDatabaseExists(): mixed; /** * Deshacer la instalación en caso de fallo. @@ -76,4 +76,4 @@ interface DatabaseSetupInterface * Comprobar la conexión a la BBDD */ public function checkConnection(); -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/Services/InstallerService.php b/lib/SP/Domain/Install/Services/InstallerService.php index 0554f463..6de35f44 100644 --- a/lib/SP/Domain/Install/Services/InstallerService.php +++ b/lib/SP/Domain/Install/Services/InstallerService.php @@ -36,15 +36,14 @@ use SP\DataModel\ProfileData; use SP\DataModel\UserData; use SP\DataModel\UserGroupData; use SP\DataModel\UserProfileData; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Install\DatabaseSetupInterface; -use SP\Domain\Install\In\InstallData; -use SP\Domain\Install\InstallerServiceInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; +use SP\Domain\Install\Adapters\InstallData; +use SP\Domain\Install\Ports\InstallerServiceInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Http\RequestInterface; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Util\VersionUtil; diff --git a/lib/SP/Domain/Install/Services/MysqlService.php b/lib/SP/Domain/Install/Services/MysqlService.php index 436b62b9..5786896d 100644 --- a/lib/SP/Domain/Install/Services/MysqlService.php +++ b/lib/SP/Domain/Install/Services/MysqlService.php @@ -26,8 +26,7 @@ namespace SP\Domain\Install\Services; use PDOException; use SP\Core\Exceptions\SPException; -use SP\Domain\Install\DatabaseSetupInterface; -use SP\Domain\Install\In\InstallData; +use SP\Domain\Install\Adapters\InstallData; use SP\Infrastructure\Database\DatabaseFileInterface; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\Database\DbStorageInterface; diff --git a/lib/SP/Domain/Install/Services/MysqlSetupBuilder.php b/lib/SP/Domain/Install/Services/MysqlSetupBuilder.php index 37f280f8..bbc92af3 100644 --- a/lib/SP/Domain/Install/Services/MysqlSetupBuilder.php +++ b/lib/SP/Domain/Install/Services/MysqlSetupBuilder.php @@ -25,9 +25,7 @@ namespace SP\Domain\Install\Services; -use SP\Domain\Install\DatabaseSetupInterface; -use SP\Domain\Install\In\InstallData; -use SP\Domain\Install\MysqlSetupBuilderInterface; +use SP\Domain\Install\Adapters\InstallData; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\Database\MysqlFileParser; @@ -56,4 +54,4 @@ final class MysqlSetupBuilder implements MysqlSetupBuilderInterface return new MysqlService($mysqlHandler, $installData, $parser, new DatabaseUtil($mysqlHandler)); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Install/MysqlSetupBuilderInterface.php b/lib/SP/Domain/Install/Services/MysqlSetupBuilderInterface.php similarity index 82% rename from lib/SP/Domain/Install/MysqlSetupBuilderInterface.php rename to lib/SP/Domain/Install/Services/MysqlSetupBuilderInterface.php index 8ca1ab5c..709d2e89 100644 --- a/lib/SP/Domain/Install/MysqlSetupBuilderInterface.php +++ b/lib/SP/Domain/Install/Services/MysqlSetupBuilderInterface.php @@ -22,10 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Install; +namespace SP\Domain\Install\Services; - -use SP\Domain\Install\In\InstallData; +use SP\Domain\Install\Adapters\InstallData; /** * Class DatabaseSetupBuilder @@ -33,10 +32,10 @@ use SP\Domain\Install\In\InstallData; interface MysqlSetupBuilderInterface { /** - * @param \SP\Domain\Install\In\InstallData $installData + * @param \SP\Domain\Install\Adapters\InstallData $installData * - * @return \SP\Domain\Install\DatabaseSetupInterface + * @return \SP\Domain\Install\Services\DatabaseSetupInterface * @throws \SP\Core\Exceptions\SPException */ public static function build(InstallData $installData): DatabaseSetupInterface; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/ItemPreset/ItemPresetInterface.php b/lib/SP/Domain/ItemPreset/Ports/ItemPresetInterface.php similarity index 96% rename from lib/SP/Domain/ItemPreset/ItemPresetInterface.php rename to lib/SP/Domain/ItemPreset/Ports/ItemPresetInterface.php index 21ae53c7..e856db12 100644 --- a/lib/SP/Domain/ItemPreset/ItemPresetInterface.php +++ b/lib/SP/Domain/ItemPreset/Ports/ItemPresetInterface.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\ItemPreset; +namespace SP\Domain\ItemPreset\Ports; /** * Interface ItemPresetInterface @@ -35,4 +35,4 @@ interface ItemPresetInterface public const ITEM_TYPE_ACCOUNT_PASSWORD = 'account.password'; public const ITEM_TYPE_ACCOUNT_PRIVATE = 'account.private'; public const ITEM_TYPE_SESSION_TIMEOUT = 'session.timeout'; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/ItemPreset/In/ItemPresetRepositoryInterface.php b/lib/SP/Domain/ItemPreset/Ports/ItemPresetRepositoryInterface.php similarity index 94% rename from lib/SP/Domain/ItemPreset/In/ItemPresetRepositoryInterface.php rename to lib/SP/Domain/ItemPreset/Ports/ItemPresetRepositoryInterface.php index 741d627d..148f4323 100644 --- a/lib/SP/Domain/ItemPreset/In/ItemPresetRepositoryInterface.php +++ b/lib/SP/Domain/ItemPreset/Ports/ItemPresetRepositoryInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\ItemPreset\In; - +namespace SP\Domain\ItemPreset\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -50,4 +49,4 @@ interface ItemPresetRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getByFilter(string $type, int $userId, int $userGroupId, int $userProfileId): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/ItemPreset/ItemPresetServiceInterface.php b/lib/SP/Domain/ItemPreset/Ports/ItemPresetServiceInterface.php similarity index 98% rename from lib/SP/Domain/ItemPreset/ItemPresetServiceInterface.php rename to lib/SP/Domain/ItemPreset/Ports/ItemPresetServiceInterface.php index 6abd921c..40c3b3b9 100644 --- a/lib/SP/Domain/ItemPreset/ItemPresetServiceInterface.php +++ b/lib/SP/Domain/ItemPreset/Ports/ItemPresetServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\ItemPreset; - +namespace SP\Domain\ItemPreset\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -108,4 +107,4 @@ interface ItemPresetServiceInterface * @throws \SP\Domain\Common\Services\ServiceException */ public function deleteByIdBatch(array $ids): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/ItemPreset/Services/ItemPresetService.php b/lib/SP/Domain/ItemPreset/Services/ItemPresetService.php index e54c17ac..d988f965 100644 --- a/lib/SP/Domain/ItemPreset/Services/ItemPresetService.php +++ b/lib/SP/Domain/ItemPreset/Services/ItemPresetService.php @@ -32,8 +32,8 @@ use SP\DataModel\ItemPresetData; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\ItemPreset\In\ItemPresetRepositoryInterface; -use SP\Domain\ItemPreset\ItemPresetServiceInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetRepositoryInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\ItemPreset\Repositories\ItemPresetRepository; @@ -189,4 +189,4 @@ final class ItemPresetService extends Service implements ItemPresetServiceInterf return $count; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Notification/MailServiceInterface.php b/lib/SP/Domain/Notification/Ports/MailServiceInterface.php similarity index 97% rename from lib/SP/Domain/Notification/MailServiceInterface.php rename to lib/SP/Domain/Notification/Ports/MailServiceInterface.php index f335dfc4..198607ea 100644 --- a/lib/SP/Domain/Notification/MailServiceInterface.php +++ b/lib/SP/Domain/Notification/Ports/MailServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Notification; - +namespace SP\Domain\Notification\Ports; use SP\Core\Messages\MailMessage; use SP\Providers\Mail\MailParams; @@ -59,4 +58,4 @@ interface MailServiceInterface public function sendBatch(string $subject, array $to, MailMessage $mailMessage): void; public function getParamsFromConfig(): MailParams; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Notification/In/NotificationRepositoryInterface.php b/lib/SP/Domain/Notification/Ports/NotificationRepositoryInterface.php similarity index 95% rename from lib/SP/Domain/Notification/In/NotificationRepositoryInterface.php rename to lib/SP/Domain/Notification/Ports/NotificationRepositoryInterface.php index 26cb07cf..78edf806 100644 --- a/lib/SP/Domain/Notification/In/NotificationRepositoryInterface.php +++ b/lib/SP/Domain/Notification/Ports/NotificationRepositoryInterface.php @@ -22,13 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Notification\In; - +namespace SP\Domain\Notification\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; -use SP\Domain\Common\In\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -36,7 +34,7 @@ use SP\Infrastructure\Database\QueryResult; * * @package SP\Infrastructure\Notification\Repositories */ -interface NotificationRepositoryInterface extends RepositoryInterface +interface NotificationRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { /** * Deletes an item @@ -133,4 +131,4 @@ interface NotificationRepositoryInterface extends RepositoryInterface * @throws \SP\Core\Exceptions\QueryException */ public function getAllActiveForAdmin(int $id): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Notification/NotificationServiceInterface.php b/lib/SP/Domain/Notification/Ports/NotificationServiceInterface.php similarity index 99% rename from lib/SP/Domain/Notification/NotificationServiceInterface.php rename to lib/SP/Domain/Notification/Ports/NotificationServiceInterface.php index 7d72e072..8a42ae43 100644 --- a/lib/SP/Domain/Notification/NotificationServiceInterface.php +++ b/lib/SP/Domain/Notification/Ports/NotificationServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Notification; - +namespace SP\Domain\Notification\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -171,4 +170,4 @@ interface NotificationServiceInterface * @throws QueryException */ public function searchForUserId(ItemSearchData $itemSearchData, int $userId): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Notification/Services/MailService.php b/lib/SP/Domain/Notification/Services/MailService.php index eb0ff063..3a24de2c 100644 --- a/lib/SP/Domain/Notification/Services/MailService.php +++ b/lib/SP/Domain/Notification/Services/MailService.php @@ -34,7 +34,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Messages\MailMessage; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Notification\MailServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; use SP\Domain\Providers\MailerInterface; use SP\Domain\Providers\MailProviderInterface; use SP\Html\Html; @@ -216,4 +216,4 @@ final class MailService extends Service implements MailServiceInterface $this->sendMail(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Notification/Services/NotificationService.php b/lib/SP/Domain/Notification/Services/NotificationService.php index 474e24b9..8cf1d1e2 100644 --- a/lib/SP/Domain/Notification/Services/NotificationService.php +++ b/lib/SP/Domain/Notification/Services/NotificationService.php @@ -32,8 +32,8 @@ use SP\DataModel\ItemSearchData; use SP\DataModel\NotificationData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Notification\In\NotificationRepositoryInterface; -use SP\Domain\Notification\NotificationServiceInterface; +use SP\Domain\Notification\Ports\NotificationRepositoryInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Notification\Repositories\NotificationRepository; @@ -275,4 +275,4 @@ final class NotificationService extends Service implements NotificationServiceIn { return $this->notificationRepository->searchForUserId($itemSearchData, $userId); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Persistence/UpgradeDatabaseServiceInterface.php b/lib/SP/Domain/Persistence/Ports/UpgradeDatabaseServiceInterface.php similarity index 91% rename from lib/SP/Domain/Persistence/UpgradeDatabaseServiceInterface.php rename to lib/SP/Domain/Persistence/Ports/UpgradeDatabaseServiceInterface.php index 12fb3167..65ea5cce 100644 --- a/lib/SP/Domain/Persistence/UpgradeDatabaseServiceInterface.php +++ b/lib/SP/Domain/Persistence/Ports/UpgradeDatabaseServiceInterface.php @@ -22,10 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Persistence; +namespace SP\Domain\Persistence\Ports; - -use SP\Domain\Upgrade\UpgradeInterface; +use SP\Domain\Upgrade\Services\UpgradeInterface; /** * Class UpgradeDatabaseService @@ -34,4 +33,4 @@ use SP\Domain\Upgrade\UpgradeInterface; */ interface UpgradeDatabaseServiceInterface extends UpgradeInterface { -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/In/PluginDataRepositoryInterface.php b/lib/SP/Domain/Plugin/Ports/PluginDataRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/Plugin/In/PluginDataRepositoryInterface.php rename to lib/SP/Domain/Plugin/Ports/PluginDataRepositoryInterface.php index b9876fa0..3fc8bc09 100644 --- a/lib/SP/Domain/Plugin/In/PluginDataRepositoryInterface.php +++ b/lib/SP/Domain/Plugin/Ports/PluginDataRepositoryInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Plugin\In; - +namespace SP\Domain\Plugin\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -135,4 +134,4 @@ interface PluginDataRepositoryInterface * @throws QueryException */ public function getByItemId(string $name, int $itemId): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/PluginDataServiceInterface.php b/lib/SP/Domain/Plugin/Ports/PluginDataServiceInterface.php similarity index 99% rename from lib/SP/Domain/Plugin/PluginDataServiceInterface.php rename to lib/SP/Domain/Plugin/Ports/PluginDataServiceInterface.php index 7a37341b..1803f928 100644 --- a/lib/SP/Domain/Plugin/PluginDataServiceInterface.php +++ b/lib/SP/Domain/Plugin/Ports/PluginDataServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Plugin; - +namespace SP\Domain\Plugin\Ports; use Defuse\Crypto\Exception\CryptoException; use SP\Core\Exceptions\ConstraintException; @@ -116,4 +115,4 @@ interface PluginDataServiceInterface * @throws QueryException */ public function deleteByItemId(string $name, int $itemId): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/In/PluginRepositoryInterface.php b/lib/SP/Domain/Plugin/Ports/PluginRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Plugin/In/PluginRepositoryInterface.php rename to lib/SP/Domain/Plugin/Ports/PluginRepositoryInterface.php index c65dd9c7..ef990c1b 100644 --- a/lib/SP/Domain/Plugin/In/PluginRepositoryInterface.php +++ b/lib/SP/Domain/Plugin/Ports/PluginRepositoryInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Plugin\In; - +namespace SP\Domain\Plugin\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -115,4 +114,4 @@ interface PluginRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getEnabled(): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/PluginServiceInterface.php b/lib/SP/Domain/Plugin/Ports/PluginServiceInterface.php similarity index 99% rename from lib/SP/Domain/Plugin/PluginServiceInterface.php rename to lib/SP/Domain/Plugin/Ports/PluginServiceInterface.php index ff5ea518..02676b68 100644 --- a/lib/SP/Domain/Plugin/PluginServiceInterface.php +++ b/lib/SP/Domain/Plugin/Ports/PluginServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Plugin; - +namespace SP\Domain\Plugin\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -177,4 +176,4 @@ interface PluginServiceInterface * @throws QueryException */ public function getEnabled(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/UpgradePluginServiceInterface.php b/lib/SP/Domain/Plugin/Ports/UpgradePluginServiceInterface.php similarity index 96% rename from lib/SP/Domain/Plugin/UpgradePluginServiceInterface.php rename to lib/SP/Domain/Plugin/Ports/UpgradePluginServiceInterface.php index b09288ad..3fba78d8 100644 --- a/lib/SP/Domain/Plugin/UpgradePluginServiceInterface.php +++ b/lib/SP/Domain/Plugin/Ports/UpgradePluginServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Plugin; - +namespace SP\Domain\Plugin\Ports; use Exception; @@ -40,4 +39,4 @@ interface UpgradePluginServiceInterface * @throws Exception */ public function upgrade_310_19012201(): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/Services/PluginDataService.php b/lib/SP/Domain/Plugin/Services/PluginDataService.php index c44f9069..1e7ab90e 100644 --- a/lib/SP/Domain/Plugin/Services/PluginDataService.php +++ b/lib/SP/Domain/Plugin/Services/PluginDataService.php @@ -31,8 +31,8 @@ use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\Service; -use SP\Domain\Plugin\In\PluginDataRepositoryInterface; -use SP\Domain\Plugin\PluginDataServiceInterface; +use SP\Domain\Plugin\Ports\PluginDataRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginDataServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Plugin\Repositories\PluginDataModel; @@ -191,4 +191,4 @@ final class PluginDataService extends Service implements PluginDataServiceInterf throw new NoSuchItemException(__u('Plugin\'s data not found'), SPException::INFO); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Plugin/Services/PluginService.php b/lib/SP/Domain/Plugin/Services/PluginService.php index 1eac463e..1adb37a0 100644 --- a/lib/SP/Domain/Plugin/Services/PluginService.php +++ b/lib/SP/Domain/Plugin/Services/PluginService.php @@ -32,8 +32,8 @@ use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Plugin\In\PluginRepositoryInterface; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Plugin\Repositories\PluginModel; @@ -264,4 +264,4 @@ final class PluginService extends Service implements PluginServiceInterface { return $this->pluginRepository->getEnabled()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/In/EventlogRepositoryInterface.php b/lib/SP/Domain/Security/Ports/EventlogRepositoryInterface.php similarity index 97% rename from lib/SP/Domain/Security/In/EventlogRepositoryInterface.php rename to lib/SP/Domain/Security/Ports/EventlogRepositoryInterface.php index 37d183db..a57cd3b7 100644 --- a/lib/SP/Domain/Security/In/EventlogRepositoryInterface.php +++ b/lib/SP/Domain/Security/Ports/EventlogRepositoryInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Security\In; - +namespace SP\Domain\Security\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -66,4 +65,4 @@ interface EventlogRepositoryInterface * @throws QueryException */ public function create(EventlogData $eventlogData): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/EventlogServiceInterface.php b/lib/SP/Domain/Security/Ports/EventlogServiceInterface.php similarity index 97% rename from lib/SP/Domain/Security/EventlogServiceInterface.php rename to lib/SP/Domain/Security/Ports/EventlogServiceInterface.php index ac7c3660..523c0018 100644 --- a/lib/SP/Domain/Security/EventlogServiceInterface.php +++ b/lib/SP/Domain/Security/Ports/EventlogServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Security; - +namespace SP\Domain\Security\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -57,4 +56,4 @@ interface EventlogServiceInterface * @throws QueryException */ public function create(EventlogData $eventlogData): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/In/TrackRepositoryInterface.php b/lib/SP/Domain/Security/Ports/TrackRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/Security/In/TrackRepositoryInterface.php rename to lib/SP/Domain/Security/Ports/TrackRepositoryInterface.php index 2cd0072b..98c45b7d 100644 --- a/lib/SP/Domain/Security/In/TrackRepositoryInterface.php +++ b/lib/SP/Domain/Security/Ports/TrackRepositoryInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Security\In; - +namespace SP\Domain\Security\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -111,4 +110,4 @@ interface TrackRepositoryInterface * @throws QueryException */ public function search(ItemSearchData $itemSearchData): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/TrackServiceInterface.php b/lib/SP/Domain/Security/Ports/TrackServiceInterface.php similarity index 98% rename from lib/SP/Domain/Security/TrackServiceInterface.php rename to lib/SP/Domain/Security/Ports/TrackServiceInterface.php index ab8467a0..3a26e90e 100644 --- a/lib/SP/Domain/Security/TrackServiceInterface.php +++ b/lib/SP/Domain/Security/Ports/TrackServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Security; - +namespace SP\Domain\Security\Ports; use Exception; use SP\Core\Exceptions\ConstraintException; @@ -109,4 +108,4 @@ interface TrackServiceInterface * @throws QueryException */ public function search(ItemSearchData $itemSearchData): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/Services/EventlogService.php b/lib/SP/Domain/Security/Services/EventlogService.php index 06b69b19..0fd4af54 100644 --- a/lib/SP/Domain/Security/Services/EventlogService.php +++ b/lib/SP/Domain/Security/Services/EventlogService.php @@ -31,8 +31,8 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\EventlogData; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Services\Service; -use SP\Domain\Security\EventlogServiceInterface; -use SP\Domain\Security\In\EventlogRepositoryInterface; +use SP\Domain\Security\Ports\EventlogRepositoryInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Http\RequestInterface; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\Security\Repositories\EventlogRepository; @@ -91,4 +91,4 @@ final class EventlogService extends Service implements EventlogServiceInterface return $this->eventLogRepository->create($eventlogData); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Security/Services/TrackService.php b/lib/SP/Domain/Security/Services/TrackService.php index 892b06f0..49f6facf 100644 --- a/lib/SP/Domain/Security/Services/TrackService.php +++ b/lib/SP/Domain/Security/Services/TrackService.php @@ -35,8 +35,8 @@ use SP\DataModel\ItemSearchData; use SP\DataModel\TrackData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Security\In\TrackRepositoryInterface; -use SP\Domain\Security\TrackServiceInterface; +use SP\Domain\Security\Ports\TrackRepositoryInterface; +use SP\Domain\Security\Ports\TrackServiceInterface; use SP\Http\RequestInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; @@ -226,4 +226,4 @@ final class TrackService extends Service implements TrackServiceInterface { return $this->trackRepository->search($itemSearchData); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Tag/In/TagRepositoryInterface.php b/lib/SP/Domain/Tag/Ports/TagRepositoryInterface.php similarity index 90% rename from lib/SP/Domain/Tag/In/TagRepositoryInterface.php rename to lib/SP/Domain/Tag/Ports/TagRepositoryInterface.php index beee8444..92511c2a 100644 --- a/lib/SP/Domain/Tag/In/TagRepositoryInterface.php +++ b/lib/SP/Domain/Tag/Ports/TagRepositoryInterface.php @@ -22,12 +22,10 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Tag\In; - +namespace SP\Domain\Tag\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -35,7 +33,7 @@ use SP\Infrastructure\Database\QueryResult; * * @package SP\Infrastructure\Common\Repositories\Tag */ -interface TagRepositoryInterface extends RepositoryInterface +interface TagRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { /** * Returns the item for given id @@ -47,4 +45,4 @@ interface TagRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getByName(string $name): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Tag/TagServiceInterface.php b/lib/SP/Domain/Tag/Ports/TagServiceInterface.php similarity index 98% rename from lib/SP/Domain/Tag/TagServiceInterface.php rename to lib/SP/Domain/Tag/Ports/TagServiceInterface.php index ffc2798f..bffc078f 100644 --- a/lib/SP/Domain/Tag/TagServiceInterface.php +++ b/lib/SP/Domain/Tag/Ports/TagServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Tag; - +namespace SP\Domain\Tag\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -97,4 +96,4 @@ interface TagServiceInterface * @throws QueryException */ public function getAllBasic(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Tag/Services/TagService.php b/lib/SP/Domain/Tag/Services/TagService.php index 6b8c1a6b..cad53460 100644 --- a/lib/SP/Domain/Tag/Services/TagService.php +++ b/lib/SP/Domain/Tag/Services/TagService.php @@ -33,8 +33,8 @@ use SP\DataModel\TagData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\Tag\In\TagRepositoryInterface; -use SP\Domain\Tag\TagServiceInterface; +use SP\Domain\Tag\Ports\TagRepositoryInterface; +use SP\Domain\Tag\Ports\TagServiceInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; @@ -158,4 +158,4 @@ final class TagService extends Service implements TagServiceInterface { return $this->tagRepository->getAll(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Task/TaskServiceInterface.php b/lib/SP/Domain/Task/Ports/TaskServiceInterface.php similarity index 97% rename from lib/SP/Domain/Task/TaskServiceInterface.php rename to lib/SP/Domain/Task/Ports/TaskServiceInterface.php index a5ffe14a..c35aa90e 100644 --- a/lib/SP/Domain/Task/TaskServiceInterface.php +++ b/lib/SP/Domain/Task/Ports/TaskServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Task; - +namespace SP\Domain\Task\Ports; use Closure; @@ -41,4 +40,4 @@ interface TaskServiceInterface * @throws \SP\Domain\Common\Services\ServiceException */ public function trackStatus(string $taskId, Closure $messagePusher): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Task/Services/TaskService.php b/lib/SP/Domain/Task/Services/TaskService.php index 279ac939..d8a4b42a 100644 --- a/lib/SP/Domain/Task/Services/TaskService.php +++ b/lib/SP/Domain/Task/Services/TaskService.php @@ -27,7 +27,7 @@ namespace SP\Domain\Task\Services; use Closure; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Task\TaskServiceInterface; +use SP\Domain\Task\Ports\TaskServiceInterface; use SP\Infrastructure\File\FileException; use SP\Infrastructure\File\FileHandler; use SP\Util\Util; @@ -209,4 +209,4 @@ final class TaskService extends Service implements TaskServiceInterface return false; } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/UpgradeAppServiceInterface.php b/lib/SP/Domain/Upgrade/Ports/UpgradeAppServiceInterface.php similarity index 91% rename from lib/SP/Domain/Upgrade/UpgradeAppServiceInterface.php rename to lib/SP/Domain/Upgrade/Ports/UpgradeAppServiceInterface.php index 5f2b5ed3..0d8f88b2 100644 --- a/lib/SP/Domain/Upgrade/UpgradeAppServiceInterface.php +++ b/lib/SP/Domain/Upgrade/Ports/UpgradeAppServiceInterface.php @@ -22,8 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Upgrade; +namespace SP\Domain\Upgrade\Ports; +use SP\Domain\Upgrade\Services\UpgradeInterface; /** * Class UpgradeAppService @@ -32,4 +33,4 @@ namespace SP\Domain\Upgrade; */ interface UpgradeAppServiceInterface extends UpgradeInterface { -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeAppService.php b/lib/SP/Domain/Upgrade/Services/UpgradeAppService.php index aa97c08d..c5753411 100644 --- a/lib/SP/Domain/Upgrade/Services/UpgradeAppService.php +++ b/lib/SP/Domain/Upgrade/Services/UpgradeAppService.php @@ -29,18 +29,18 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; +use SP\Domain\Account\Ports\UpgradePublicLinkServiceInterface; use SP\Domain\Account\Services\UpgradePublicLinkService; -use SP\Domain\Account\UpgradePublicLinkServiceInterface; +use SP\Domain\Auth\Ports\UpgradeAuthTokenServiceInterface; use SP\Domain\Auth\Services\UpgradeAuthTokenService; -use SP\Domain\Auth\UpgradeAuthTokenServiceInterface; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\CustomField\Ports\UpgradeCustomFieldDataServiceInterface; +use SP\Domain\CustomField\Ports\UpgradeCustomFieldDefinitionServiceInterface; use SP\Domain\CustomField\Services\UpgradeCustomFieldDataService; use SP\Domain\CustomField\Services\UpgradeCustomFieldDefinitionService; -use SP\Domain\CustomField\UpgradeCustomFieldDataServiceInterface; -use SP\Domain\CustomField\UpgradeCustomFieldDefinitionServiceInterface; -use SP\Domain\Plugin\UpgradePluginServiceInterface; -use SP\Domain\Upgrade\UpgradeAppServiceInterface; +use SP\Domain\Plugin\Ports\UpgradePluginServiceInterface; +use SP\Domain\Upgrade\Ports\UpgradeAppServiceInterface; use SP\Infrastructure\File\FileException; use SP\Providers\Log\FileLogHandler; use SP\Util\VersionUtil; @@ -169,4 +169,4 @@ final class UpgradeAppService extends Service implements UpgradeAppServiceInterf return false; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeDatabaseService.php b/lib/SP/Domain/Upgrade/Services/UpgradeDatabaseService.php index fc52c2f1..7da3653f 100644 --- a/lib/SP/Domain/Upgrade/Services/UpgradeDatabaseService.php +++ b/lib/SP/Domain/Upgrade/Services/UpgradeDatabaseService.php @@ -30,8 +30,8 @@ use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Persistence\UpgradeDatabaseServiceInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Persistence\Ports\UpgradeDatabaseServiceInterface; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\MysqlFileParser; use SP\Infrastructure\File\FileException; @@ -212,4 +212,4 @@ final class UpgradeDatabaseService extends Service implements UpgradeDatabaseSer throw new UpgradeException($e->getMessage()); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/UpgradeInterface.php b/lib/SP/Domain/Upgrade/Services/UpgradeInterface.php similarity index 93% rename from lib/SP/Domain/Upgrade/UpgradeInterface.php rename to lib/SP/Domain/Upgrade/Services/UpgradeInterface.php index a2eded79..ca30e40c 100644 --- a/lib/SP/Domain/Upgrade/UpgradeInterface.php +++ b/lib/SP/Domain/Upgrade/Services/UpgradeInterface.php @@ -22,9 +22,9 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Upgrade; +namespace SP\Domain\Upgrade\Services; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Interface UpgradeInterface @@ -42,4 +42,4 @@ interface UpgradeInterface * Performs the upgrading process */ public function upgrade(string $version, ConfigDataInterface $configData); -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/Services/UpgradePluginService.php b/lib/SP/Domain/Upgrade/Services/UpgradePluginService.php index 81298c92..262f5c37 100644 --- a/lib/SP/Domain/Upgrade/Services/UpgradePluginService.php +++ b/lib/SP/Domain/Upgrade/Services/UpgradePluginService.php @@ -29,7 +29,7 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventMessage; use SP\Domain\Common\Services\Service; -use SP\Domain\Plugin\UpgradePluginServiceInterface; +use SP\Domain\Plugin\Ports\UpgradePluginServiceInterface; use SP\Plugin\PluginManager; /** @@ -77,4 +77,4 @@ final class UpgradePluginService extends Service implements UpgradePluginService ) ); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php index e02dbee1..bd00dfad 100644 --- a/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php +++ b/lib/SP/Domain/Upgrade/Services/UpgradeUtil.php @@ -24,8 +24,8 @@ namespace SP\Domain\Upgrade\Services; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Infrastructure\File\FileException; use SP\Util\VersionUtil; @@ -67,4 +67,4 @@ final class UpgradeUtil $config->saveConfig($configData, false); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/In/UserGroupRepositoryInterface.php b/lib/SP/Domain/User/Ports/UserGroupRepositoryInterface.php similarity index 92% rename from lib/SP/Domain/User/In/UserGroupRepositoryInterface.php rename to lib/SP/Domain/User/Ports/UserGroupRepositoryInterface.php index b03ae628..e5d494ec 100644 --- a/lib/SP/Domain/User/In/UserGroupRepositoryInterface.php +++ b/lib/SP/Domain/User/Ports/UserGroupRepositoryInterface.php @@ -22,12 +22,10 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User\In; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -35,7 +33,7 @@ use SP\Infrastructure\Database\QueryResult; * * @package SP\Infrastructure\User\Repositories */ -interface UserGroupRepositoryInterface extends RepositoryInterface +interface UserGroupRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { /** * Returns the items that are using the given group id @@ -69,4 +67,4 @@ interface UserGroupRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getByName(string $name): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserGroupServiceInterface.php b/lib/SP/Domain/User/Ports/UserGroupServiceInterface.php similarity index 98% rename from lib/SP/Domain/User/UserGroupServiceInterface.php rename to lib/SP/Domain/User/Ports/UserGroupServiceInterface.php index ef1d330c..a756ba86 100644 --- a/lib/SP/Domain/User/UserGroupServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserGroupServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -111,4 +110,4 @@ interface UserGroupServiceInterface * @throws QueryException */ public function getUsageByUsers(int $id): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/In/UserPassRecoverRepositoryInterface.php b/lib/SP/Domain/User/Ports/UserPassRecoverRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/User/In/UserPassRecoverRepositoryInterface.php rename to lib/SP/Domain/User/Ports/UserPassRecoverRepositoryInterface.php index 9b91b0a9..510bc027 100644 --- a/lib/SP/Domain/User/In/UserPassRecoverRepositoryInterface.php +++ b/lib/SP/Domain/User/Ports/UserPassRecoverRepositoryInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User\In; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -83,4 +82,4 @@ interface UserPassRecoverRepositoryInterface * @throws \SP\Core\Exceptions\QueryException */ public function getUserIdForHash(string $hash, int $time): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserPassRecoverServiceInterface.php b/lib/SP/Domain/User/Ports/UserPassRecoverServiceInterface.php similarity index 98% rename from lib/SP/Domain/User/UserPassRecoverServiceInterface.php rename to lib/SP/Domain/User/Ports/UserPassRecoverServiceInterface.php index a5a71d5d..3279ed7d 100644 --- a/lib/SP/Domain/User/UserPassRecoverServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserPassRecoverServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use Defuse\Crypto\Exception\EnvironmentIsBrokenException; use SP\Core\Exceptions\ConstraintException; @@ -73,4 +72,4 @@ interface UserPassRecoverServiceInterface * @throws QueryException */ public function getUserIdForHash(string $hash): int; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserPassServiceInterface.php b/lib/SP/Domain/User/Ports/UserPassServiceInterface.php similarity index 98% rename from lib/SP/Domain/User/UserPassServiceInterface.php rename to lib/SP/Domain/User/Ports/UserPassServiceInterface.php index 25ac8d1e..d6af542b 100644 --- a/lib/SP/Domain/User/UserPassServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserPassServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use Defuse\Crypto\Exception\CryptoException; use SP\Core\Exceptions\ConstraintException; @@ -85,4 +84,4 @@ interface UserPassServiceInterface * @throws NoSuchItemException */ public function migrateUserPassById(int $id, string $userPass): void; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/In/UserProfileRepositoryInterface.php b/lib/SP/Domain/User/Ports/UserProfileRepositoryInterface.php similarity index 94% rename from lib/SP/Domain/User/In/UserProfileRepositoryInterface.php rename to lib/SP/Domain/User/Ports/UserProfileRepositoryInterface.php index 77763b31..768f980f 100644 --- a/lib/SP/Domain/User/In/UserProfileRepositoryInterface.php +++ b/lib/SP/Domain/User/Ports/UserProfileRepositoryInterface.php @@ -22,12 +22,11 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User\In; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Database\QueryResult; /** @@ -47,4 +46,4 @@ interface UserProfileRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getUsersForProfile(int $id): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserProfileServiceInterface.php b/lib/SP/Domain/User/Ports/UserProfileServiceInterface.php similarity index 98% rename from lib/SP/Domain/User/UserProfileServiceInterface.php rename to lib/SP/Domain/User/Ports/UserProfileServiceInterface.php index 63c7a464..3c3eed72 100644 --- a/lib/SP/Domain/User/UserProfileServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserProfileServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -96,4 +95,4 @@ interface UserProfileServiceInterface * @throws QueryException */ public function getAllBasic(): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/In/UserRepositoryInterface.php b/lib/SP/Domain/User/Ports/UserRepositoryInterface.php similarity index 96% rename from lib/SP/Domain/User/In/UserRepositoryInterface.php rename to lib/SP/Domain/User/Ports/UserRepositoryInterface.php index 368294a5..e816d9ba 100644 --- a/lib/SP/Domain/User/In/UserRepositoryInterface.php +++ b/lib/SP/Domain/User/Ports/UserRepositoryInterface.php @@ -22,14 +22,12 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User\In; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; -use SP\Domain\Common\In\RepositoryInterface; use SP\Domain\User\Services\UpdatePassRequest; use SP\Infrastructure\Database\QueryResult; @@ -38,7 +36,7 @@ use SP\Infrastructure\Database\QueryResult; * * @package SP\Infrastructure\User\Repositories */ -interface UserRepositoryInterface extends RepositoryInterface +interface UserRepositoryInterface extends \SP\Domain\Common\Ports\RepositoryInterface { /** * Updates an user's pass @@ -165,4 +163,4 @@ interface UserRepositoryInterface extends RepositoryInterface * @throws QueryException */ public function getUsageForUser(int $id): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserServiceInterface.php b/lib/SP/Domain/User/Ports/UserServiceInterface.php similarity index 99% rename from lib/SP/Domain/User/UserServiceInterface.php rename to lib/SP/Domain/User/Ports/UserServiceInterface.php index 2839bac8..63ec60d3 100644 --- a/lib/SP/Domain/User/UserServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use Defuse\Crypto\Exception\CryptoException; use SP\Core\Exceptions\ConstraintException; @@ -197,4 +196,4 @@ interface UserServiceInterface * @throws QueryException */ public function getUsageForUser(int $id): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/In/UserToUserGroupRepositoryInterface.php b/lib/SP/Domain/User/Ports/UserToUserGroupRepositoryInterface.php similarity index 98% rename from lib/SP/Domain/User/In/UserToUserGroupRepositoryInterface.php rename to lib/SP/Domain/User/Ports/UserToUserGroupRepositoryInterface.php index 4cecc972..4d97ec0b 100644 --- a/lib/SP/Domain/User/In/UserToUserGroupRepositoryInterface.php +++ b/lib/SP/Domain/User/Ports/UserToUserGroupRepositoryInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User\In; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -104,4 +103,4 @@ interface UserToUserGroupRepositoryInterface * @throws QueryException */ public function getById(int $id): QueryResult; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/UserToUserGroupServiceInterface.php b/lib/SP/Domain/User/Ports/UserToUserGroupServiceInterface.php similarity index 98% rename from lib/SP/Domain/User/UserToUserGroupServiceInterface.php rename to lib/SP/Domain/User/Ports/UserToUserGroupServiceInterface.php index d36bb852..d3869a49 100644 --- a/lib/SP/Domain/User/UserToUserGroupServiceInterface.php +++ b/lib/SP/Domain/User/Ports/UserToUserGroupServiceInterface.php @@ -22,8 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\User; - +namespace SP\Domain\User\Ports; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; @@ -75,4 +74,4 @@ interface UserToUserGroupServiceInterface * @throws \SP\Core\Exceptions\QueryException */ public function getGroupsForUser(int $userId): array; -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserGroupService.php b/lib/SP/Domain/User/Services/UserGroupService.php index 4518b7c4..2c596f94 100644 --- a/lib/SP/Domain/User/Services/UserGroupService.php +++ b/lib/SP/Domain/User/Services/UserGroupService.php @@ -34,9 +34,9 @@ use SP\DataModel\UserGroupData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\User\In\UserGroupRepositoryInterface; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserToUserGroupServiceInterface; +use SP\Domain\User\Ports\UserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserToUserGroupServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryResult; @@ -224,4 +224,4 @@ final class UserGroupService extends Service implements UserGroupServiceInterfac { return $this->userGroupRepository->getUsageByUsers($id)->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserPassRecoverService.php b/lib/SP/Domain/User/Services/UserPassRecoverService.php index 8b010ec2..0edde3fb 100644 --- a/lib/SP/Domain/User/Services/UserPassRecoverService.php +++ b/lib/SP/Domain/User/Services/UserPassRecoverService.php @@ -33,8 +33,8 @@ use SP\Core\Exceptions\SPException; use SP\Core\Messages\MailMessage; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\User\In\UserPassRecoverRepositoryInterface; -use SP\Domain\User\UserPassRecoverServiceInterface; +use SP\Domain\User\Ports\UserPassRecoverRepositoryInterface; +use SP\Domain\User\Ports\UserPassRecoverServiceInterface; use SP\Html\Html; use SP\Infrastructure\User\Repositories\UserPassRecoverRepository; use SP\Util\PasswordUtil; @@ -158,4 +158,4 @@ final class UserPassRecoverService extends Service implements UserPassRecoverSer return (int)$result->getData()->userId; } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserPassService.php b/lib/SP/Domain/User/Services/UserPassService.php index 8d26e752..4e51c0dc 100644 --- a/lib/SP/Domain/User/Services/UserPassService.php +++ b/lib/SP/Domain/User/Services/UserPassService.php @@ -33,11 +33,11 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\UserLoginData; use SP\Domain\Common\Services\Service; -use SP\Domain\Config\ConfigServiceInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Config\Services\ConfigFileService; -use SP\Domain\User\In\UserRepositoryInterface; -use SP\Domain\User\UserPassServiceInterface; +use SP\Domain\User\Ports\UserPassServiceInterface; +use SP\Domain\User\Ports\UserRepositoryInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\User\Repositories\UserRepository; @@ -263,4 +263,4 @@ final class UserPassService extends Service implements UserPassServiceInterface throw new NoSuchItemException(__u('User does not exist')); } } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserProfileService.php b/lib/SP/Domain/User/Services/UserProfileService.php index d14ab27e..248515c8 100644 --- a/lib/SP/Domain/User/Services/UserProfileService.php +++ b/lib/SP/Domain/User/Services/UserProfileService.php @@ -34,8 +34,8 @@ use SP\DataModel\UserProfileData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\User\In\UserProfileRepositoryInterface; -use SP\Domain\User\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserProfileRepositoryInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; use SP\Infrastructure\User\Repositories\UserProfileRepository; @@ -167,4 +167,4 @@ final class UserProfileService extends Service implements UserProfileServiceInte { return $this->userProfileRepository->getAll()->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserService.php b/lib/SP/Domain/User/Services/UserService.php index 4b8d835f..753823d4 100644 --- a/lib/SP/Domain/User/Services/UserService.php +++ b/lib/SP/Domain/User/Services/UserService.php @@ -36,9 +36,9 @@ use SP\DataModel\UserPreferencesData; use SP\Domain\Common\Services\Service; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Common\Services\ServiceItemTrait; -use SP\Domain\User\In\UserRepositoryInterface; -use SP\Domain\User\UserPassServiceInterface; -use SP\Domain\User\UserServiceInterface; +use SP\Domain\User\Ports\UserPassServiceInterface; +use SP\Domain\User\Ports\UserRepositoryInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Database\QueryResult; @@ -406,4 +406,4 @@ final class UserService extends Service implements UserServiceInterface { return $this->userRepository->getUsageForUser($id)->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/User/Services/UserToUserGroupService.php b/lib/SP/Domain/User/Services/UserToUserGroupService.php index 1fd07ac7..9131a1c0 100644 --- a/lib/SP/Domain/User/Services/UserToUserGroupService.php +++ b/lib/SP/Domain/User/Services/UserToUserGroupService.php @@ -30,8 +30,8 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\UserToUserGroupData; use SP\Domain\Common\Services\Service; -use SP\Domain\User\In\UserToUserGroupRepositoryInterface; -use SP\Domain\User\UserToUserGroupServiceInterface; +use SP\Domain\User\Ports\UserToUserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserToUserGroupServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\User\Repositories\UserToUserGroupRepository; @@ -128,4 +128,4 @@ final class UserToUserGroupService extends Service implements UserToUserGroupSer { return $this->userToUserGroupRepository->getGroupsForUser($userId)->getDataAsArray(); } -} \ No newline at end of file +} diff --git a/lib/SP/Http/Client.php b/lib/SP/Http/Client.php index 86063a0f..2b3c6811 100644 --- a/lib/SP/Http/Client.php +++ b/lib/SP/Http/Client.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,7 +24,7 @@ namespace SP\Http; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Class Client @@ -47,4 +47,4 @@ final class Client return $options; } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountFileRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountFileRepository.php index da491ce9..779ba7dd 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountFileRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountFileRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\FileData; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\In\AccountFileRepositoryInterface; +use SP\Domain\Account\Ports\AccountFileRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountHistoryRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountHistoryRepository.php index df562ac1..04cf64d7 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountHistoryRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountHistoryRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\In\AccountHistoryRepositoryInterface; +use SP\Domain\Account\Ports\AccountHistoryRepositoryInterface; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountRepository.php index 3d655b29..d59e46c9 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountRepository.php @@ -32,11 +32,11 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\AccountHistoryData; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\In\AccountRepositoryInterface; +use SP\Domain\Account\Ports\AccountRepositoryInterface; use SP\Domain\Account\Services\AccountFilterUserInterface; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\DatabaseInterface; @@ -678,4 +678,4 @@ final class AccountRepository extends Repository implements AccountRepositoryInt return $this->db->doSelect(QueryData::build($query)); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php index f5924b1c..6a0f3224 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountSearchRepository.php @@ -30,7 +30,7 @@ use Aura\SqlQuery\QueryFactory; use SP\Core\Context\ContextInterface; use SP\Core\Events\EventDispatcherInterface; use SP\DataModel\AccountSearchVData; -use SP\Domain\Account\In\AccountSearchRepositoryInterface; +use SP\Domain\Account\Ports\AccountSearchRepositoryInterface; use SP\Domain\Account\Search\AccountSearchConstants; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Domain\Account\Services\AccountFilterUserInterface; @@ -389,4 +389,4 @@ final class AccountSearchRepository extends Repository implements AccountSearchR ->from('account_search_v AS Account') ->distinct(); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepository.php index dea1be2f..d8b06a22 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepository.php @@ -26,7 +26,7 @@ namespace SP\Infrastructure\Account\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\In\AccountToFavoriteRepositoryInterface; +use SP\Domain\Account\Ports\AccountToFavoriteRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Database\QueryData; use SP\Infrastructure\Database\QueryResult; diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountToTagRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountToTagRepository.php index ef881172..abf9c021 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountToTagRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountToTagRepository.php @@ -24,7 +24,7 @@ namespace SP\Infrastructure\Account\Repositories; -use SP\Domain\Account\In\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToTagRepositoryInterface; use SP\Domain\Account\Services\AccountRequest; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountToUserGroupRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountToUserGroupRepository.php index d3dc34d3..c6fe5efe 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountToUserGroupRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountToUserGroupRepository.php @@ -27,8 +27,8 @@ namespace SP\Infrastructure\Account\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemData; -use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface; -use SP\Domain\Common\In\Query; +use SP\Domain\Account\Ports\AccountToUserGroupRepositoryInterface; +use SP\Infrastructure\Common\Repositories\Query; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; diff --git a/lib/SP/Infrastructure/Account/Repositories/AccountToUserRepository.php b/lib/SP/Infrastructure/Account/Repositories/AccountToUserRepository.php index ffa35c8a..eaf2e748 100644 --- a/lib/SP/Infrastructure/Account/Repositories/AccountToUserRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/AccountToUserRepository.php @@ -27,8 +27,8 @@ namespace SP\Infrastructure\Account\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemData; -use SP\Domain\Account\In\AccountToUserRepositoryInterface; -use SP\Domain\Common\In\Query; +use SP\Domain\Account\Ports\AccountToUserRepositoryInterface; +use SP\Infrastructure\Common\Repositories\Query; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; diff --git a/lib/SP/Infrastructure/Account/Repositories/PublicLinkRepository.php b/lib/SP/Infrastructure/Account/Repositories/PublicLinkRepository.php index 83b9f438..9892aeaf 100644 --- a/lib/SP/Infrastructure/Account/Repositories/PublicLinkRepository.php +++ b/lib/SP/Infrastructure/Account/Repositories/PublicLinkRepository.php @@ -41,7 +41,7 @@ use function SP\__u; * * @package SP\Infrastructure\Common\Repositories\PublicLink */ -final class PublicLinkRepository extends Repository implements \SP\Domain\Account\In\PublicLinkRepositoryInterface +final class PublicLinkRepository extends Repository implements \SP\Domain\Account\Ports\PublicLinkRepositoryInterface { use RepositoryItemTrait; diff --git a/lib/SP/Infrastructure/Auth/Repositories/AuthTokenRepository.php b/lib/SP/Infrastructure/Auth/Repositories/AuthTokenRepository.php index f68a97c6..603116df 100644 --- a/lib/SP/Infrastructure/Auth/Repositories/AuthTokenRepository.php +++ b/lib/SP/Infrastructure/Auth/Repositories/AuthTokenRepository.php @@ -29,7 +29,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\AuthTokenData; use SP\DataModel\ItemSearchData; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -471,4 +471,4 @@ final class AuthTokenRepository extends Repository implements RepositoryInterfac return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Category/Repositories/CategoryRepository.php b/lib/SP/Infrastructure/Category/Repositories/CategoryRepository.php index 0f7ee949..7d1c6ec9 100644 --- a/lib/SP/Infrastructure/Category/Repositories/CategoryRepository.php +++ b/lib/SP/Infrastructure/Category/Repositories/CategoryRepository.php @@ -30,7 +30,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ItemSearchData; -use SP\Domain\Category\In\CategoryRepositoryInterface; +use SP\Domain\Category\Ports\CategoryRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -323,4 +323,4 @@ final class CategoryRepository extends Repository implements CategoryRepositoryI return $this->db->doSelect($queryData, true); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Client/Repositories/ClientRepository.php b/lib/SP/Infrastructure/Client/Repositories/ClientRepository.php index 4506b72f..ccb9806d 100644 --- a/lib/SP/Infrastructure/Client/Repositories/ClientRepository.php +++ b/lib/SP/Infrastructure/Client/Repositories/ClientRepository.php @@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ClientData; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; -use SP\Domain\Client\In\ClientRepositoryInterface; +use SP\Domain\Client\Ports\ClientRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -365,4 +365,4 @@ final class ClientRepository extends Repository implements ClientRepositoryInter return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Domain/Common/In/Query.php b/lib/SP/Infrastructure/Common/Repositories/Query.php similarity index 98% rename from lib/SP/Domain/Common/In/Query.php rename to lib/SP/Infrastructure/Common/Repositories/Query.php index 064d761b..2b331c35 100644 --- a/lib/SP/Domain/Common/In/Query.php +++ b/lib/SP/Infrastructure/Common/Repositories/Query.php @@ -22,7 +22,7 @@ * along with sysPass. If not, see . */ -namespace SP\Domain\Common\In; +namespace SP\Infrastructure\Common\Repositories; use Aura\SqlQuery\QueryInterface; use Aura\SqlQuery\Quoter; diff --git a/lib/SP/Infrastructure/Common/Repositories/Repository.php b/lib/SP/Infrastructure/Common/Repositories/Repository.php index 33293fef..1ee4d03b 100644 --- a/lib/SP/Infrastructure/Common/Repositories/Repository.php +++ b/lib/SP/Infrastructure/Common/Repositories/Repository.php @@ -31,7 +31,7 @@ use SP\Core\Context\ContextInterface; use SP\Core\Events\Event; use SP\Core\Events\EventDispatcherInterface; use SP\Core\Events\EventMessage; -use SP\Domain\Common\In\RepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; use SP\Domain\Common\Services\ServiceException; use SP\Infrastructure\Database\DatabaseInterface; use function SP\__u; diff --git a/lib/SP/Infrastructure/Common/Repositories/RepositoryItemTrait.php b/lib/SP/Infrastructure/Common/Repositories/RepositoryItemTrait.php index c9eef5cf..bce5ec69 100644 --- a/lib/SP/Infrastructure/Common/Repositories/RepositoryItemTrait.php +++ b/lib/SP/Infrastructure/Common/Repositories/RepositoryItemTrait.php @@ -24,10 +24,6 @@ namespace SP\Infrastructure\Common\Repositories; -use Exception; -use RuntimeException; -use SP\Domain\Common\In\RepositoryInterface; -use SP\Domain\Common\Out\DataModelInterface; use SP\Infrastructure\Database\DatabaseUtil; use SP\Infrastructure\Database\DbStorageInterface; diff --git a/lib/SP/Infrastructure/Config/Repositories/ConfigRepository.php b/lib/SP/Infrastructure/Config/Repositories/ConfigRepository.php index caab293e..b4436730 100644 --- a/lib/SP/Infrastructure/Config/Repositories/ConfigRepository.php +++ b/lib/SP/Infrastructure/Config/Repositories/ConfigRepository.php @@ -27,7 +27,7 @@ namespace SP\Infrastructure\Config\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ConfigData; -use SP\Domain\Config\In\ConfigRepositoryInterface; +use SP\Domain\Config\Ports\ConfigRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Database\QueryData; use SP\Infrastructure\Database\QueryResult; @@ -133,4 +133,4 @@ final class ConfigRepository extends Repository implements ConfigRepositoryInter return $this->db->doQuery($queryData)->getAffectedNumRows(); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefRepository.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefRepository.php index 4ffc2694..e3a0ff1e 100644 --- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefRepository.php +++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldDefRepository.php @@ -30,7 +30,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldDefinitionData; use SP\DataModel\ItemSearchData; -use SP\Domain\CustomField\In\CustomFieldDefRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefRepositoryInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -337,4 +337,4 @@ final class CustomFieldDefRepository extends Repository implements CustomFieldDe { $this->customFieldDefCollection = new CustomFieldDefCollection(); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldRepository.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldRepository.php index 32aa26b4..668b3ba1 100644 --- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldRepository.php +++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldRepository.php @@ -29,7 +29,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\CustomFieldData; use SP\DataModel\ItemSearchData; -use SP\Domain\CustomField\In\CustomFieldRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -421,4 +421,4 @@ final class CustomFieldRepository extends Repository implements CustomFieldRepos { throw new RuntimeException('Not implemented'); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldTypeRepository.php b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldTypeRepository.php index a0368590..4fcf09af 100644 --- a/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldTypeRepository.php +++ b/lib/SP/Infrastructure/CustomField/Repositories/CustomFieldTypeRepository.php @@ -30,7 +30,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldTypeData; use SP\DataModel\ItemSearchData; -use SP\Domain\CustomField\In\CustomFieldTypeRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -225,4 +225,4 @@ final class CustomFieldTypeRepository extends Repository implements CustomFieldT { throw new RuntimeException('Not implemented'); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Database/DatabaseConnectionData.php b/lib/SP/Infrastructure/Database/DatabaseConnectionData.php index 4735cd3c..eb54a804 100644 --- a/lib/SP/Infrastructure/Database/DatabaseConnectionData.php +++ b/lib/SP/Infrastructure/Database/DatabaseConnectionData.php @@ -24,7 +24,7 @@ namespace SP\Infrastructure\Database; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Class DatabaseConnectionData @@ -143,4 +143,4 @@ final class DatabaseConnectionData ->setDbPort((int)getenv('DB_PORT')) ->setDbSocket(getenv('DB_SOCKET')); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Database/QueryData.php b/lib/SP/Infrastructure/Database/QueryData.php index 6f47fd54..a6a04d00 100644 --- a/lib/SP/Infrastructure/Database/QueryData.php +++ b/lib/SP/Infrastructure/Database/QueryData.php @@ -27,7 +27,7 @@ namespace SP\Infrastructure\Database; use Aura\SqlQuery\Common\Select; use Aura\SqlQuery\QueryInterface; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use function SP\__u; /** diff --git a/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPresetRepository.php b/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPresetRepository.php index d00547cd..8d0c5ccd 100644 --- a/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPresetRepository.php +++ b/lib/SP/Infrastructure/ItemPreset/Repositories/ItemPresetRepository.php @@ -29,8 +29,8 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemPresetData; use SP\DataModel\ItemSearchData; -use SP\Domain\Common\In\RepositoryInterface; -use SP\Domain\ItemPreset\In\ItemPresetRepositoryInterface; +use SP\Domain\Common\Ports\RepositoryInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -366,4 +366,4 @@ class ItemPresetRepository extends Repository implements RepositoryInterface, It return $this->db->doSelect($queryData, true); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Notification/Repositories/NotificationRepository.php b/lib/SP/Infrastructure/Notification/Repositories/NotificationRepository.php index 2553181e..4e3b9a0b 100644 --- a/lib/SP/Infrastructure/Notification/Repositories/NotificationRepository.php +++ b/lib/SP/Infrastructure/Notification/Repositories/NotificationRepository.php @@ -29,7 +29,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; use SP\DataModel\NotificationData; -use SP\Domain\Notification\In\NotificationRepositoryInterface; +use SP\Domain\Notification\Ports\NotificationRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -625,4 +625,4 @@ final class NotificationRepository extends Repository implements NotificationRep return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Plugin/Repositories/PluginDataModel.php b/lib/SP/Infrastructure/Plugin/Repositories/PluginDataModel.php index 999b6886..cf596829 100644 --- a/lib/SP/Infrastructure/Plugin/Repositories/PluginDataModel.php +++ b/lib/SP/Infrastructure/Plugin/Repositories/PluginDataModel.php @@ -26,7 +26,7 @@ namespace SP\Infrastructure\Plugin\Repositories; use SP\DataModel\EncryptedModel; use SP\DataModel\SerializedModel; -use SP\Domain\Common\Out\HydratableInterface; +use SP\Domain\Common\Adapters\HydratableInterface; /** * Class PluginData @@ -98,4 +98,4 @@ final class PluginDataModel implements HydratableInterface { $this->data = $data; } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Plugin/Repositories/PluginDataRepository.php b/lib/SP/Infrastructure/Plugin/Repositories/PluginDataRepository.php index 026dfe16..a7e31238 100644 --- a/lib/SP/Infrastructure/Plugin/Repositories/PluginDataRepository.php +++ b/lib/SP/Infrastructure/Plugin/Repositories/PluginDataRepository.php @@ -26,7 +26,7 @@ namespace SP\Infrastructure\Plugin\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Plugin\In\PluginDataRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginDataRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -269,4 +269,4 @@ final class PluginDataRepository extends Repository implements PluginDataReposit return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Plugin/Repositories/PluginModel.php b/lib/SP/Infrastructure/Plugin/Repositories/PluginModel.php index e60ec040..f1efaeba 100644 --- a/lib/SP/Infrastructure/Plugin/Repositories/PluginModel.php +++ b/lib/SP/Infrastructure/Plugin/Repositories/PluginModel.php @@ -24,15 +24,15 @@ namespace SP\Infrastructure\Plugin\Repositories; -use SP\Domain\Common\Out\DataModelBase; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModel; +use SP\Domain\Common\Adapters\DataModelInterface; /** * Class PluginData * * @package SP\DataModel */ -class PluginModel extends DataModelBase implements DataModelInterface +class PluginModel extends DataModel implements DataModelInterface { /** * @var int @@ -148,4 +148,4 @@ class PluginModel extends DataModelBase implements DataModelInterface { $this->versionLevel = $versionLevel; } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Plugin/Repositories/PluginRepository.php b/lib/SP/Infrastructure/Plugin/Repositories/PluginRepository.php index e08a4f4b..a81c8e86 100644 --- a/lib/SP/Infrastructure/Plugin/Repositories/PluginRepository.php +++ b/lib/SP/Infrastructure/Plugin/Repositories/PluginRepository.php @@ -30,7 +30,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; -use SP\Domain\Plugin\In\PluginRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -449,4 +449,4 @@ final class PluginRepository extends Repository implements PluginRepositoryInter return $this->db->doQuery($queryData)->getAffectedNumRows(); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Security/Repositories/EventlogRepository.php b/lib/SP/Infrastructure/Security/Repositories/EventlogRepository.php index 9d225ed7..ce944dc6 100644 --- a/lib/SP/Infrastructure/Security/Repositories/EventlogRepository.php +++ b/lib/SP/Infrastructure/Security/Repositories/EventlogRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\EventlogData; use SP\DataModel\ItemSearchData; -use SP\Domain\Security\In\EventlogRepositoryInterface; +use SP\Domain\Security\Ports\EventlogRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Database\QueryData; use SP\Infrastructure\Database\QueryResult; @@ -120,4 +120,4 @@ final class EventlogRepository extends Repository implements EventlogRepositoryI return $this->db->doQuery($queryData)->getLastId(); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Security/Repositories/TrackRepository.php b/lib/SP/Infrastructure/Security/Repositories/TrackRepository.php index 2fcb77ee..7c8f132d 100644 --- a/lib/SP/Infrastructure/Security/Repositories/TrackRepository.php +++ b/lib/SP/Infrastructure/Security/Repositories/TrackRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; use SP\DataModel\TrackData; -use SP\Domain\Security\In\TrackRepositoryInterface; +use SP\Domain\Security\Ports\TrackRepositoryInterface; use SP\Domain\Security\Services\TrackService; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Database\QueryData; @@ -250,4 +250,4 @@ final class TrackRepository extends Repository implements TrackRepositoryInterfa return $this->db->doSelect($queryData, true); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/Tag/Repositories/TagRepository.php b/lib/SP/Infrastructure/Tag/Repositories/TagRepository.php index 6b9b5f83..2c97e29e 100644 --- a/lib/SP/Infrastructure/Tag/Repositories/TagRepository.php +++ b/lib/SP/Infrastructure/Tag/Repositories/TagRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; use SP\DataModel\TagData; -use SP\Domain\Tag\In\TagRepositoryInterface; +use SP\Domain\Tag\Ports\TagRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -312,4 +312,4 @@ final class TagRepository extends Repository implements TagRepositoryInterface return $this->db->doSelect($queryData, true); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/User/Repositories/UserGroupRepository.php b/lib/SP/Infrastructure/User/Repositories/UserGroupRepository.php index d1cc2a28..f8b9703c 100644 --- a/lib/SP/Infrastructure/User/Repositories/UserGroupRepository.php +++ b/lib/SP/Infrastructure/User/Repositories/UserGroupRepository.php @@ -29,7 +29,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\UserGroupData; -use SP\Domain\User\In\UserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserGroupRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -380,4 +380,4 @@ final class UserGroupRepository extends Repository implements UserGroupRepositor return $this->db->doSelect($queryData)->getNumRows() > 0; } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/User/Repositories/UserPassRecoverRepository.php b/lib/SP/Infrastructure/User/Repositories/UserPassRecoverRepository.php index 38e1d122..b145d9b9 100644 --- a/lib/SP/Infrastructure/User/Repositories/UserPassRecoverRepository.php +++ b/lib/SP/Infrastructure/User/Repositories/UserPassRecoverRepository.php @@ -27,7 +27,7 @@ namespace SP\Infrastructure\User\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\User\In\UserPassRecoverRepositoryInterface; +use SP\Domain\User\Ports\UserPassRecoverRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Database\QueryData; use SP\Infrastructure\Database\QueryResult; @@ -144,4 +144,4 @@ final class UserPassRecoverRepository extends Repository implements UserPassReco return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/User/Repositories/UserProfileRepository.php b/lib/SP/Infrastructure/User/Repositories/UserProfileRepository.php index 1ec8221e..1f4e43e0 100644 --- a/lib/SP/Infrastructure/User/Repositories/UserProfileRepository.php +++ b/lib/SP/Infrastructure/User/Repositories/UserProfileRepository.php @@ -28,7 +28,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemSearchData; use SP\DataModel\UserProfileData; -use SP\Domain\User\In\UserProfileRepositoryInterface; +use SP\Domain\User\Ports\UserProfileRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; @@ -316,4 +316,4 @@ final class UserProfileRepository extends Repository implements UserProfileRepos return $this->db->doSelect($queryData)->getNumRows() > 0; } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/User/Repositories/UserRepository.php b/lib/SP/Infrastructure/User/Repositories/UserRepository.php index a76829b0..e042d252 100644 --- a/lib/SP/Infrastructure/User/Repositories/UserRepository.php +++ b/lib/SP/Infrastructure/User/Repositories/UserRepository.php @@ -31,7 +31,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; -use SP\Domain\User\In\UserRepositoryInterface; +use SP\Domain\User\Ports\UserRepositoryInterface; use SP\Domain\User\Services\UpdatePassRequest; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\Repository; @@ -846,4 +846,4 @@ final class UserRepository extends Repository implements UserRepositoryInterface return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Infrastructure/User/Repositories/UserToUserGroupRepository.php b/lib/SP/Infrastructure/User/Repositories/UserToUserGroupRepository.php index 3ba06ea1..0ebf5586 100644 --- a/lib/SP/Infrastructure/User/Repositories/UserToUserGroupRepository.php +++ b/lib/SP/Infrastructure/User/Repositories/UserToUserGroupRepository.php @@ -27,7 +27,7 @@ namespace SP\Infrastructure\User\Repositories; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\UserToUserGroupData; -use SP\Domain\User\In\UserToUserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserToUserGroupRepositoryInterface; use SP\Infrastructure\Common\Repositories\Repository; use SP\Infrastructure\Common\Repositories\RepositoryItemTrait; use SP\Infrastructure\Database\QueryData; @@ -165,4 +165,4 @@ final class UserToUserGroupRepository extends Repository implements UserToUserGr return $this->db->doSelect($queryData); } -} \ No newline at end of file +} diff --git a/lib/SP/Mvc/Controller/ControllerTrait.php b/lib/SP/Mvc/Controller/ControllerTrait.php index 944b7c3f..d87824db 100644 --- a/lib/SP/Mvc/Controller/ControllerTrait.php +++ b/lib/SP/Mvc/Controller/ControllerTrait.php @@ -28,7 +28,7 @@ use Closure; use Klein\Klein; use SP\Core\Bootstrap\BootstrapBase; use SP\Core\Exceptions\SPException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\Json; use SP\Http\JsonResponse; use SP\Http\RequestInterface; @@ -64,7 +64,7 @@ trait ControllerTrait * Logout from current session * * @param \SP\Http\RequestInterface $request - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData * @param \Closure $onRedirect * * @throws \SP\Core\Exceptions\SPException @@ -137,4 +137,4 @@ trait ControllerTrait } } } -} \ No newline at end of file +} diff --git a/lib/SP/Mvc/Controller/ItemTrait.php b/lib/SP/Mvc/Controller/ItemTrait.php index 65e53fc5..82ca9eb0 100644 --- a/lib/SP/Mvc/Controller/ItemTrait.php +++ b/lib/SP/Mvc/Controller/ItemTrait.php @@ -28,7 +28,7 @@ use Defuse\Crypto\Exception\CryptoException; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldData; use SP\DataModel\ItemSearchData; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Domain\CustomField\Services\CustomFieldItem; use SP\Domain\CustomField\Services\CustomFieldService; use SP\Http\RequestInterface; @@ -95,7 +95,7 @@ trait ItemTrait * @param int $moduleId * @param int|int[] $itemId * @param RequestInterface $request - * @param \SP\Domain\CustomField\CustomFieldServiceInterface $customFieldService + * @param \SP\Domain\CustomField\Ports\CustomFieldServiceInterface $customFieldService * * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException @@ -146,7 +146,7 @@ trait ItemTrait * * @param int $moduleId * @param int|int[] $itemId - * @param \SP\Domain\CustomField\CustomFieldServiceInterface $customFieldService + * @param \SP\Domain\CustomField\Ports\CustomFieldServiceInterface $customFieldService * * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException @@ -170,7 +170,7 @@ trait ItemTrait * @param int $moduleId * @param int|int[] $itemId * @param RequestInterface $request - * @param \SP\Domain\CustomField\CustomFieldServiceInterface $customFieldService + * @param \SP\Domain\CustomField\Ports\CustomFieldServiceInterface $customFieldService * * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php index 898f377e..90698591 100644 --- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php +++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php @@ -26,7 +26,7 @@ namespace SP\Mvc\View\Components; use RuntimeException; use SP\Core\Exceptions\SPException; -use SP\Domain\Common\Out\DataModelInterface; +use SP\Domain\Common\Adapters\DataModelInterface; use SP\Http\Json; use function SP\__u; diff --git a/lib/SP/Plugin/PluginManager.php b/lib/SP/Plugin/PluginManager.php index a0e7f7cf..97cd0f63 100644 --- a/lib/SP/Plugin/PluginManager.php +++ b/lib/SP/Plugin/PluginManager.php @@ -34,8 +34,8 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\Domain\Install\Services\InstallerService; -use SP\Domain\Plugin\PluginDataServiceInterface; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginDataServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Domain\Plugin\Services\PluginDataService; use SP\Domain\Plugin\Services\PluginService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; @@ -63,7 +63,7 @@ class PluginManager /** * PluginManager constructor. * - * @param \SP\Domain\Plugin\PluginServiceInterface $pluginService + * @param \SP\Domain\Plugin\Ports\PluginServiceInterface $pluginService * @param PluginDataServiceInterface $pluginDataService * @param EventDispatcher $eventDispatcher */ @@ -518,4 +518,4 @@ class PluginManager { return $this->disabledPlugins; } -} \ No newline at end of file +} diff --git a/lib/SP/Plugin/PluginOperation.php b/lib/SP/Plugin/PluginOperation.php index c08c7d4c..d49b4aac 100644 --- a/lib/SP/Plugin/PluginOperation.php +++ b/lib/SP/Plugin/PluginOperation.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Plugin\PluginDataServiceInterface; +use SP\Domain\Plugin\Ports\PluginDataServiceInterface; use SP\Domain\Plugin\Services\PluginDataService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Plugin\Repositories\PluginDataModel; @@ -51,7 +51,7 @@ final class PluginOperation * @param string $pluginName */ public function __construct( - PluginDataServiceInterface $pluginDataService, + \SP\Domain\Plugin\Ports\PluginDataServiceInterface $pluginDataService, string $pluginName ) { @@ -128,4 +128,4 @@ final class PluginOperation return null; } } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Acl/AclHandler.php b/lib/SP/Providers/Acl/AclHandler.php index 2f156b29..0548a130 100644 --- a/lib/SP/Providers/Acl/AclHandler.php +++ b/lib/SP/Providers/Acl/AclHandler.php @@ -31,10 +31,10 @@ use SP\Core\Events\EventReceiver; use SP\Core\Exceptions\FileNotFoundException; use SP\Core\Exceptions\SPException; use SP\Domain\Account\Services\AccountAclService; +use SP\Domain\User\Ports\UserGroupServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Services\UserGroupService; use SP\Domain\User\Services\UserProfileService; -use SP\Domain\User\UserGroupServiceInterface; -use SP\Domain\User\UserProfileServiceInterface; use SP\Providers\EventsTrait; use SP\Providers\Provider; use SP\Util\FileUtil; diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuth.php b/lib/SP/Providers/Auth/Browser/BrowserAuth.php index c2b89a54..222b9274 100644 --- a/lib/SP/Providers/Auth/Browser/BrowserAuth.php +++ b/lib/SP/Providers/Auth/Browser/BrowserAuth.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,7 +25,7 @@ namespace SP\Providers\Auth\Browser; use SP\DataModel\UserLoginData; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\RequestInterface; /** @@ -143,4 +143,4 @@ final class BrowserAuth implements BrowserAuthInterface return !empty($authPass) ? $authPass : null; } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuth.php b/lib/SP/Providers/Auth/Database/DatabaseAuth.php index 0918e3d4..31d802c4 100644 --- a/lib/SP/Providers/Auth/Database/DatabaseAuth.php +++ b/lib/SP/Providers/Auth/Database/DatabaseAuth.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,11 +27,11 @@ namespace SP\Providers\Auth\Database; use Exception; use SP\Core\Crypt\Hash; use SP\DataModel\UserLoginData; +use SP\Domain\User\Ports\UserPassServiceInterface; +use SP\Domain\User\Ports\UserServiceInterface; use SP\Domain\User\Services\UserLoginResponse; use SP\Domain\User\Services\UserPassService; use SP\Domain\User\Services\UserService; -use SP\Domain\User\UserPassServiceInterface; -use SP\Domain\User\UserServiceInterface; /** * Class Database @@ -49,8 +49,8 @@ final class DatabaseAuth implements DatabaseAuthInterface /** * Database constructor. * - * @param \SP\Domain\User\UserServiceInterface $userService - * @param \SP\Domain\User\UserPassServiceInterface $userPassService + * @param \SP\Domain\User\Ports\UserServiceInterface $userService + * @param \SP\Domain\User\Ports\UserPassServiceInterface $userPassService */ public function __construct(UserServiceInterface $userService, UserPassServiceInterface $userPassService) { @@ -139,4 +139,4 @@ final class DatabaseAuth implements DatabaseAuthInterface ) || Hash::checkHashKey($this->userLoginData->getLoginPass(), $userLoginResponse->getPass())); } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Auth/Ldap/LdapAuth.php b/lib/SP/Providers/Auth/Ldap/LdapAuth.php index 177b4934..59ecd867 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapAuth.php +++ b/lib/SP/Providers/Auth/Ldap/LdapAuth.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Providers\Auth\Ldap; use SP\Core\Events\EventDispatcher; use SP\DataModel\UserLoginData; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Class LdapBase @@ -47,7 +47,7 @@ final class LdapAuth implements LdapAuthInterface * * @param LdapInterface $ldap * @param EventDispatcher $eventDispatcher - * @param \SP\Domain\Config\In\ConfigDataInterface $configData + * @param \SP\Domain\Config\Ports\ConfigDataInterface $configData */ public function __construct( LdapInterface $ldap, @@ -170,4 +170,4 @@ final class LdapAuth implements LdapAuthInterface return $this->ldapAuthData; } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Auth/Ldap/LdapParams.php b/lib/SP/Providers/Auth/Ldap/LdapParams.php index 7ec8f811..b826a032 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapParams.php +++ b/lib/SP/Providers/Auth/Ldap/LdapParams.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,7 +25,7 @@ namespace SP\Providers\Auth\Ldap; use SP\Core\Exceptions\ValidationException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; /** * Class LdapParams @@ -355,4 +355,4 @@ final class LdapParams return $this; } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Log/DatabaseLogHandler.php b/lib/SP/Providers/Log/DatabaseLogHandler.php index 393bbe3b..2de114b8 100644 --- a/lib/SP/Providers/Log/DatabaseLogHandler.php +++ b/lib/SP/Providers/Log/DatabaseLogHandler.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Language; use SP\Core\LanguageInterface; use SP\DataModel\EventlogData; -use SP\Domain\Security\EventlogServiceInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Domain\Security\Services\EventlogService; use SP\Providers\EventsTrait; use SP\Providers\Provider; @@ -162,4 +162,4 @@ final class DatabaseLogHandler extends Provider implements EventReceiver $this->initialized = true; } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Mail/MailHandler.php b/lib/SP/Providers/Mail/MailHandler.php index 3e02f800..005df989 100644 --- a/lib/SP/Providers/Mail/MailHandler.php +++ b/lib/SP/Providers/Mail/MailHandler.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -30,7 +30,7 @@ use SP\Core\Events\Event; use SP\Core\Events\EventReceiver; use SP\Core\Messages\MailMessage; use SP\Core\Messages\TextFormatter; -use SP\Domain\Notification\MailServiceInterface; +use SP\Domain\Notification\Ports\MailServiceInterface; use SP\Domain\Notification\Services\MailService; use SP\Http\Request; use SP\Http\RequestInterface; @@ -209,4 +209,4 @@ final class MailHandler extends Provider implements EventReceiver $this->initialized = true; } -} \ No newline at end of file +} diff --git a/lib/SP/Providers/Notification/NotificationHandler.php b/lib/SP/Providers/Notification/NotificationHandler.php index d224273a..7c5311d4 100644 --- a/lib/SP/Providers/Notification/NotificationHandler.php +++ b/lib/SP/Providers/Notification/NotificationHandler.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,7 @@ use SP\Core\Application; use SP\Core\Events\Event; use SP\Core\Events\EventReceiver; use SP\DataModel\NotificationData; -use SP\Domain\Notification\NotificationServiceInterface; +use SP\Domain\Notification\Ports\NotificationServiceInterface; use SP\Domain\Notification\Services\NotificationService; use SP\Providers\EventsTrait; use SP\Providers\Provider; @@ -171,4 +171,4 @@ final class NotificationHandler extends Provider implements EventReceiver $this->events = $this->parseEventsToRegex(self::EVENTS); $this->initialized = true; } -} \ No newline at end of file +} diff --git a/lib/SP/Util/HttpUtil.php b/lib/SP/Util/HttpUtil.php index 20d89053..b806278b 100644 --- a/lib/SP/Util/HttpUtil.php +++ b/lib/SP/Util/HttpUtil.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,7 +24,7 @@ namespace SP\Util; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\RequestInterface; /** @@ -55,4 +55,4 @@ final class HttpUtil ); } } -} \ No newline at end of file +} diff --git a/lib/SP/Util/Link.php b/lib/SP/Util/Link.php index 948b76dd..4cf485b0 100644 --- a/lib/SP/Util/Link.php +++ b/lib/SP/Util/Link.php @@ -4,7 +4,7 @@ * * @author nuxsmin * @link https://syspass.org - * @copyright 2012-2021, Rubén Domínguez nuxsmin@$syspass.org + * @copyright 2012-2022, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,7 @@ namespace SP\Util; use SP\Core\Acl\Acl; use SP\Core\Bootstrap\BootstrapBase; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Http\Uri; /** @@ -55,4 +55,4 @@ final class Link return $uri->getUriSigned($configData->getPasswordSalt()); } -} \ No newline at end of file +} diff --git a/tests/SP/Config/ConfigTest.php b/tests/SP/Config/ConfigTest.php index b821fbdc..6e81e7c3 100644 --- a/tests/SP/Config/ConfigTest.php +++ b/tests/SP/Config/ConfigTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Config; @@ -31,7 +31,7 @@ use DI\NotFoundException; use PHPUnit\Framework\TestCase; use SP\Core\Context\ContextException; use SP\Domain\Config\Adapters\ConfigData; -use SP\Domain\Config\ConfigInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Infrastructure\File\FileException; use function SP\Tests\getResource; use function SP\Tests\recreateDir; @@ -83,7 +83,7 @@ class ConfigTest extends TestCase * @throws DependencyException * @throws NotFoundException */ - public function testLoadClass(): ConfigInterface + public function testLoadClass(): \SP\Domain\Config\Ports\ConfigInterface { $config = self::$dic->get(\SP\Domain\Config\Services\ConfigFileService::class); @@ -102,7 +102,7 @@ class ConfigTest extends TestCase * * @throws FileException */ - public function testSaveConfig(ConfigInterface $config) + public function testSaveConfig(\SP\Domain\Config\Ports\ConfigInterface $config) { $config->saveConfig($config->getConfigData(), false); @@ -117,7 +117,7 @@ class ConfigTest extends TestCase * * @param ConfigInterface $config */ - public function testLoadConfig(ConfigInterface $config) + public function testLoadConfig(\SP\Domain\Config\Ports\ConfigInterface $config) { $this->assertInstanceOf(ConfigData::class, $config->loadConfig()); } @@ -129,7 +129,7 @@ class ConfigTest extends TestCase * * @param ConfigInterface $config */ - public function testUpdateConfig(ConfigInterface $config) + public function testUpdateConfig(\SP\Domain\Config\Ports\ConfigInterface $config) { $config->updateConfig($config->getConfigData()); @@ -146,7 +146,7 @@ class ConfigTest extends TestCase * @throws EnvironmentIsBrokenException * @throws FileException */ - public function testGenerateUpgradeKey(ConfigInterface $config) + public function testGenerateUpgradeKey(\SP\Domain\Config\Ports\ConfigInterface $config) { $config->generateUpgradeKey(); diff --git a/tests/SP/Domain/Account/Out/AccountAdapterTest.php b/tests/SP/Domain/Account/Out/AccountAdapterTest.php index 441a0a41..9684eab5 100644 --- a/tests/SP/Domain/Account/Out/AccountAdapterTest.php +++ b/tests/SP/Domain/Account/Out/AccountAdapterTest.php @@ -26,8 +26,8 @@ namespace SP\Tests\Domain\Account\Out; use League\Fractal\Manager; use League\Fractal\Resource\Item; -use SP\Domain\Account\Out\AccountAdapter; -use SP\Domain\CustomField\CustomFieldServiceInterface; +use SP\Domain\Account\Adapters\AccountAdapter; +use SP\Domain\CustomField\Ports\CustomFieldServiceInterface; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Tests\Generators\AccountDataGenerator; use SP\Tests\Generators\CustomFieldGenerator; @@ -117,7 +117,7 @@ class AccountAdapterTest extends UnitaryTestCase )->toArray(); $this->assertArrayHasKey('customFields', $out['data']); - $this->assertEquals($customFieldData->type, $out['data']['customFields']['data'][0]['typeName']); + $this->assertEquals($customFieldData->typeName, $out['data']['customFields']['data'][0]['type']); $this->assertEquals($customFieldData->typeText, $out['data']['customFields']['data'][0]['typeText']); $this->assertEquals($customFieldData->definitionId, $out['data']['customFields']['data'][0]['definitionId']); $this->assertEquals( diff --git a/tests/SP/Domain/Account/Services/AccountAclServiceTest.php b/tests/SP/Domain/Account/Services/AccountAclServiceTest.php index 4f7b284a..b2bb02ef 100644 --- a/tests/SP/Domain/Account/Services/AccountAclServiceTest.php +++ b/tests/SP/Domain/Account/Services/AccountAclServiceTest.php @@ -32,8 +32,8 @@ use SP\DataModel\Dto\AccountAclDto; use SP\DataModel\ItemData; use SP\Domain\Account\Services\AccountAcl; use SP\Domain\Account\Services\AccountAclService; -use SP\Domain\Common\Out\SimpleModel; -use SP\Domain\User\UserToUserGroupServiceInterface; +use SP\Domain\Common\Adapters\SimpleModel; +use SP\Domain\User\Ports\UserToUserGroupServiceInterface; use SP\Infrastructure\File\FileCacheInterface; use SP\Infrastructure\File\FileException; use SP\Tests\UnitaryTestCase; diff --git a/tests/SP/Domain/Install/Services/InstallerTest.php b/tests/SP/Domain/Install/Services/InstallerTest.php index 81f2c6e4..7d948f61 100644 --- a/tests/SP/Domain/Install/Services/InstallerTest.php +++ b/tests/SP/Domain/Install/Services/InstallerTest.php @@ -28,14 +28,14 @@ use Exception; use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Exceptions\SPException; use SP\Domain\Config\Services\ConfigService; -use SP\Domain\Install\DatabaseSetupInterface; -use SP\Domain\Install\In\InstallData; -use SP\Domain\Install\InstallerServiceInterface; +use SP\Domain\Install\Adapters\InstallData; +use SP\Domain\Install\Ports\InstallerServiceInterface; +use SP\Domain\Install\Services\DatabaseSetupInterface; use SP\Domain\Install\Services\InstallerService; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Domain\User\Services\UserGroupService; use SP\Domain\User\Services\UserProfileService; use SP\Domain\User\Services\UserService; -use SP\Domain\User\UserProfileServiceInterface; use SP\Http\Request; use SP\Http\RequestInterface; use SP\Infrastructure\Database\DatabaseConnectionData; @@ -50,7 +50,7 @@ use SP\Util\VersionUtil; class InstallerTest extends UnitaryTestCase { /** - * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\Install\DatabaseSetupInterface + * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\Install\Services\DatabaseSetupInterface */ private $databaseSetup; /** @@ -62,15 +62,15 @@ class InstallerTest extends UnitaryTestCase */ private $request; /** - * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\Config\ConfigServiceInterface + * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\Config\Ports\ConfigServiceInterface */ private $configService; /** - * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\User\UserGroupServiceInterface + * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\User\Ports\UserGroupServiceInterface */ private $userGroupService; /** - * @var \PHPUnit\Framework\MockObject\MockObject|UserProfileServiceInterface + * @var \PHPUnit\Framework\MockObject\MockObject|\SP\Domain\User\Ports\UserProfileServiceInterface */ private $userProfileService; @@ -114,7 +114,7 @@ class InstallerTest extends UnitaryTestCase } /** - * @return \SP\Domain\Install\In\InstallData + * @return \SP\Domain\Install\Adapters\InstallData */ private function getInstallData(): InstallData { @@ -132,7 +132,7 @@ class InstallerTest extends UnitaryTestCase } /** - * @return \SP\Domain\Install\InstallerServiceInterface + * @return \SP\Domain\Install\Ports\InstallerServiceInterface */ private function getDefaultInstaller(): InstallerServiceInterface { diff --git a/tests/SP/Domain/Install/Services/MySQLTest.php b/tests/SP/Domain/Install/Services/MySQLTest.php index 91dc3c9d..92a43a9f 100644 --- a/tests/SP/Domain/Install/Services/MySQLTest.php +++ b/tests/SP/Domain/Install/Services/MySQLTest.php @@ -26,8 +26,8 @@ namespace SP\Tests\Domain\Install\Services; use PDOException; use SP\Core\Exceptions\SPException; -use SP\Domain\Config\In\ConfigDataInterface; -use SP\Domain\Install\In\InstallData; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Install\Adapters\InstallData; use SP\Domain\Install\Services\MysqlService; use SP\Infrastructure\Database\DatabaseFileInterface; use SP\Infrastructure\Database\DatabaseUtil; @@ -725,7 +725,7 @@ class MySQLTest extends UnitaryTestCase } /** - * @return \SP\Domain\Install\In\InstallData + * @return \SP\Domain\Install\Adapters\InstallData */ private function getInstallData(): InstallData { diff --git a/tests/SP/Generators/CustomFieldGenerator.php b/tests/SP/Generators/CustomFieldGenerator.php index a86b7cac..61f6ca6b 100644 --- a/tests/SP/Generators/CustomFieldGenerator.php +++ b/tests/SP/Generators/CustomFieldGenerator.php @@ -24,7 +24,7 @@ namespace SP\Tests\Generators; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; /** * Class CustomFieldGenerator diff --git a/tests/SP/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php index 3bd5dd4c..d10161ac 100644 --- a/tests/SP/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/AccountFileRepositoryTest.php @@ -29,7 +29,7 @@ use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\FileData; use SP\DataModel\ItemSearchData; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\AccountFileRepository; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; diff --git a/tests/SP/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php index 19e02273..968cab83 100644 --- a/tests/SP/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/AccountHistoryRepositoryTest.php @@ -29,9 +29,9 @@ use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\Out\AccountData; +use SP\Domain\Account\Adapters\AccountData; use SP\Domain\Account\Services\AccountPasswordRequest; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\AccountHistoryRepository; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; diff --git a/tests/SP/Infrastructure/Account/Repositories/AccountRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/AccountRepositoryTest.php index 93a87c8b..27bfadfb 100644 --- a/tests/SP/Infrastructure/Account/Repositories/AccountRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/AccountRepositoryTest.php @@ -32,7 +32,7 @@ use SP\DataModel\ItemSearchData; use SP\Domain\Account\Services\AccountFilterUser; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\AccountRepository; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; diff --git a/tests/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php index 4a1fa9bb..380c5e4f 100644 --- a/tests/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/AccountToFavoriteRepositoryTest.php @@ -27,7 +27,7 @@ namespace SP\Tests\Infrastructure\Account\Repositories; use Aura\SqlQuery\QueryFactory; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\AccountToFavoriteRepository; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; diff --git a/tests/SP/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php index 1a878f7b..b7125399 100644 --- a/tests/SP/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/AccountToTagRepositoryTest.php @@ -28,7 +28,7 @@ use Aura\SqlQuery\QueryFactory; use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\Domain\Account\Services\AccountRequest; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\AccountToTagRepository; use SP\Infrastructure\Database\DatabaseInterface; use SP\Infrastructure\Database\QueryData; diff --git a/tests/SP/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php b/tests/SP/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php index 9cb1f2c4..e4b80080 100644 --- a/tests/SP/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php +++ b/tests/SP/Infrastructure/Account/Repositories/PublicLinkRepositoryTest.php @@ -29,7 +29,7 @@ use PHPUnit\Framework\Constraint\Callback; use PHPUnit\Framework\MockObject\MockObject; use SP\DataModel\ItemSearchData; use SP\DataModel\PublicLinkData; -use SP\Domain\Common\Out\SimpleModel; +use SP\Domain\Common\Adapters\SimpleModel; use SP\Infrastructure\Account\Repositories\PublicLinkRepository; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Database\DatabaseInterface; diff --git a/tests/SP/Modules/Api/ApiTestCase.php b/tests/SP/Modules/Api/ApiTestCase.php index 3d64ab38..3844a35b 100644 --- a/tests/SP/Modules/Api/ApiTestCase.php +++ b/tests/SP/Modules/Api/ApiTestCase.php @@ -37,8 +37,8 @@ use SP\Core\Context\ContextInterface; use SP\DataModel\AuthTokenData; use SP\Domain\Api\Services\ApiRequest; use SP\Domain\Auth\Services\AuthTokenService; -use SP\Domain\Config\ConfigInterface; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Infrastructure\Database\DatabaseConnectionData; use SP\Infrastructure\Database\DbStorageInterface; use SP\Infrastructure\Database\MysqlHandler; @@ -226,4 +226,4 @@ abstract class ApiTestCase extends TestCase return $data; } -} \ No newline at end of file +} diff --git a/tests/SP/Repositories/AccountFileRepositoryTest.php b/tests/SP/Repositories/AccountFileRepositoryTest.php index e661df96..aa6abc95 100644 --- a/tests/SP/Repositories/AccountFileRepositoryTest.php +++ b/tests/SP/Repositories/AccountFileRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\DataModel\FileData; use SP\DataModel\FileExtData; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\In\AccountFileRepositoryInterface; +use SP\Domain\Account\Ports\AccountFileRepositoryInterface; use SP\Infrastructure\Account\Repositories\AccountFileRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; @@ -45,7 +45,7 @@ use function SP\Tests\setupContext; class AccountFileRepositoryTest extends DatabaseTestCase { /** - * @var \SP\Domain\Account\In\AccountFileRepositoryInterface + * @var \SP\Domain\Account\Ports\AccountFileRepositoryInterface */ private static $repository; diff --git a/tests/SP/Repositories/AccountHistoryRepositoryTest.php b/tests/SP/Repositories/AccountHistoryRepositoryTest.php index 267172d8..d5f0392a 100644 --- a/tests/SP/Repositories/AccountHistoryRepositoryTest.php +++ b/tests/SP/Repositories/AccountHistoryRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -34,7 +34,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\AccountHistoryData; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\In\AccountHistoryRepositoryInterface; +use SP\Domain\Account\Ports\AccountHistoryRepositoryInterface; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Infrastructure\Account\Repositories\AccountHistoryRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php b/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php index bb8082ce..efe0fe37 100644 --- a/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php +++ b/tests/SP/Repositories/AccountToFavoriteRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -29,7 +29,7 @@ use DI\NotFoundException; use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\In\AccountToFavoriteRepositoryInterface; +use SP\Domain\Account\Ports\AccountToFavoriteRepositoryInterface; use SP\Infrastructure\Account\Repositories\AccountToFavoriteRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; @@ -42,7 +42,7 @@ use function SP\Tests\setupContext; class AccountToFavoriteRepositoryTest extends DatabaseTestCase { /** - * @var \SP\Domain\Account\In\AccountToFavoriteRepositoryInterface + * @var \SP\Domain\Account\Ports\AccountToFavoriteRepositoryInterface */ private static $repository; diff --git a/tests/SP/Repositories/AccountToTagRepositoryTest.php b/tests/SP/Repositories/AccountToTagRepositoryTest.php index 74989af2..ba9b7861 100644 --- a/tests/SP/Repositories/AccountToTagRepositoryTest.php +++ b/tests/SP/Repositories/AccountToTagRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -30,7 +30,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemData; -use SP\Domain\Account\In\AccountToTagRepositoryInterface; +use SP\Domain\Account\Ports\AccountToTagRepositoryInterface; use SP\Domain\Account\Services\AccountRequest; use SP\Infrastructure\Account\Repositories\AccountToTagRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php b/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php index 42a393a3..ad68fec7 100644 --- a/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php +++ b/tests/SP/Repositories/AccountToUserGroupRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -30,7 +30,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemData; -use SP\Domain\Account\In\AccountToUserGroupRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserGroupRepositoryInterface; use SP\Domain\Account\Services\AccountRequest; use SP\Infrastructure\Account\Repositories\AccountToUserGroupRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/AccountToUserRepositoryTest.php b/tests/SP/Repositories/AccountToUserRepositoryTest.php index f8444c27..970c19e2 100644 --- a/tests/SP/Repositories/AccountToUserRepositoryTest.php +++ b/tests/SP/Repositories/AccountToUserRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -30,7 +30,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemData; -use SP\Domain\Account\In\AccountToUserRepositoryInterface; +use SP\Domain\Account\Ports\AccountToUserRepositoryInterface; use SP\Domain\Account\Services\AccountRequest; use SP\Infrastructure\Account\Repositories\AccountToUserRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/CategoryRepositoryTest.php b/tests/SP/Repositories/CategoryRepositoryTest.php index 6be43009..651d14f5 100644 --- a/tests/SP/Repositories/CategoryRepositoryTest.php +++ b/tests/SP/Repositories/CategoryRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ItemSearchData; -use SP\Domain\Category\In\CategoryRepositoryInterface; +use SP\Domain\Category\Ports\CategoryRepositoryInterface; use SP\Infrastructure\Category\Repositories\CategoryRepository; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Tests\DatabaseTestCase; @@ -49,7 +49,7 @@ use function SP\Tests\setupContext; class CategoryRepositoryTest extends DatabaseTestCase { /** - * @var CategoryRepositoryInterface + * @var \SP\Domain\Category\Ports\CategoryRepositoryInterface */ private static $repository; diff --git a/tests/SP/Repositories/ConfigRepositoryTest.php b/tests/SP/Repositories/ConfigRepositoryTest.php index 732ec144..5575ea9f 100644 --- a/tests/SP/Repositories/ConfigRepositoryTest.php +++ b/tests/SP/Repositories/ConfigRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -30,7 +30,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ConfigData; -use SP\Domain\Config\In\ConfigRepositoryInterface; +use SP\Domain\Config\Ports\ConfigRepositoryInterface; use SP\Infrastructure\Config\Repositories\ConfigRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Repositories/CustomFieldDefRepositoryTest.php b/tests/SP/Repositories/CustomFieldDefRepositoryTest.php index 1c72ecbd..014a3a25 100644 --- a/tests/SP/Repositories/CustomFieldDefRepositoryTest.php +++ b/tests/SP/Repositories/CustomFieldDefRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -33,7 +33,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldDefinitionData; use SP\DataModel\ItemSearchData; -use SP\Domain\CustomField\In\CustomFieldDefRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldDefRepositoryInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\CustomField\Repositories\CustomFieldDefRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/CustomFieldRepositoryTest.php b/tests/SP/Repositories/CustomFieldRepositoryTest.php index 72760305..538beff5 100644 --- a/tests/SP/Repositories/CustomFieldRepositoryTest.php +++ b/tests/SP/Repositories/CustomFieldRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\CustomFieldData; -use SP\Domain\CustomField\In\CustomFieldRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldRepositoryInterface; use SP\Infrastructure\CustomField\Repositories\CustomFieldRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php b/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php index 14b0e4fc..d40a2d26 100644 --- a/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php +++ b/tests/SP/Repositories/CustomFieldTypeRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\CustomFieldTypeData; -use SP\Domain\CustomField\In\CustomFieldTypeRepositoryInterface; +use SP\Domain\CustomField\Ports\CustomFieldTypeRepositoryInterface; use SP\Infrastructure\CustomField\Repositories\CustomFieldTypeRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Repositories/EventlogRepositoryTest.php b/tests/SP/Repositories/EventlogRepositoryTest.php index 639f3fc3..5ff8d09a 100644 --- a/tests/SP/Repositories/EventlogRepositoryTest.php +++ b/tests/SP/Repositories/EventlogRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\EventlogData; use SP\DataModel\ItemSearchData; -use SP\Domain\Security\In\EventlogRepositoryInterface; +use SP\Domain\Security\Ports\EventlogRepositoryInterface; use SP\Infrastructure\Security\Repositories\EventlogRepository; use SP\Tests\DatabaseTestCase; use stdClass; diff --git a/tests/SP/Repositories/ItemPresetRepositoryTest.php b/tests/SP/Repositories/ItemPresetRepositoryTest.php index 113bd861..f677f9dd 100644 --- a/tests/SP/Repositories/ItemPresetRepositoryTest.php +++ b/tests/SP/Repositories/ItemPresetRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\ItemPresetData; use SP\DataModel\ItemSearchData; -use SP\Domain\ItemPreset\In\ItemPresetRepositoryInterface; +use SP\Domain\ItemPreset\Ports\ItemPresetRepositoryInterface; use SP\Infrastructure\ItemPreset\Repositories\ItemPresetRepository; use SP\Tests\DatabaseTestCase; use stdClass; @@ -45,7 +45,7 @@ use function SP\Tests\setupContext; class ItemPresetRepositoryTest extends DatabaseTestCase { /** - * @var ItemPresetRepositoryInterface + * @var \SP\Domain\ItemPreset\Ports\ItemPresetRepositoryInterface */ private static $repository; diff --git a/tests/SP/Repositories/NotificationRepositoryTest.php b/tests/SP/Repositories/NotificationRepositoryTest.php index c6e55c6d..0cb045f0 100644 --- a/tests/SP/Repositories/NotificationRepositoryTest.php +++ b/tests/SP/Repositories/NotificationRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Messages\NotificationMessage; use SP\DataModel\ItemSearchData; use SP\DataModel\NotificationData; -use SP\Domain\Notification\In\NotificationRepositoryInterface; +use SP\Domain\Notification\Ports\NotificationRepositoryInterface; use SP\Infrastructure\Notification\Repositories\NotificationRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Repositories/PluginDataRepositoryTest.php b/tests/SP/Repositories/PluginDataRepositoryTest.php index 91ae8545..d1945bb8 100644 --- a/tests/SP/Repositories/PluginDataRepositoryTest.php +++ b/tests/SP/Repositories/PluginDataRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Plugin\In\PluginDataRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginDataRepositoryInterface; use SP\Infrastructure\Plugin\Repositories\PluginDataModel; use SP\Infrastructure\Plugin\Repositories\PluginDataRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/PluginRepositoryTest.php b/tests/SP/Repositories/PluginRepositoryTest.php index f49b595a..250e0b07 100644 --- a/tests/SP/Repositories/PluginRepositoryTest.php +++ b/tests/SP/Repositories/PluginRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; -use SP\Domain\Plugin\In\PluginRepositoryInterface; +use SP\Domain\Plugin\Ports\PluginRepositoryInterface; use SP\Infrastructure\Plugin\Repositories\PluginModel; use SP\Infrastructure\Plugin\Repositories\PluginRepository; use SP\Tests\DatabaseTestCase; @@ -46,7 +46,7 @@ use function SP\Tests\setupContext; class PluginRepositoryTest extends DatabaseTestCase { /** - * @var PluginRepositoryInterface + * @var \SP\Domain\Plugin\Ports\PluginRepositoryInterface */ private static $repository; diff --git a/tests/SP/Repositories/PublicLinkRepositoryTest.php b/tests/SP/Repositories/PublicLinkRepositoryTest.php index 577c513f..3fae6103 100644 --- a/tests/SP/Repositories/PublicLinkRepositoryTest.php +++ b/tests/SP/Repositories/PublicLinkRepositoryTest.php @@ -34,7 +34,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\PublicLinkData; use SP\DataModel\PublicLinkListData; -use SP\Domain\Account\In\PublicLinkRepositoryInterface; +use SP\Domain\Account\Ports\PublicLinkRepositoryInterface; use SP\Infrastructure\Account\Repositories\PublicLinkRepository; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/TagRepositoryTest.php b/tests/SP/Repositories/TagRepositoryTest.php index f0d341ab..a5551742 100644 --- a/tests/SP/Repositories/TagRepositoryTest.php +++ b/tests/SP/Repositories/TagRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\CategoryData; use SP\DataModel\ItemSearchData; use SP\DataModel\TagData; -use SP\Domain\Tag\In\TagRepositoryInterface; +use SP\Domain\Tag\Ports\TagRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Tag\Repositories\TagRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/TrackRepositoryTest.php b/tests/SP/Repositories/TrackRepositoryTest.php index a0211429..741cde3b 100644 --- a/tests/SP/Repositories/TrackRepositoryTest.php +++ b/tests/SP/Repositories/TrackRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\InvalidArgumentException; use SP\Core\Exceptions\QueryException; use SP\DataModel\TrackData; -use SP\Domain\Security\In\TrackRepositoryInterface; +use SP\Domain\Security\Ports\TrackRepositoryInterface; use SP\Infrastructure\Security\Repositories\TrackRepository; use SP\Infrastructure\Security\Repositories\TrackRequest; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/UserGroupRepositoryTest.php b/tests/SP/Repositories/UserGroupRepositoryTest.php index 6d960605..fe773f85 100644 --- a/tests/SP/Repositories/UserGroupRepositoryTest.php +++ b/tests/SP/Repositories/UserGroupRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\UserGroupData; -use SP\Domain\User\In\UserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserGroupRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\User\Repositories\UserGroupRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/UserPassRecoverRepositoryTest.php b/tests/SP/Repositories/UserPassRecoverRepositoryTest.php index 99fafc80..b18179de 100644 --- a/tests/SP/Repositories/UserPassRecoverRepositoryTest.php +++ b/tests/SP/Repositories/UserPassRecoverRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -31,7 +31,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\User\In\UserPassRecoverRepositoryInterface; +use SP\Domain\User\Ports\UserPassRecoverRepositoryInterface; use SP\Infrastructure\User\Repositories\UserPassRecoverRepository; use SP\Tests\DatabaseTestCase; use SP\Util\PasswordUtil; diff --git a/tests/SP/Repositories/UserProfileRepositoryTest.php b/tests/SP/Repositories/UserProfileRepositoryTest.php index 1ef6ed99..52c7938c 100644 --- a/tests/SP/Repositories/UserProfileRepositoryTest.php +++ b/tests/SP/Repositories/UserProfileRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\ProfileData; use SP\DataModel\UserProfileData; -use SP\Domain\User\In\UserProfileRepositoryInterface; +use SP\Domain\User\Ports\UserProfileRepositoryInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\User\Repositories\UserProfileRepository; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Repositories/UserRepositoryTest.php b/tests/SP/Repositories/UserRepositoryTest.php index 8a98fdfb..2685d942 100644 --- a/tests/SP/Repositories/UserRepositoryTest.php +++ b/tests/SP/Repositories/UserRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -36,7 +36,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemSearchData; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; -use SP\Domain\User\In\UserRepositoryInterface; +use SP\Domain\User\Ports\UserRepositoryInterface; use SP\Domain\User\Services\UpdatePassRequest; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\User\Repositories\UserRepository; diff --git a/tests/SP/Repositories/UserToUserGroupRepositoryTest.php b/tests/SP/Repositories/UserToUserGroupRepositoryTest.php index 3a49fb48..2153625e 100644 --- a/tests/SP/Repositories/UserToUserGroupRepositoryTest.php +++ b/tests/SP/Repositories/UserToUserGroupRepositoryTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Repositories; @@ -30,7 +30,7 @@ use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\DataModel\UserToUserGroupData; -use SP\Domain\User\In\UserToUserGroupRepositoryInterface; +use SP\Domain\User\Ports\UserToUserGroupRepositoryInterface; use SP\Infrastructure\User\Repositories\UserToUserGroupRepository; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Services/Account/AccountCryptServiceTest.php b/tests/SP/Services/Account/AccountCryptServiceTest.php index 5b29fb0f..1a25b1cb 100644 --- a/tests/SP/Services/Account/AccountCryptServiceTest.php +++ b/tests/SP/Services/Account/AccountCryptServiceTest.php @@ -31,8 +31,7 @@ use SP\Core\Context\ContextException; use SP\Core\Crypt\Crypt; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountCryptServiceInterface; -use SP\Domain\Account\AccountServiceInterface; +use SP\Domain\Account\Ports\AccountCryptServiceInterface; use SP\Domain\Account\Services\AccountCryptService; use SP\Domain\Account\Services\AccountService; use SP\Domain\Common\Services\ServiceException; @@ -52,7 +51,7 @@ class AccountCryptServiceTest extends DatabaseTestCase const NEW_MASTERPASS = '00123456789'; const CURRENT_HASH = '$2y$10$xtsuN2PUvgSH/0mrfBlsbOActVgCjYcqDqC6L3T9QraNxZC4RXGYa'; /** - * @var \SP\Domain\Account\AccountServiceInterface + * @var \SP\Domain\Account\Ports\AccountServiceInterface */ private static $accountService; /** diff --git a/tests/SP/Services/Account/AccountHistoryServiceTest.php b/tests/SP/Services/Account/AccountHistoryServiceTest.php index e77d7837..4deeb56f 100644 --- a/tests/SP/Services/Account/AccountHistoryServiceTest.php +++ b/tests/SP/Services/Account/AccountHistoryServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Account; @@ -34,7 +34,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\AccountHistoryData; use SP\DataModel\Dto\AccountHistoryCreateDto; use SP\DataModel\ItemSearchData; -use SP\Domain\Account\AccountHistoryServiceInterface; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Domain\Account\Services\AccountHistoryService; use SP\Domain\Account\Services\AccountPasswordRequest; use SP\Domain\Common\Services\ServiceException; diff --git a/tests/SP/Services/Account/AccountSearchServiceTest.php b/tests/SP/Services/Account/AccountSearchServiceTest.php index b2651649..7b79354b 100644 --- a/tests/SP/Services/Account/AccountSearchServiceTest.php +++ b/tests/SP/Services/Account/AccountSearchServiceTest.php @@ -33,7 +33,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\UserPreferencesData; -use SP\Domain\Account\AccountSearchServiceInterface; +use SP\Domain\Account\Ports\AccountSearchServiceInterface; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Domain\Account\Services\AccountSearchItem; use SP\Domain\Account\Services\AccountSearchService; @@ -51,7 +51,7 @@ use function SP\Tests\setupContext; class AccountSearchServiceTest extends DatabaseTestCase { /** - * @var AccountSearchServiceInterface + * @var \SP\Domain\Account\Ports\AccountSearchServiceInterface */ private static $service; /** diff --git a/tests/SP/Services/Account/AccountServiceTest.php b/tests/SP/Services/Account/AccountServiceTest.php index f225cfa2..54218a55 100644 --- a/tests/SP/Services/Account/AccountServiceTest.php +++ b/tests/SP/Services/Account/AccountServiceTest.php @@ -39,9 +39,8 @@ use SP\DataModel\AccountSearchVData; use SP\DataModel\AccountVData; use SP\DataModel\ItemSearchData; use SP\DataModel\ProfileData; -use SP\Domain\Account\AccountHistoryServiceInterface; -use SP\Domain\Account\AccountServiceInterface; -use SP\Domain\Account\Out\AccountData; +use SP\Domain\Account\Adapters\AccountData; +use SP\Domain\Account\Ports\AccountHistoryServiceInterface; use SP\Domain\Account\Search\AccountSearchFilter; use SP\Domain\Account\Services\AccountBulkRequest; use SP\Domain\Account\Services\AccountHistoryService; @@ -73,7 +72,7 @@ class AccountServiceTest extends DatabaseTestCase */ private static $context; /** - * @var \SP\Domain\Account\AccountServiceInterface + * @var \SP\Domain\Account\Ports\AccountServiceInterface */ private static $service; diff --git a/tests/SP/Services/Account/AccountToFavoriteServiceTest.php b/tests/SP/Services/Account/AccountToFavoriteServiceTest.php index ece99042..87e6c257 100644 --- a/tests/SP/Services/Account/AccountToFavoriteServiceTest.php +++ b/tests/SP/Services/Account/AccountToFavoriteServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Account; @@ -29,7 +29,7 @@ use DI\NotFoundException; use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountToFavoriteServiceInterface; +use SP\Domain\Account\Ports\AccountToFavoriteServiceInterface; use SP\Domain\Account\Services\AccountToFavoriteService; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Services/Account/AccountToTagServiceTest.php b/tests/SP/Services/Account/AccountToTagServiceTest.php index fd683885..f3af2c1e 100644 --- a/tests/SP/Services/Account/AccountToTagServiceTest.php +++ b/tests/SP/Services/Account/AccountToTagServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Account; @@ -29,7 +29,7 @@ use DI\NotFoundException; use SP\Core\Context\ContextException; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountToTagServiceInterface; +use SP\Domain\Account\Ports\AccountToTagServiceInterface; use SP\Domain\Account\Services\AccountToTagService; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; @@ -42,7 +42,7 @@ use function SP\Tests\setupContext; class AccountToTagServiceTest extends DatabaseTestCase { /** - * @var AccountToTagServiceInterface + * @var \SP\Domain\Account\Ports\AccountToTagServiceInterface */ private static $service; diff --git a/tests/SP/Services/Api/ApiServiceTest.php b/tests/SP/Services/Api/ApiServiceTest.php index 28d3d762..3663e3da 100644 --- a/tests/SP/Services/Api/ApiServiceTest.php +++ b/tests/SP/Services/Api/ApiServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Api; @@ -30,7 +30,7 @@ use DI\NotFoundException; use SP\Core\Acl\ActionsInterface; use SP\Core\Context\ContextException; use SP\Core\Exceptions\SPException; -use SP\Domain\Api\ApiServiceInterface; +use SP\Domain\Api\Ports\ApiServiceInterface; use SP\Domain\Api\Services\ApiRequest; use SP\Domain\Api\Services\ApiService; use SP\Domain\Common\Services\ServiceException; @@ -50,7 +50,7 @@ class ApiServiceTest extends DatabaseTestCase const DEMO_TOKEN = '12b9027d24efff7bfbaca8bd774a4c34b45de35e033d2b192a88f4dfaee5c233'; /** - * @var ApiServiceInterface + * @var \SP\Domain\Api\Ports\ApiServiceInterface */ private static $service; /** diff --git a/tests/SP/Services/Category/CategoryServiceTest.php b/tests/SP/Services/Category/CategoryServiceTest.php index 4eef1956..d492ba3b 100644 --- a/tests/SP/Services/Category/CategoryServiceTest.php +++ b/tests/SP/Services/Category/CategoryServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Category; @@ -48,7 +48,7 @@ use function SP\Tests\setupContext; class CategoryServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\Category\CategoryServiceInterface + * @var \SP\Domain\Category\Ports\CategoryServiceInterface */ private static $service; diff --git a/tests/SP/Services/Client/ClientServiceTest.php b/tests/SP/Services/Client/ClientServiceTest.php index 56ff2c4c..edda8433 100644 --- a/tests/SP/Services/Client/ClientServiceTest.php +++ b/tests/SP/Services/Client/ClientServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Client; @@ -54,7 +54,7 @@ class ClientServiceTest extends DatabaseTestCase */ private static $setupUser; /** - * @var \SP\Domain\Client\ClientServiceInterface + * @var \SP\Domain\Client\Ports\ClientServiceInterface */ private static $service; diff --git a/tests/SP/Services/Config/ConfigBackupServiceTest.php b/tests/SP/Services/Config/ConfigBackupServiceTest.php index 4bc316a7..cb935e55 100644 --- a/tests/SP/Services/Config/ConfigBackupServiceTest.php +++ b/tests/SP/Services/Config/ConfigBackupServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Config; @@ -30,7 +30,7 @@ use PHPUnit\Framework\TestCase; use SP\Core\Context\ContextException; use SP\Domain\Common\Services\ServiceException; use SP\Domain\Config\Adapters\ConfigData; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\Config\Services\ConfigBackupService; use SP\Domain\Config\Services\ConfigFileService; use SP\Infrastructure\File\FileException; diff --git a/tests/SP/Services/Config/ConfigServiceTest.php b/tests/SP/Services/Config/ConfigServiceTest.php index ef3ed6d5..c8d1745e 100644 --- a/tests/SP/Services/Config/ConfigServiceTest.php +++ b/tests/SP/Services/Config/ConfigServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Config; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\DataModel\ConfigData; use SP\DataModel\Dto\ConfigRequest; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\ConfigServiceInterface; +use SP\Domain\Config\Ports\ConfigServiceInterface; use SP\Domain\Config\Services\ConfigService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Services/Crypt/MasterPassServiceTest.php b/tests/SP/Services/Crypt/MasterPassServiceTest.php index 9aec1292..0054ea91 100644 --- a/tests/SP/Services/Crypt/MasterPassServiceTest.php +++ b/tests/SP/Services/Crypt/MasterPassServiceTest.php @@ -32,7 +32,6 @@ use SP\Core\Context\ContextException; use SP\Core\Crypt\Crypt; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Account\AccountServiceInterface; use SP\Domain\Account\Services\AccountService; use SP\Domain\Crypt\Services\MasterPassService; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; @@ -50,15 +49,15 @@ use function SP\Tests\setupContext; class MasterPassServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\CustomField\CustomFieldServiceInterface + * @var \SP\Domain\CustomField\Ports\CustomFieldServiceInterface */ private static $customFieldService; /** - * @var \SP\Domain\Account\AccountServiceInterface + * @var \SP\Domain\Account\Ports\AccountServiceInterface */ private static $accountService; /** - * @var \SP\Domain\Crypt\MasterPassServiceInterface + * @var \SP\Domain\Crypt\Ports\MasterPassServiceInterface */ private static $service; diff --git a/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php b/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php index f3403b3c..e78c29b1 100644 --- a/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php +++ b/tests/SP/Services/Crypt/TemporaryMasterPassServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Crypt; @@ -46,7 +46,7 @@ class TemporaryMasterPassServiceTest extends TestCase */ private $context; /** - * @var \SP\Domain\Crypt\TemporaryMasterPassServiceInterface + * @var \SP\Domain\Crypt\Ports\TemporaryMasterPassServiceInterface */ private $service; diff --git a/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php b/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php index d23a1357..8f0abd16 100644 --- a/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php +++ b/tests/SP/Services/CustomField/CustomFieldCryptServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\CustomField; @@ -31,9 +31,8 @@ use SP\Core\Context\ContextException; use SP\Core\Crypt\Crypt; use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; -use SP\Domain\Common\Services\ServiceException; use SP\Domain\Crypt\Services\UpdateMasterPassRequest; -use SP\Domain\CustomField\CustomFieldCryptServiceInterface; +use SP\Domain\CustomField\Ports\CustomFieldCryptServiceInterface; use SP\Domain\CustomField\Services\CustomFieldCryptService; use SP\Domain\CustomField\Services\CustomFieldService; use SP\Tests\DatabaseTestCase; @@ -48,11 +47,11 @@ use function SP\Tests\setupContext; class CustomFieldCryptServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\CustomField\CustomFieldServiceInterface + * @var \SP\Domain\CustomField\Ports\CustomFieldServiceInterface */ private static $customFieldService; /** - * @var CustomFieldCryptServiceInterface + * @var \SP\Domain\CustomField\Ports\CustomFieldCryptServiceInterface */ private static $service; diff --git a/tests/SP/Services/CustomField/CustomFieldServiceTest.php b/tests/SP/Services/CustomField/CustomFieldServiceTest.php index 8f453bb9..71342718 100644 --- a/tests/SP/Services/CustomField/CustomFieldServiceTest.php +++ b/tests/SP/Services/CustomField/CustomFieldServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\CustomField; @@ -49,7 +49,7 @@ use function SP\Tests\setupContext; class CustomFieldServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\CustomField\CustomFieldServiceInterface + * @var \SP\Domain\CustomField\Ports\CustomFieldServiceInterface */ private static $service; diff --git a/tests/SP/Services/Eventlog/EventlogServiceTest.php b/tests/SP/Services/Eventlog/EventlogServiceTest.php index fc05cd16..6b81dde4 100644 --- a/tests/SP/Services/Eventlog/EventlogServiceTest.php +++ b/tests/SP/Services/Eventlog/EventlogServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Eventlog; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\EventlogData; use SP\DataModel\ItemSearchData; -use SP\Domain\Security\EventlogServiceInterface; +use SP\Domain\Security\Ports\EventlogServiceInterface; use SP\Domain\Security\Services\EventlogService; use SP\Tests\DatabaseTestCase; use stdClass; @@ -46,7 +46,7 @@ use function SP\Tests\setupContext; class EventlogServiceTest extends DatabaseTestCase { /** - * @var EventlogServiceInterface + * @var \SP\Domain\Security\Ports\EventlogServiceInterface */ private static $service; diff --git a/tests/SP/Services/Export/XmlExportServiceTest.php b/tests/SP/Services/Export/XmlExportServiceTest.php index 390b5903..3741b1fe 100644 --- a/tests/SP/Services/Export/XmlExportServiceTest.php +++ b/tests/SP/Services/Export/XmlExportServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Export; @@ -29,10 +29,10 @@ use DI\DependencyException; use DI\NotFoundException; use SP\Core\Context\ContextException; use SP\Domain\Common\Services\ServiceException; +use SP\Domain\Export\Ports\XmlVerifyServiceInterface; use SP\Domain\Export\Services\VerifyResult; use SP\Domain\Export\Services\XmlExportService; use SP\Domain\Export\Services\XmlVerifyService; -use SP\Domain\Export\XmlVerifyServiceInterface; use SP\Infrastructure\File\FileException; use SP\Tests\DatabaseTestCase; use SP\Util\PasswordUtil; @@ -46,7 +46,7 @@ use function SP\Tests\setupContext; class XmlExportServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\Export\XmlExportServiceInterface + * @var \SP\Domain\Export\Ports\XmlExportServiceInterface */ private static $xmlExportService; /** diff --git a/tests/SP/Services/Export/XmlVerifyServiceTest.php b/tests/SP/Services/Export/XmlVerifyServiceTest.php index 18de66bc..64f3abf6 100644 --- a/tests/SP/Services/Export/XmlVerifyServiceTest.php +++ b/tests/SP/Services/Export/XmlVerifyServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Export; @@ -43,7 +43,7 @@ use function SP\Tests\setupContext; class XmlVerifyServiceTest extends TestCase { /** - * @var \SP\Domain\Export\XmlVerifyServiceInterface + * @var \SP\Domain\Export\Ports\XmlVerifyServiceInterface */ private static $xmlVerifyService; diff --git a/tests/SP/Services/Notification/NotificationServiceTest.php b/tests/SP/Services/Notification/NotificationServiceTest.php index a7fc6a93..7cc43d3f 100644 --- a/tests/SP/Services/Notification/NotificationServiceTest.php +++ b/tests/SP/Services/Notification/NotificationServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Notification; @@ -52,7 +52,7 @@ class NotificationServiceTest extends DatabaseTestCase */ private static $context; /** - * @var \SP\Domain\Notification\NotificationServiceInterface + * @var \SP\Domain\Notification\Ports\NotificationServiceInterface */ private static $service; diff --git a/tests/SP/Services/Plugin/PluginDataServiceTest.php b/tests/SP/Services/Plugin/PluginDataServiceTest.php index aa2ce60d..5b8820f9 100644 --- a/tests/SP/Services/Plugin/PluginDataServiceTest.php +++ b/tests/SP/Services/Plugin/PluginDataServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Plugin; @@ -32,7 +32,7 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\NoSuchPropertyException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; -use SP\Domain\Plugin\PluginDataServiceInterface; +use SP\Domain\Plugin\Ports\PluginDataServiceInterface; use SP\Domain\Plugin\Services\PluginDataService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Services/Plugin/PluginServiceTest.php b/tests/SP/Services/Plugin/PluginServiceTest.php index 4e09c02f..76b40a6e 100644 --- a/tests/SP/Services/Plugin/PluginServiceTest.php +++ b/tests/SP/Services/Plugin/PluginServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Plugin; @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\ItemData; use SP\DataModel\ItemSearchData; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Plugin\PluginServiceInterface; +use SP\Domain\Plugin\Ports\PluginServiceInterface; use SP\Domain\Plugin\Services\PluginService; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Infrastructure\Plugin\Repositories\PluginModel; @@ -48,7 +48,7 @@ use function SP\Tests\setupContext; class PluginServiceTest extends DatabaseTestCase { /** - * @var PluginServiceInterface + * @var \SP\Domain\Plugin\Ports\PluginServiceInterface */ private static $service; diff --git a/tests/SP/Services/PublicLink/PublicLinkServiceTest.php b/tests/SP/Services/PublicLink/PublicLinkServiceTest.php index e940b969..01b44b80 100644 --- a/tests/SP/Services/PublicLink/PublicLinkServiceTest.php +++ b/tests/SP/Services/PublicLink/PublicLinkServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\PublicLink; @@ -37,10 +37,10 @@ use SP\DataModel\AccountExtData; use SP\DataModel\ItemSearchData; use SP\DataModel\PublicLinkData; use SP\DataModel\PublicLinkListData; -use SP\Domain\Account\PublicLinkServiceInterface; +use SP\Domain\Account\Ports\PublicLinkServiceInterface; use SP\Domain\Account\Services\PublicLinkService; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; diff --git a/tests/SP/Services/Tag/TagServiceTest.php b/tests/SP/Services/Tag/TagServiceTest.php index 1694f83f..da0944c4 100644 --- a/tests/SP/Services/Tag/TagServiceTest.php +++ b/tests/SP/Services/Tag/TagServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Tag; @@ -48,7 +48,7 @@ use function SP\Tests\setupContext; class TagServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\Tag\TagServiceInterface + * @var \SP\Domain\Tag\Ports\TagServiceInterface */ private static $service; diff --git a/tests/SP/Services/Track/TrackServiceTest.php b/tests/SP/Services/Track/TrackServiceTest.php index 38b75a7c..0e6b356e 100644 --- a/tests/SP/Services/Track/TrackServiceTest.php +++ b/tests/SP/Services/Track/TrackServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\Track; @@ -47,7 +47,7 @@ use function SP\Tests\setupContext; class TrackServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\Security\TrackServiceInterface + * @var \SP\Domain\Security\Ports\TrackServiceInterface */ private static $service; diff --git a/tests/SP/Services/User/UserPassServiceTest.php b/tests/SP/Services/User/UserPassServiceTest.php index 84292e6d..6dff3267 100644 --- a/tests/SP/Services/User/UserPassServiceTest.php +++ b/tests/SP/Services/User/UserPassServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\User; @@ -37,7 +37,6 @@ use SP\DataModel\UserLoginData; use SP\Domain\User\Services\UserLoginResponse; use SP\Domain\User\Services\UserPassService; use SP\Domain\User\Services\UserService; -use SP\Domain\User\UserPassServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; diff --git a/tests/SP/Services/User/UserServiceTest.php b/tests/SP/Services/User/UserServiceTest.php index 6fc3b964..0fb97256 100644 --- a/tests/SP/Services/User/UserServiceTest.php +++ b/tests/SP/Services/User/UserServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\User; @@ -36,7 +36,7 @@ use SP\DataModel\ItemSearchData; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\Config\In\ConfigDataInterface; +use SP\Domain\Config\Ports\ConfigDataInterface; use SP\Domain\User\Services\UserLoginRequest; use SP\Domain\User\Services\UserService; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; @@ -55,7 +55,7 @@ class UserServiceTest extends DatabaseTestCase private const CURRENT_MASTERPASS = '12345678900'; /** - * @var \SP\Domain\Config\In\ConfigDataInterface + * @var \SP\Domain\Config\Ports\ConfigDataInterface */ private static $configData; diff --git a/tests/SP/Services/UserGroup/UserGroupServiceTest.php b/tests/SP/Services/UserGroup/UserGroupServiceTest.php index a5813bf5..a8d2aa72 100644 --- a/tests/SP/Services/UserGroup/UserGroupServiceTest.php +++ b/tests/SP/Services/UserGroup/UserGroupServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\UserGroup; @@ -47,7 +47,7 @@ class UserGroupServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\User\UserGroupServiceInterface + * @var \SP\Domain\User\Ports\UserGroupServiceInterface */ private static $service; diff --git a/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php b/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php index faa38b9e..9a688361 100644 --- a/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php +++ b/tests/SP/Services/UserGroup/UserToUserGroupServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\UserGroup; @@ -31,8 +31,8 @@ use SP\Core\Exceptions\ConstraintException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\DataModel\UserToUserGroupData; +use SP\Domain\User\Ports\UserToUserGroupServiceInterface; use SP\Domain\User\Services\UserToUserGroupService; -use SP\Domain\User\UserToUserGroupServiceInterface; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; use function SP\Tests\setupContext; @@ -46,7 +46,7 @@ class UserToUserGroupServiceTest extends DatabaseTestCase { /** - * @var UserToUserGroupServiceInterface + * @var \SP\Domain\User\Ports\UserToUserGroupServiceInterface */ private static $service; diff --git a/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php b/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php index af9ced75..81de8d0d 100644 --- a/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php +++ b/tests/SP/Services/UserPassRecover/UserPassRecoverServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\UserPassRecover; @@ -33,7 +33,6 @@ use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; use SP\Domain\Common\Services\ServiceException; use SP\Domain\User\Services\UserPassRecoverService; -use SP\Domain\User\UserPassRecoverServiceInterface; use SP\Tests\DatabaseTestCase; use SP\Util\PasswordUtil; use function SP\Tests\setupContext; @@ -46,7 +45,7 @@ use function SP\Tests\setupContext; class UserPassRecoverServiceTest extends DatabaseTestCase { /** - * @var \SP\Domain\User\UserPassRecoverServiceInterface + * @var \SP\Domain\User\Ports\UserPassRecoverServiceInterface */ private static $service; diff --git a/tests/SP/Services/UserProfile/UserProfileServiceTest.php b/tests/SP/Services/UserProfile/UserProfileServiceTest.php index bb86573e..997cb8d3 100644 --- a/tests/SP/Services/UserProfile/UserProfileServiceTest.php +++ b/tests/SP/Services/UserProfile/UserProfileServiceTest.php @@ -1,10 +1,10 @@ . + * along with sysPass. If not, see . */ namespace SP\Tests\Services\UserProfile; @@ -34,7 +34,7 @@ use SP\DataModel\ItemSearchData; use SP\DataModel\ProfileData; use SP\DataModel\UserProfileData; use SP\Domain\Common\Services\ServiceException; -use SP\Domain\User\UserProfileServiceInterface; +use SP\Domain\User\Ports\UserProfileServiceInterface; use SP\Infrastructure\Common\Repositories\DuplicatedItemException; use SP\Infrastructure\Common\Repositories\NoSuchItemException; use SP\Tests\DatabaseTestCase; @@ -49,7 +49,7 @@ use function SP\Tests\setupContext; class UserProfileServiceTest extends DatabaseTestCase { /** - * @var UserProfileServiceInterface + * @var \SP\Domain\User\Ports\UserProfileServiceInterface */ private static $service; diff --git a/tests/SP/UnitaryTestCase.php b/tests/SP/UnitaryTestCase.php index bd2eeef0..79baf328 100644 --- a/tests/SP/UnitaryTestCase.php +++ b/tests/SP/UnitaryTestCase.php @@ -33,7 +33,7 @@ use SP\Core\Context\ContextInterface; use SP\Core\Context\StatelessContext; use SP\Core\Events\EventDispatcher; use SP\DataModel\ProfileData; -use SP\Domain\Config\ConfigInterface; +use SP\Domain\Config\Ports\ConfigInterface; use SP\Domain\Config\Services\ConfigBackupService; use SP\Domain\Config\Services\ConfigFileService; use SP\Domain\User\Services\UserLoginResponse;