Minor tweaks

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

src/Admin/src/InputFilter/Input/StatusInput.php

@@ -5,6 +5,7 @@
 namespace Admin\Admin\InputFilter\Input;
 
 use Core\Admin\Enum\AdminStatusEnum;
+use Core\App\Message;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
 use Laminas\InputFilter\Input;
@@ -25,6 +26,7 @@ public function __construct(?string $name = null, bool $isRequired = true)
         $this->getValidatorChain()
             ->attachByName(InArray::class, [
                 'haystack' => AdminStatusEnum::values(),
+                'message'  => Message::invalidValue('status'),
             ], true);
     }
 }

src/Core/src/App/src/Fixture/UserLoader.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Core\App\Fixture;
+
+use Core\User\Entity\User;
+use Core\User\Entity\UserDetail;
+use Core\User\Entity\UserRole;
+use Core\User\Enum\UserRoleEnum;
+use Core\User\Enum\UserStatusEnum;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Common\DataFixtures\FixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+use function assert;
+
+class UserLoader implements FixtureInterface, DependentFixtureInterface
+{
+    public function load(ObjectManager $manager): void
+    {
+        $userRoleRepository = $manager->getRepository(UserRole::class);
+
+        $guestRole = $userRoleRepository->findOneBy([
+            'name' => UserRoleEnum::Guest,
+        ]);
+        assert($guestRole instanceof UserRole);
+
+        $userRole = $userRoleRepository->findOneBy([
+            'name' => UserRoleEnum::User,
+        ]);
+        assert($userRole instanceof UserRole);
+
+        $user = (new User())
+            ->setIdentity('[email protected]')
+            ->usePassword('dotkernel')
+            ->setStatus(UserStatusEnum::Active)
+            ->setHash(User::generateHash())
+            ->addRole($guestRole)
+            ->addRole($userRole);
+        $manager->persist($user);
+
+        $userDetail = (new UserDetail())
+            ->setUser($user)
+            ->setFirstName('Test')
+            ->setLastName('Account')
+            ->setEmail('[email protected]');
+        $manager->persist($userDetail);
+
+        $manager->flush();
+    }
+
+    public function getDependencies(): array
+    {
+        return [
+            UserRoleLoader::class,
+        ];
+    }
+}

src/Core/src/App/src/Fixture/UserRoleLoader.php

@@ -16,6 +16,9 @@ public function load(ObjectManager $manager): void
         $manager->persist(
             (new UserRole())->setName(UserRoleEnum::User)
         );
+        $manager->persist(
+            (new UserRole())->setName(UserRoleEnum::Guest)
+        );
 
         $manager->flush();
     }

src/Core/src/App/src/Message.php

@@ -87,6 +87,11 @@ public static function mailNotSentTo(string $email): string
         return sprintf(self::MAIL_NOT_SENT_TO, $email);
     }
 
+    public static function mailSentUserActivation(string $email): string
+    {
+        return sprintf(self::MAIL_SENT_USER_ACTIVATION, $email);
+    }
+
     public static function restrictionDeprecation(string $first, string $second): string
     {
         return sprintf(self::RESTRICTION_DEPRECATION, $first, $second);

src/User/src/InputFilter/Input/StatusInput.php

@@ -4,6 +4,7 @@
 
 namespace Admin\User\InputFilter\Input;
 
+use Core\App\Message;
 use Core\User\Enum\UserStatusEnum;
 use Laminas\Filter\StringTrim;
 use Laminas\Filter\StripTags;
@@ -25,6 +26,7 @@ public function __construct(?string $name = null, bool $isRequired = true)
         $this->getValidatorChain()
             ->attachByName(InArray::class, [
                 'haystack' => UserStatusEnum::values(),
+                'message'  => Message::invalidValue('status'),
             ], true);
     }
 }

test/Unit/Admin/InputFilter/AdminInputFilterTest.php

@@ -481,10 +481,7 @@ public function testWillValidateStatus(): void
         $this->assertArrayHasKey('status', $messages);
         $this->assertIsArray($messages['status']);
         $this->assertArrayHasKey('notInArray', $messages['status']);
-        $this->assertSame(
-            'The input was not found in the haystack',
-            $messages['status']['notInArray']
-        );
+        $this->assertSame(Message::invalidValue('status'), $messages['status']['notInArray']);
     }
 
     public function testWillValidateRoles(): void

test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php

@@ -544,10 +544,7 @@ public function testWillValidateStatus(): void
         $this->assertArrayHasKey('status', $messages);
         $this->assertIsArray($messages['status']);
         $this->assertArrayHasKey('notInArray', $messages['status']);
-        $this->assertSame(
-            'The input was not found in the haystack',
-            $messages['status']['notInArray']
-        );
+        $this->assertSame(Message::invalidValue('status'), $messages['status']['notInArray']);
     }
 
     public function testWillValidateRoles(): void