diff --git a/phpstan.neon b/phpstan.neon index 8ae10027..1e3455d2 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,15 +8,6 @@ parameters: - test treatPhpDocTypesAsCertain: false ignoreErrors: - - - message: '#Parameter \#1 \$inputFilter of method Admin\\Admin\\Form\\CreateAdminForm::setInputFilter\(\) expects Laminas\\InputFilter\\InputFilterInterface, Admin\\Admin\\InputFilter\\EditAdminInputFilter given.#' - path: test/Unit/Admin/Form/AdminFormTest.php - message: '#Parameter \#1 \$expected of method PHPUnit\\Framework\\Assert::assertSame\(\) contains unresolvable type.#' path: test/Unit/App/Plugin/FormsPluginTest.php - - - message: '#Call to an undefined method Laminas\\InputFilter\\InputFilterInterface::getInputs\(\)#' - path: test - - - message: '#Call to an undefined method Laminas\\InputFilter\\InputFilterInterface::init\(\)#' - path: src diff --git a/src/Admin/src/Form/AccountForm.php b/src/Admin/src/Form/AccountForm.php index 6aba1059..7b282646 100644 --- a/src/Admin/src/Form/AccountForm.php +++ b/src/Admin/src/Form/AccountForm.php @@ -5,21 +5,15 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\EditAccountInputFilter; +use Admin\App\Form\AbstractForm; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Submit; use Laminas\Form\Element\Text; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class AccountForm extends Form +class AccountForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); diff --git a/src/Admin/src/Form/ChangePasswordForm.php b/src/Admin/src/Form/ChangePasswordForm.php index 0ab1075a..f18f9280 100644 --- a/src/Admin/src/Form/ChangePasswordForm.php +++ b/src/Admin/src/Form/ChangePasswordForm.php @@ -5,21 +5,15 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\ChangePasswordInputFilter; +use Admin\App\Form\AbstractForm; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Password; use Laminas\Form\Element\Submit; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class ChangePasswordForm extends Form +class ChangePasswordForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); diff --git a/src/Admin/src/Form/CreateAdminForm.php b/src/Admin/src/Form/CreateAdminForm.php index b3bb30c9..b91aae51 100644 --- a/src/Admin/src/Form/CreateAdminForm.php +++ b/src/Admin/src/Form/CreateAdminForm.php @@ -5,6 +5,7 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\CreateAdminInputFilter; +use Admin\App\Form\AbstractForm; use Core\Admin\Enum\AdminStatusEnum; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\MultiCheckbox; @@ -12,18 +13,11 @@ use Laminas\Form\Element\Select; use Laminas\Form\Element\Submit; use Laminas\Form\Element\Text; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class CreateAdminForm extends Form +class CreateAdminForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -97,12 +91,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/Admin/src/Form/DeleteAdminForm.php b/src/Admin/src/Form/DeleteAdminForm.php index 2046dcdc..61cf3148 100644 --- a/src/Admin/src/Form/DeleteAdminForm.php +++ b/src/Admin/src/Form/DeleteAdminForm.php @@ -5,21 +5,15 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\DeleteAdminInputFilter; +use Admin\App\Form\AbstractForm; use Laminas\Form\Element\Checkbox; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Submit; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class DeleteAdminForm extends Form +class DeleteAdminForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -64,12 +58,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/Admin/src/Form/EditAdminForm.php b/src/Admin/src/Form/EditAdminForm.php index 301eebf2..5418ca27 100644 --- a/src/Admin/src/Form/EditAdminForm.php +++ b/src/Admin/src/Form/EditAdminForm.php @@ -5,6 +5,7 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\EditAdminInputFilter; +use Admin\App\Form\AbstractForm; use Core\Admin\Enum\AdminStatusEnum; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\MultiCheckbox; @@ -12,15 +13,10 @@ use Laminas\Form\Element\Select; use Laminas\Form\Element\Submit; use Laminas\Form\Element\Text; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class EditAdminForm extends Form +class EditAdminForm extends AbstractForm { protected InputFilterInterface $inputFilter; @@ -49,11 +45,6 @@ public function setRoles(array $roles): self public function init(): void { - $this->add( - (new Text('identity')) - ->setLabel('Identity') - ->setAttribute('required', true) - ); $this->add( (new Password('password')) ->setLabel('Password') @@ -95,12 +86,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/Admin/src/Form/LoginForm.php b/src/Admin/src/Form/LoginForm.php index 1e55107f..049a0ec9 100644 --- a/src/Admin/src/Form/LoginForm.php +++ b/src/Admin/src/Form/LoginForm.php @@ -5,22 +5,16 @@ namespace Admin\Admin\Form; use Admin\Admin\InputFilter\LoginInputFilter; +use Admin\App\Form\AbstractForm; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Password; use Laminas\Form\Element\Submit; use Laminas\Form\Element\Text; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** - * @template-extends Form - */ -class LoginForm extends Form +class LoginForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); diff --git a/src/Admin/src/Handler/Account/GetAccountEditFormHandler.php b/src/Admin/src/Handler/Account/GetAccountEditFormHandler.php index 64a8bf9a..a409e048 100644 --- a/src/Admin/src/Handler/Account/GetAccountEditFormHandler.php +++ b/src/Admin/src/Handler/Account/GetAccountEditFormHandler.php @@ -7,7 +7,7 @@ use Admin\Admin\Form\AccountForm; use Admin\Admin\Form\ChangePasswordForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; diff --git a/src/Admin/src/Handler/Account/PostAccountChangePasswordHandler.php b/src/Admin/src/Handler/Account/PostAccountChangePasswordHandler.php index 6a250b57..1661c913 100644 --- a/src/Admin/src/Handler/Account/PostAccountChangePasswordHandler.php +++ b/src/Admin/src/Handler/Account/PostAccountChangePasswordHandler.php @@ -7,7 +7,7 @@ use Admin\Admin\Form\AccountForm; use Admin\Admin\Form\ChangePasswordForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; diff --git a/src/Admin/src/Handler/Account/PostAccountEditHandler.php b/src/Admin/src/Handler/Account/PostAccountEditHandler.php index eb6d0047..5dbc4e82 100644 --- a/src/Admin/src/Handler/Account/PostAccountEditHandler.php +++ b/src/Admin/src/Handler/Account/PostAccountEditHandler.php @@ -7,9 +7,9 @@ use Admin\Admin\Form\AccountForm; use Admin\Admin\Form\ChangePasswordForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; diff --git a/src/Admin/src/Handler/Admin/GetAdminDeleteFormHandler.php b/src/Admin/src/Handler/Admin/GetAdminDeleteFormHandler.php index ce59cf2e..64a6b49a 100644 --- a/src/Admin/src/Handler/Admin/GetAdminDeleteFormHandler.php +++ b/src/Admin/src/Handler/Admin/GetAdminDeleteFormHandler.php @@ -6,7 +6,7 @@ use Admin\Admin\Form\DeleteAdminForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; diff --git a/src/Admin/src/Handler/Admin/GetAdminEditFormHandler.php b/src/Admin/src/Handler/Admin/GetAdminEditFormHandler.php index 3d6dcd1b..d0222f0a 100644 --- a/src/Admin/src/Handler/Admin/GetAdminEditFormHandler.php +++ b/src/Admin/src/Handler/Admin/GetAdminEditFormHandler.php @@ -7,8 +7,8 @@ use Admin\Admin\Form\EditAdminForm; use Admin\Admin\Service\AdminRoleServiceInterface; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\AdminRole; -use Core\App\Exception\NotFoundException; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; @@ -68,7 +68,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface return new HtmlResponse( $this->template->render('admin::admin-edit-form', [ - 'form' => $this->editAdminForm->prepare(), + 'form' => $this->editAdminForm->prepare(), + 'admin' => $admin, ]) ); } diff --git a/src/Admin/src/Handler/Admin/PostAdminCreateHandler.php b/src/Admin/src/Handler/Admin/PostAdminCreateHandler.php index d01d1eed..21dae12f 100644 --- a/src/Admin/src/Handler/Admin/PostAdminCreateHandler.php +++ b/src/Admin/src/Handler/Admin/PostAdminCreateHandler.php @@ -6,8 +6,7 @@ use Admin\Admin\Form\CreateAdminForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\ConflictException; -use Core\App\Exception\IdentityException; +use Admin\App\Exception\ConflictException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; @@ -61,7 +60,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface ]), StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY ); - } catch (ConflictException | IdentityException $exception) { + } catch (ConflictException $exception) { return new HtmlResponse( $this->template->render('admin::admin-create-form', [ 'form' => $this->createAdminForm->prepare(), diff --git a/src/Admin/src/Handler/Admin/PostAdminDeleteHandler.php b/src/Admin/src/Handler/Admin/PostAdminDeleteHandler.php index f2656713..4dabd0c5 100644 --- a/src/Admin/src/Handler/Admin/PostAdminDeleteHandler.php +++ b/src/Admin/src/Handler/Admin/PostAdminDeleteHandler.php @@ -6,7 +6,7 @@ use Admin\Admin\Form\DeleteAdminForm; use Admin\Admin\Service\AdminServiceInterface; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; diff --git a/src/Admin/src/Handler/Admin/PostAdminEditHandler.php b/src/Admin/src/Handler/Admin/PostAdminEditHandler.php index 4e7192c6..fbec89f9 100644 --- a/src/Admin/src/Handler/Admin/PostAdminEditHandler.php +++ b/src/Admin/src/Handler/Admin/PostAdminEditHandler.php @@ -7,10 +7,10 @@ use Admin\Admin\Form\EditAdminForm; use Admin\Admin\Service\AdminRoleServiceInterface; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\AdminRole; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; @@ -83,7 +83,8 @@ public function handle(ServerRequestInterface $request): ResponseInterface return new HtmlResponse( $this->template->render('admin::admin-edit-form', [ - 'form' => $this->editAdminForm->prepare(), + 'form' => $this->editAdminForm->prepare(), + 'admin' => $admin, ]), StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY ); @@ -91,6 +92,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface return new HtmlResponse( $this->template->render('admin::admin-edit-form', [ 'form' => $this->editAdminForm->prepare(), + 'admin' => $admin, 'messages' => [ 'error' => $exception->getMessage(), ], diff --git a/src/Admin/src/InputFilter/EditAdminInputFilter.php b/src/Admin/src/InputFilter/EditAdminInputFilter.php index 22163013..74fa104c 100644 --- a/src/Admin/src/InputFilter/EditAdminInputFilter.php +++ b/src/Admin/src/InputFilter/EditAdminInputFilter.php @@ -8,7 +8,6 @@ use Admin\Admin\InputFilter\Input\StatusInput; use Admin\App\InputFilter\Input\CsrfInput; use Admin\App\InputFilter\Input\FirstNameInput; -use Admin\App\InputFilter\Input\IdentityInput; use Admin\App\InputFilter\Input\LastNameInput; use Admin\App\InputFilter\Input\PasswordConfirmInput; use Admin\App\InputFilter\Input\PasswordInput; @@ -19,7 +18,6 @@ class EditAdminInputFilter extends AbstractInputFilter public function init(): void { $this - ->add(new IdentityInput('identity')) ->add(new PasswordInput('password', false)) ->add(new PasswordConfirmInput('passwordConfirm', false)) ->add(new FirstNameInput('firstName', false)) diff --git a/src/Admin/src/Service/AdminRoleService.php b/src/Admin/src/Service/AdminRoleService.php index a4ec090e..cd407efc 100644 --- a/src/Admin/src/Service/AdminRoleService.php +++ b/src/Admin/src/Service/AdminRoleService.php @@ -4,9 +4,9 @@ namespace Admin\Admin\Service; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\AdminRole; use Core\Admin\Repository\AdminRoleRepository; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; diff --git a/src/Admin/src/Service/AdminRoleServiceInterface.php b/src/Admin/src/Service/AdminRoleServiceInterface.php index 2bfe8334..f85fecb4 100644 --- a/src/Admin/src/Service/AdminRoleServiceInterface.php +++ b/src/Admin/src/Service/AdminRoleServiceInterface.php @@ -4,9 +4,9 @@ namespace Admin\Admin\Service; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\AdminRole; use Core\Admin\Repository\AdminRoleRepository; -use Core\App\Exception\NotFoundException; interface AdminRoleServiceInterface { diff --git a/src/Admin/src/Service/AdminService.php b/src/Admin/src/Service/AdminService.php index 6f7b05e1..050b5101 100644 --- a/src/Admin/src/Service/AdminService.php +++ b/src/Admin/src/Service/AdminService.php @@ -4,14 +4,14 @@ namespace Admin\Admin\Service; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\Admin; use Core\Admin\Entity\AdminRole; use Core\Admin\Enum\AdminStatusEnum; use Core\Admin\Repository\AdminRepository; use Core\Admin\Repository\AdminRoleRepository; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; use Core\App\Helper\Paginator; use Core\App\Message; use Doctrine\ORM\Tools\Pagination\Paginator as DoctrinePaginator; diff --git a/src/Admin/src/Service/AdminServiceInterface.php b/src/Admin/src/Service/AdminServiceInterface.php index ef3749de..8e9344db 100644 --- a/src/Admin/src/Service/AdminServiceInterface.php +++ b/src/Admin/src/Service/AdminServiceInterface.php @@ -4,11 +4,11 @@ namespace Admin\Admin\Service; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\Admin\Entity\Admin; use Core\Admin\Repository\AdminRepository; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; interface AdminServiceInterface { diff --git a/src/Admin/templates/admin/admin-edit-form.html.twig b/src/Admin/templates/admin/admin-edit-form.html.twig index a6dbc347..256a13ea 100644 --- a/src/Admin/templates/admin/admin-edit-form.html.twig +++ b/src/Admin/templates/admin/admin-edit-form.html.twig @@ -2,12 +2,11 @@
-
Edit admin
+
Edit admin: {{ admin.identity }}
{{ form().openTag(form)|raw }} - {{ inputElement(form.get('identity')) }} {{ inputElement(form.get('password')) }} {{ inputElement(form.get('passwordConfirm')) }} {{ inputElement(form.get('firstName')) }} diff --git a/src/Core/src/App/src/Exception/BadRequestException.php b/src/App/src/Exception/BadRequestException.php similarity index 91% rename from src/Core/src/App/src/Exception/BadRequestException.php rename to src/App/src/Exception/BadRequestException.php index a001ae9c..8617e137 100644 --- a/src/Core/src/App/src/Exception/BadRequestException.php +++ b/src/App/src/Exception/BadRequestException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Core\App\Exception; +namespace Admin\App\Exception; use Exception; diff --git a/src/Core/src/App/src/Exception/ConflictException.php b/src/App/src/Exception/ConflictException.php similarity index 75% rename from src/Core/src/App/src/Exception/ConflictException.php rename to src/App/src/Exception/ConflictException.php index 09044a2d..00c960d8 100644 --- a/src/Core/src/App/src/Exception/ConflictException.php +++ b/src/App/src/Exception/ConflictException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Core\App\Exception; +namespace Admin\App\Exception; use Exception; diff --git a/src/Core/src/App/src/Exception/NotFoundException.php b/src/App/src/Exception/NotFoundException.php similarity index 75% rename from src/Core/src/App/src/Exception/NotFoundException.php rename to src/App/src/Exception/NotFoundException.php index e166d9d7..f7e4df7d 100644 --- a/src/Core/src/App/src/Exception/NotFoundException.php +++ b/src/App/src/Exception/NotFoundException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Core\App\Exception; +namespace Admin\App\Exception; use Exception; diff --git a/src/Core/src/App/src/Exception/RuntimeException.php b/src/App/src/Exception/RuntimeException.php similarity index 73% rename from src/Core/src/App/src/Exception/RuntimeException.php rename to src/App/src/Exception/RuntimeException.php index d2436a82..9310ae09 100644 --- a/src/Core/src/App/src/Exception/RuntimeException.php +++ b/src/App/src/Exception/RuntimeException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Core\App\Exception; +namespace Admin\App\Exception; class RuntimeException extends \RuntimeException { diff --git a/src/App/src/Form/AbstractForm.php b/src/App/src/Form/AbstractForm.php new file mode 100644 index 00000000..5eb4108b --- /dev/null +++ b/src/App/src/Form/AbstractForm.php @@ -0,0 +1,17 @@ + + */ +abstract class AbstractForm extends Form +{ + protected InputFilterInterface $inputFilter; +} diff --git a/src/Core/src/App/src/Exception/DeprecationConflictException.php b/src/Core/src/App/src/Exception/DeprecationConflictException.php deleted file mode 100644 index f54c1967..00000000 --- a/src/Core/src/App/src/Exception/DeprecationConflictException.php +++ /dev/null @@ -1,11 +0,0 @@ - */ -class CreateUserForm extends Form +class CreateUserForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -100,12 +96,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/User/src/Form/DeleteUserForm.php b/src/User/src/Form/DeleteUserForm.php index 9132d528..40c4059d 100644 --- a/src/User/src/Form/DeleteUserForm.php +++ b/src/User/src/Form/DeleteUserForm.php @@ -4,20 +4,16 @@ namespace Admin\User\Form; +use Admin\App\Form\AbstractForm; use Admin\User\InputFilter\DeleteUserInputFilter; use Laminas\Form\Element\Checkbox; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Submit; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** @template-extends Form */ -class DeleteUserForm extends Form +class DeleteUserForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -62,12 +58,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/User/src/Form/EditUserAvatarForm.php b/src/User/src/Form/EditUserAvatarForm.php index cb5bfc27..ddc3f08e 100644 --- a/src/User/src/Form/EditUserAvatarForm.php +++ b/src/User/src/Form/EditUserAvatarForm.php @@ -4,23 +4,19 @@ namespace Admin\User\Form; +use Admin\App\Form\AbstractForm; use Admin\App\InputFilter\Input\ImageInput; use Admin\User\InputFilter\EditUserAvatarInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\File; use Laminas\Form\Element\Submit; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; use function implode; -/** @template-extends Form */ -class EditUserAvatarForm extends Form +class EditUserAvatarForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -63,12 +59,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/User/src/Form/EditUserForm.php b/src/User/src/Form/EditUserForm.php index 8fc055e4..52816af5 100644 --- a/src/User/src/Form/EditUserForm.php +++ b/src/User/src/Form/EditUserForm.php @@ -4,6 +4,7 @@ namespace Admin\User\Form; +use Admin\App\Form\AbstractForm; use Admin\User\InputFilter\EditUserInputFilter; use Core\User\Enum\UserStatusEnum; use Laminas\Form\Element\Csrf; @@ -14,16 +15,11 @@ use Laminas\Form\Element\Submit; use Laminas\Form\Element\Text; use Laminas\Form\Fieldset; -use Laminas\Form\Form; -use Laminas\Form\FormInterface; use Laminas\InputFilter\InputFilterInterface; use Laminas\Session\Container; -/** @template-extends Form */ -class EditUserForm extends Form +class EditUserForm extends AbstractForm { - protected InputFilterInterface $inputFilter; - public function __construct(?string $name = null, array $options = []) { parent::__construct($name, $options); @@ -51,12 +47,6 @@ public function init(): void { $this ->add( - (new Text('identity')) - ->setLabel('Identity') - ->setAttribute('readonly', true) - ->setAttribute('required', true) - ->setAttribute('class', 'form-control form-control-sm bgc-grey-200') - )->add( (new Password('password')) ->setLabel('Password') )->add( @@ -99,12 +89,4 @@ public function getInputFilter(): InputFilterInterface { return $this->inputFilter; } - - public function setInputFilter(InputFilterInterface $inputFilter): FormInterface - { - $this->inputFilter = $inputFilter; - $this->inputFilter->init(); - - return $this; - } } diff --git a/src/User/src/Handler/GetUserDeleteFormHandler.php b/src/User/src/Handler/GetUserDeleteFormHandler.php index c197d949..6f147efa 100644 --- a/src/User/src/Handler/GetUserDeleteFormHandler.php +++ b/src/User/src/Handler/GetUserDeleteFormHandler.php @@ -4,9 +4,9 @@ namespace Admin\User\Handler; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\DeleteUserForm; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\NotFoundException; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; diff --git a/src/User/src/Handler/GetUserEditFormHandler.php b/src/User/src/Handler/GetUserEditFormHandler.php index ed20070d..167b71ed 100644 --- a/src/User/src/Handler/GetUserEditFormHandler.php +++ b/src/User/src/Handler/GetUserEditFormHandler.php @@ -4,11 +4,11 @@ namespace Admin\User\Handler; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\EditUserAvatarForm; use Admin\User\Form\EditUserForm; use Admin\User\Service\UserRoleServiceInterface; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\NotFoundException; use Core\User\Entity\UserRole; use Core\User\Enum\UserRoleEnum; use Dot\DependencyInjection\Attribute\Inject; diff --git a/src/User/src/Handler/PostUserAvatarEditHandler.php b/src/User/src/Handler/PostUserAvatarEditHandler.php index 84d915d6..a45df59d 100644 --- a/src/User/src/Handler/PostUserAvatarEditHandler.php +++ b/src/User/src/Handler/PostUserAvatarEditHandler.php @@ -4,11 +4,11 @@ namespace Admin\User\Handler; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\EditUserAvatarForm; use Admin\User\Form\EditUserForm; use Admin\User\Service\UserAvatarServiceInterface; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; @@ -88,6 +88,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface 'userAvatarEditForm' => $this->editUserAvatarForm->prepare(), 'userEditForm' => $this->editUserForm->prepare(), 'activeTab' => 'avatar', + 'user' => $user, ]), StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY ); diff --git a/src/User/src/Handler/PostUserCreateHandler.php b/src/User/src/Handler/PostUserCreateHandler.php index bcf75cfe..b96b02f2 100644 --- a/src/User/src/Handler/PostUserCreateHandler.php +++ b/src/User/src/Handler/PostUserCreateHandler.php @@ -4,11 +4,11 @@ namespace Admin\User\Handler; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\CreateUserForm; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Core\App\Service\MailService; use Dot\DependencyInjection\Attribute\Inject; diff --git a/src/User/src/Handler/PostUserDeleteHandler.php b/src/User/src/Handler/PostUserDeleteHandler.php index f9632ed1..97fb1011 100644 --- a/src/User/src/Handler/PostUserDeleteHandler.php +++ b/src/User/src/Handler/PostUserDeleteHandler.php @@ -4,10 +4,10 @@ namespace Admin\User\Handler; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\DeleteUserForm; use Admin\User\Service\UserAvatarServiceInterface; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; diff --git a/src/User/src/Handler/PostUserEditHandler.php b/src/User/src/Handler/PostUserEditHandler.php index 3190430b..1bd9325c 100644 --- a/src/User/src/Handler/PostUserEditHandler.php +++ b/src/User/src/Handler/PostUserEditHandler.php @@ -4,13 +4,13 @@ namespace Admin\User\Handler; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Admin\User\Form\EditUserAvatarForm; use Admin\User\Form\EditUserForm; use Admin\User\Service\UserRoleServiceInterface; use Admin\User\Service\UserServiceInterface; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Core\User\Entity\UserRole; use Core\User\Enum\UserRoleEnum; diff --git a/src/User/src/InputFilter/EditUserInputFilter.php b/src/User/src/InputFilter/EditUserInputFilter.php index c5d1d4ab..59685481 100644 --- a/src/User/src/InputFilter/EditUserInputFilter.php +++ b/src/User/src/InputFilter/EditUserInputFilter.php @@ -5,7 +5,6 @@ namespace Admin\User\InputFilter; use Admin\App\InputFilter\Input\CsrfInput; -use Admin\App\InputFilter\Input\IdentityInput; use Admin\App\InputFilter\Input\PasswordConfirmInput; use Admin\App\InputFilter\Input\PasswordInput; use Admin\User\InputFilter\Input\RolesInput; @@ -17,7 +16,6 @@ class EditUserInputFilter extends AbstractInputFilter public function init(): self { return $this - ->add(new IdentityInput('identity')) ->add(new PasswordInput('password', false)) ->add(new PasswordConfirmInput('passwordConfirm', false)) ->add(new StatusInput('status')) diff --git a/src/User/src/Service/UserResetPasswordService.php b/src/User/src/Service/UserResetPasswordService.php index f2573024..9ca2b85d 100644 --- a/src/User/src/Service/UserResetPasswordService.php +++ b/src/User/src/Service/UserResetPasswordService.php @@ -4,7 +4,7 @@ namespace Admin\User\Service; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\App\Message; use Core\User\Entity\UserResetPassword; use Core\User\Repository\UserResetPasswordRepository; diff --git a/src/User/src/Service/UserResetPasswordServiceInterface.php b/src/User/src/Service/UserResetPasswordServiceInterface.php index 567c4ef2..318d2b87 100644 --- a/src/User/src/Service/UserResetPasswordServiceInterface.php +++ b/src/User/src/Service/UserResetPasswordServiceInterface.php @@ -4,7 +4,7 @@ namespace Admin\User\Service; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\User\Entity\UserResetPassword; use Core\User\Repository\UserResetPasswordRepository; diff --git a/src/User/src/Service/UserRoleService.php b/src/User/src/Service/UserRoleService.php index d19e4a8b..e51b913a 100644 --- a/src/User/src/Service/UserRoleService.php +++ b/src/User/src/Service/UserRoleService.php @@ -4,7 +4,7 @@ namespace Admin\User\Service; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\App\Message; use Core\User\Entity\UserRole; use Core\User\Repository\UserRoleRepository; diff --git a/src/User/src/Service/UserRoleServiceInterface.php b/src/User/src/Service/UserRoleServiceInterface.php index 44f3a89f..7ca40f09 100644 --- a/src/User/src/Service/UserRoleServiceInterface.php +++ b/src/User/src/Service/UserRoleServiceInterface.php @@ -4,7 +4,7 @@ namespace Admin\User\Service; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\NotFoundException; use Core\User\Entity\UserRole; use Core\User\Repository\UserRoleRepository; diff --git a/src/User/src/Service/UserService.php b/src/User/src/Service/UserService.php index 07c6c216..af7a0038 100644 --- a/src/User/src/Service/UserService.php +++ b/src/User/src/Service/UserService.php @@ -4,9 +4,9 @@ namespace Admin\User\Service; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\App\Helper\Paginator; use Core\App\Message; use Core\Security\Repository\OAuthAccessTokenRepository; diff --git a/src/User/src/Service/UserServiceInterface.php b/src/User/src/Service/UserServiceInterface.php index 1debd34d..b49cd4a3 100644 --- a/src/User/src/Service/UserServiceInterface.php +++ b/src/User/src/Service/UserServiceInterface.php @@ -4,9 +4,9 @@ namespace Admin\User\Service; -use Core\App\Exception\BadRequestException; -use Core\App\Exception\ConflictException; -use Core\App\Exception\NotFoundException; +use Admin\App\Exception\BadRequestException; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use Core\User\Entity\User; use Core\User\Repository\UserRepository; diff --git a/src/User/templates/user/user-edit-form.html.twig b/src/User/templates/user/user-edit-form.html.twig index 651186f1..62f2520f 100644 --- a/src/User/templates/user/user-edit-form.html.twig +++ b/src/User/templates/user/user-edit-form.html.twig @@ -2,7 +2,7 @@
-
Edit user
+
Edit user: {{ user.identity }}
@@ -20,7 +20,6 @@ {{ form().openTag(userEditForm)|raw }} {% set fieldsets = userEditForm.getFieldsets() %} - {{ inputElement(userEditForm.get('identity')) }} {{ inputElement(userEditForm.get('password')) }} {{ inputElement(userEditForm.get('passwordConfirm')) }} diff --git a/test/Unit/Admin/Form/AdminFormTest.php b/test/Unit/Admin/Form/AdminFormTest.php index 690369c1..8e498624 100644 --- a/test/Unit/Admin/Form/AdminFormTest.php +++ b/test/Unit/Admin/Form/AdminFormTest.php @@ -5,8 +5,6 @@ namespace AdminTest\Unit\Admin\Form; use Admin\Admin\Form\CreateAdminForm; -use Admin\Admin\InputFilter\CreateAdminInputFilter; -use Admin\Admin\InputFilter\EditAdminInputFilter; use AdminTest\Unit\UnitTest; class AdminFormTest extends UnitTest @@ -45,18 +43,4 @@ public function testFormHasInputFilter(): void 'adminCreateCsrf', ]); } - - public function testFormWillSetDifferentInputFilter(): void - { - $form = new CreateAdminForm(); - - $oldInputFilter = $form->getInputFilter(); - $this->assertInstanceOf(CreateAdminInputFilter::class, $oldInputFilter); - - $customInputFilter = new EditAdminInputFilter(); - $form->setInputFilter($customInputFilter); - - $newInputFilter = $form->getInputFilter(); - $this->assertInstanceOf(EditAdminInputFilter::class, $newInputFilter); - } } diff --git a/test/Unit/Admin/Form/FormTrait.php b/test/Unit/Admin/Form/FormTrait.php index f7ddeada..fb530627 100644 --- a/test/Unit/Admin/Form/FormTrait.php +++ b/test/Unit/Admin/Form/FormTrait.php @@ -6,6 +6,7 @@ use Laminas\Form\ElementInterface; use Laminas\Form\FormInterface; +use Laminas\InputFilter\BaseInputFilter; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilterInterface; @@ -33,6 +34,7 @@ protected function formHasElements(FormInterface $form, array $elements = []): v public function formHasInputFilter(InputFilterInterface $inputFilter, array $inputs = []): void { + $this->assertInstanceOf(BaseInputFilter::class, $inputFilter); $this->assertCount(count($inputs), $inputFilter->getInputs()); foreach ($inputs as $input) { diff --git a/test/Unit/Admin/Handler/Account/PostAccountEditHandlerTest.php b/test/Unit/Admin/Handler/Account/PostAccountEditHandlerTest.php index 4a1073ff..cfcc9506 100644 --- a/test/Unit/Admin/Handler/Account/PostAccountEditHandlerTest.php +++ b/test/Unit/Admin/Handler/Account/PostAccountEditHandlerTest.php @@ -8,12 +8,10 @@ use Admin\Admin\Form\ChangePasswordForm; use Admin\Admin\Handler\Account\PostAccountEditHandler; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\ConflictException; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; use Core\Admin\Entity\AdminIdentity; -use Core\Admin\Repository\AdminRepository; -use Core\App\Exception\ConflictException; -use Core\App\Exception\IdentityException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Log\Logger; @@ -37,7 +35,6 @@ class PostAccountEditHandlerTest extends UnitTest private MockObject|FlashMessengerInterface $messenger; private Logger $logger; private MockObject|AdminIdentity $identity; - private MockObject|AdminRepository $adminRepository; private MockObject|ServerRequestInterface $request; private MockObject|Admin $admin; @@ -57,7 +54,6 @@ public function setUp(): void $this->changePasswordForm = $this->createMock(ChangePasswordForm::class); $this->messenger = $this->createMock(FlashMessengerInterface::class); $this->identity = $this->createMock(AdminIdentity::class); - $this->adminRepository = $this->createMock(AdminRepository::class); $this->request = $this->createMock(ServerRequestInterface::class); $this->admin = $this->createMock(Admin::class); $this->logger = new Logger([ @@ -74,7 +70,6 @@ public function testInvalidAccountFormDataProvidedWillReturnHtmlResponse(): void { $this->request->method('getParsedBody')->willReturn(['test']); $this->authenticationService->method('getIdentity')->willReturn($this->identity); - $this->adminService->method('getAdminRepository')->willReturn($this->adminRepository); $this->accountForm->method('isValid')->willReturn(false); $handler = new PostAccountEditHandler( @@ -94,24 +89,23 @@ public function testInvalidAccountFormDataProvidedWillReturnHtmlResponse(): void $this->assertSame(StatusCodeInterface::STATUS_OK, $response->getStatusCode()); } - public function testThrowIdentityExceptionWillReturnRedirectResponse(): void + public function testThrowConflictExceptionWillReturnRedirectResponse(): void { $this->request->method('getParsedBody')->willReturn(['test']); $this->authenticationService->method('getIdentity')->willReturn($this->identity); - $this->adminService->method('getAdminRepository')->willReturn($this->adminRepository); $this->accountForm->method('isValid')->willReturn(true); $this->accountForm->method('prepare')->willReturn('
'); $this->changePasswordForm->method('prepare')->willReturn('
'); $this->accountForm->method('getData')->willReturn(['test' => 'test']); - $this->adminService->method('saveAdmin')->willThrowException(new ConflictException()); + $this->adminService->method('saveAdmin')->willThrowException( + new ConflictException(Message::DUPLICATE_IDENTITY) + ); $this ->messenger ->expects($this->once()) ->method('addError') - ->with(Message::AN_ERROR_OCCURRED); - - $this->adminService->method('saveAdmin')->willThrowException(new IdentityException()); + ->with(Message::DUPLICATE_IDENTITY); $handler = new PostAccountEditHandler( $this->adminService, @@ -133,7 +127,6 @@ public function testThrowExceptionWillReturnRedirectResponse(): void { $this->request->method('getParsedBody')->willReturn(['test']); $this->authenticationService->method('getIdentity')->willReturn($this->identity); - $this->adminService->method('getAdminRepository')->willReturn($this->adminRepository); $this->accountForm->method('isValid')->willReturn(true); $this->accountForm->method('prepare')->willReturn('
'); $this->changePasswordForm->method('prepare')->willReturn('
'); @@ -166,8 +159,6 @@ public function testValidFormDataWillReturnRedirectResponse(): void { $this->request->method('getParsedBody')->willReturn(['test']); $this->authenticationService->method('getIdentity')->willReturn($this->identity); - $this->adminRepository->method('findOneBy')->willReturn($this->admin); - $this->adminService->method('getAdminRepository')->willReturn($this->adminRepository); $this->accountForm->method('isValid')->willReturn(true); $this->accountForm->method('prepare')->willReturn('
'); $this->changePasswordForm->method('prepare')->willReturn('
'); diff --git a/test/Unit/Admin/Handler/Admin/GetAdminDeleteFormHandlerTest.php b/test/Unit/Admin/Handler/Admin/GetAdminDeleteFormHandlerTest.php index 114b781c..d3dc8296 100644 --- a/test/Unit/Admin/Handler/Admin/GetAdminDeleteFormHandlerTest.php +++ b/test/Unit/Admin/Handler/Admin/GetAdminDeleteFormHandlerTest.php @@ -7,9 +7,9 @@ use Admin\Admin\Form\DeleteAdminForm; use Admin\Admin\Handler\Admin\GetAdminDeleteFormHandler; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\NotFoundException; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; diff --git a/test/Unit/Admin/Handler/Admin/GetAdminEditFormHandlerTest.php b/test/Unit/Admin/Handler/Admin/GetAdminEditFormHandlerTest.php index d5bfb646..abf3fbce 100644 --- a/test/Unit/Admin/Handler/Admin/GetAdminEditFormHandlerTest.php +++ b/test/Unit/Admin/Handler/Admin/GetAdminEditFormHandlerTest.php @@ -8,10 +8,10 @@ use Admin\Admin\Handler\Admin\GetAdminEditFormHandler; use Admin\Admin\Service\AdminRoleServiceInterface; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\NotFoundException; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; use Core\Admin\Enum\AdminStatusEnum; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\StatusCodeInterface; diff --git a/test/Unit/Admin/Handler/Admin/PostAdminCreateHandlerTest.php b/test/Unit/Admin/Handler/Admin/PostAdminCreateHandlerTest.php index 397d0361..a17ef1e9 100644 --- a/test/Unit/Admin/Handler/Admin/PostAdminCreateHandlerTest.php +++ b/test/Unit/Admin/Handler/Admin/PostAdminCreateHandlerTest.php @@ -7,8 +7,8 @@ use Admin\Admin\Form\CreateAdminForm; use Admin\Admin\Handler\Admin\PostAdminCreateHandler; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\ConflictException; use AdminTest\Unit\UnitTest; -use Core\App\Exception\IdentityException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Log\Logger; @@ -104,7 +104,7 @@ public function testCreateAdminIdentityExceptionWillReturnHtmlResponse(): void $this->request->method('getParsedBody')->willReturn(['test']); $this->adminForm->method('getData')->willReturn([]); - $this->throwException(new IdentityException()); + $this->throwException(new ConflictException()); $handler = new PostAdminCreateHandler( $this->adminService, diff --git a/test/Unit/Admin/Handler/Admin/PostAdminDeleteHandlerTest.php b/test/Unit/Admin/Handler/Admin/PostAdminDeleteHandlerTest.php index 10fd221f..1d304f9c 100644 --- a/test/Unit/Admin/Handler/Admin/PostAdminDeleteHandlerTest.php +++ b/test/Unit/Admin/Handler/Admin/PostAdminDeleteHandlerTest.php @@ -7,9 +7,9 @@ use Admin\Admin\Form\DeleteAdminForm; use Admin\Admin\Handler\Admin\PostAdminDeleteHandler; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\NotFoundException; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Log\Logger; diff --git a/test/Unit/Admin/Handler/Admin/PostAdminEditHandlerTest.php b/test/Unit/Admin/Handler/Admin/PostAdminEditHandlerTest.php index 30d3c57c..c74fdb4c 100644 --- a/test/Unit/Admin/Handler/Admin/PostAdminEditHandlerTest.php +++ b/test/Unit/Admin/Handler/Admin/PostAdminEditHandlerTest.php @@ -8,10 +8,10 @@ use Admin\Admin\Handler\Admin\PostAdminEditHandler; use Admin\Admin\Service\AdminRoleServiceInterface; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\ConflictException; +use Admin\App\Exception\NotFoundException; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; -use Core\App\Exception\IdentityException; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Log\Logger; @@ -157,7 +157,7 @@ public function testEditAdminInvalidFormDataProvidedWillReturnHtmlResponse(): vo $this->assertSame(StatusCodeInterface::STATUS_UNPROCESSABLE_ENTITY, $response->getStatusCode()); } - public function testEditAdminThrowIdentityExceptionWillReturnHtmlResponse(): void + public function testEditAdminThrowConflictExceptionWillReturnHtmlResponse(): void { $this->uuid->method('toString')->willReturn('0x123'); $this->admin->method('getUuid')->willReturn($this->uuid); @@ -178,7 +178,7 @@ public function testEditAdminThrowIdentityExceptionWillReturnHtmlResponse(): voi $this->logger ); - $this->throwException(new IdentityException()); + $this->throwException(new ConflictException()); $response = $handler->handle($this->request); diff --git a/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php b/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php index cf67e1f6..f4608368 100644 --- a/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php @@ -6,7 +6,6 @@ use Admin\Admin\InputFilter\EditAdminInputFilter; use Admin\App\InputFilter\Input\FirstNameInput; -use Admin\App\InputFilter\Input\IdentityInput; use Admin\App\InputFilter\Input\LastNameInput; use Admin\App\InputFilter\Input\PasswordInput; use AdminTest\Unit\UnitTest; @@ -20,95 +19,6 @@ class EditAdminInputFilterTest extends UnitTest { - public function testWillValidateIdentity(): void - { - $hash = (new Csrf(['session' => new Container()]))->getHash(); - - $inputFilter = new EditAdminInputFilter(); - $inputFilter->init(); - - $inputFilter->setData([ - 'identity' => 'testIdentity', - 'password' => 'password', - 'passwordConfirm' => 'password', - 'firstName' => 'firstName', - 'lastName' => 'lastName', - 'status' => AdminStatusEnum::Active->value, - 'roles' => [ - AdminRoleEnum::Admin->value, - ], - 'adminEditCsrf' => $hash, - ]); - $this->assertTrue($inputFilter->isValid()); - - $inputFilter->setData([ - 'identity' => null, - 'password' => 'password', - 'passwordConfirm' => 'password', - 'firstName' => 'firstName', - 'lastName' => 'lastName', - 'status' => AdminStatusEnum::Active->value, - 'roles' => [ - AdminRoleEnum::Admin->value, - ], - ]); - $this->assertFalse($inputFilter->isValid()); - - $inputFilter->setData([ - 'identity' => '', - 'password' => 'password', - 'passwordConfirm' => 'password', - 'firstName' => 'firstName', - 'lastName' => 'lastName', - 'status' => AdminStatusEnum::Active->value, - 'roles' => [ - AdminRoleEnum::Admin->value, - ], - ]); - $this->assertFalse($inputFilter->isValid()); - - $inputFilter->setData([ - 'identity' => ' ', - 'password' => 'password', - 'passwordConfirm' => 'password', - 'firstName' => 'firstName', - 'lastName' => 'lastName', - 'status' => AdminStatusEnum::Active->value, - 'roles' => [ - AdminRoleEnum::Admin->value, - ], - ]); - $this->assertFalse($inputFilter->isValid()); - - $inputFilter->setData([ - 'identity' => 'id', - ]); - $this->assertFalse($inputFilter->isValid()); - $messages = $inputFilter->getMessages(); - $this->assertIsArray($messages); - $this->assertArrayHasKey('identity', $messages); - $this->assertIsArray($messages['identity']); - $this->assertArrayHasKey('stringLengthTooShort', $messages['identity']); - $this->assertSame( - Message::validatorLengthMinMax(IdentityInput::IDENTITY_MIN_LENGTH, IdentityInput::IDENTITY_MAX_LENGTH), - $messages['identity']['stringLengthTooShort'] - ); - - $inputFilter->setData([ - 'identity' => str_repeat('a', 101), - ]); - $this->assertFalse($inputFilter->isValid()); - $messages = $inputFilter->getMessages(); - $this->assertIsArray($messages); - $this->assertArrayHasKey('identity', $messages); - $this->assertIsArray($messages['identity']); - $this->assertArrayHasKey('stringLengthTooLong', $messages['identity']); - $this->assertSame( - Message::validatorLengthMinMax(IdentityInput::IDENTITY_MIN_LENGTH, IdentityInput::IDENTITY_MAX_LENGTH), - $messages['identity']['stringLengthTooLong'] - ); - } - public function testWillValidatePassword(): void { $hash = (new Csrf(['session' => new Container()]))->getHash(); diff --git a/test/Unit/Setting/Handler/GetSettingHandlerTest.php b/test/Unit/Setting/Handler/GetSettingHandlerTest.php index 2f007872..71065fe2 100644 --- a/test/Unit/Setting/Handler/GetSettingHandlerTest.php +++ b/test/Unit/Setting/Handler/GetSettingHandlerTest.php @@ -6,6 +6,7 @@ use Admin\Admin\Service\AdminService; use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Exception\NotFoundException; use Admin\Setting\Handler\GetSettingViewHandler; use Admin\Setting\Service\SettingService; use Admin\Setting\Service\SettingServiceInterface; @@ -13,7 +14,6 @@ use Core\Admin\Entity\Admin; use Core\Admin\Entity\AdminIdentity; use Core\Admin\Repository\AdminRepository; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Core\Setting\Entity\Setting; use Core\Setting\Enum\SettingIdentifierEnum; diff --git a/test/Unit/Setting/Handler/StoreSettingHandlerTest.php b/test/Unit/Setting/Handler/StoreSettingHandlerTest.php index 925257d0..7932e7cf 100644 --- a/test/Unit/Setting/Handler/StoreSettingHandlerTest.php +++ b/test/Unit/Setting/Handler/StoreSettingHandlerTest.php @@ -5,12 +5,12 @@ namespace AdminTest\Unit\Setting\Handler; use Admin\Admin\Service\AdminService; +use Admin\App\Exception\NotFoundException; use Admin\Setting\Handler\PostSettingStoreHandler; use Admin\Setting\Service\SettingService; use AdminTest\Unit\UnitTest; use Core\Admin\Entity\Admin; use Core\Admin\Entity\AdminIdentity; -use Core\App\Exception\NotFoundException; use Core\App\Message; use Core\Setting\Entity\Setting; use Core\Setting\Enum\SettingIdentifierEnum;