Moved exceptions back from Core to App

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<Laminas\\Form\\FormInterface>, 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<Laminas\\Form\\FormInterface>::init\(\)#'
-            path: src

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<FormInterface>
- */
-class AccountForm extends Form
+class AccountForm extends AbstractForm
 {
-    protected InputFilterInterface $inputFilter;
-
     public function __construct(?string $name = null, array $options = [])
     {
         parent::__construct($name, $options);

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<FormInterface>
- */
-class ChangePasswordForm extends Form
+class ChangePasswordForm extends AbstractForm
 {
-    protected InputFilterInterface $inputFilter;
-
     public function __construct(?string $name = null, array $options = [])
     {
         parent::__construct($name, $options);

src/Admin/src/Form/CreateAdminForm.php

@@ -5,25 +5,19 @@
 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;
 use Laminas\Form\Element\Password;
 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<FormInterface>
- */
-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;
-    }
 }

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<FormInterface>
- */
-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;
-    }
 }

src/Admin/src/Form/EditAdminForm.php

@@ -5,22 +5,18 @@
 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;
 use Laminas\Form\Element\Password;
 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<FormInterface>
- */
-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;
-    }
 }

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<FormInterface>
- */
-class LoginForm extends Form
+class LoginForm extends AbstractForm
 {
-    protected InputFilterInterface $inputFilter;
-
     public function __construct(?string $name = null, array $options = [])
     {
         parent::__construct($name, $options);

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;

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;

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;

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;

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,
             ])
         );
     }

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(),

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;

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,14 +83,16 @@ 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
             );
         } catch (BadRequestException | ConflictException | NotFoundException $exception) {
             return new HtmlResponse(
                 $this->template->render('admin::admin-edit-form', [
                     'form'     => $this->editAdminForm->prepare(),
+                    'admin'    => $admin,
                     'messages' => [
                         'error' => $exception->getMessage(),
                     ],

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))

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;
 

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
 {

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;