renamed enums to match the ones from 5.0 branch

Signed-off-by: MarioRadu <magda_marior@yahoo.com>

Author: MarioRadu

.laminas-ci/pre-run.sh

@@ -4,9 +4,6 @@ COMMAND=$(echo "${JOB}" | jq -r '.command')
 
 echo "Running pre-run  $COMMAND"
 
-echo "Running git stash"
-git stash
-
 if [[ ${COMMAND} =~ phpunit ]];then
 
   apt-get install php"${PHP_VERSION}"-sqlite3

composer.json

@@ -73,7 +73,8 @@
             "Admin\\Admin\\": "src/Admin/src/",
             "Admin\\Page\\": "src/Page/src/",
             "Admin\\Dashboard\\": "src/Dashboard/src/",
-            "Admin\\Setting\\": "src/Setting/src/"
+            "Admin\\Setting\\": "src/Setting/src/",
+            "Admin\\Fixtures\\": "data/doctrine/fixtures"
         }
     },
     "autoload-dev": {

src/Admin/src/ConfigProvider.php

@@ -5,10 +5,10 @@
 namespace Admin\Admin;
 
 use Admin\Admin\Adapter\AuthenticationAdapter;
-use Admin\Admin\DBAL\Types\AdminIsMobileEnumType;
-use Admin\Admin\DBAL\Types\AdminLoginStatusEnumType;
 use Admin\Admin\DBAL\Types\AdminRoleEnumType;
 use Admin\Admin\DBAL\Types\AdminStatusEnumType;
+use Admin\Admin\DBAL\Types\SuccessFailureEnumType;
+use Admin\Admin\DBAL\Types\YesNoEnumType;
 use Admin\Admin\Delegator\AdminRoleDelegator;
 use Admin\Admin\Entity\Admin;
 use Admin\Admin\Entity\AdminInterface;
@@ -141,10 +141,10 @@ public function getDoctrineConfig(): array
                 ],
             ],
             'types'  => [
-                AdminStatusEnumType::NAME      => AdminStatusEnumType::class,
-                AdminLoginStatusEnumType::NAME => AdminLoginStatusEnumType::class,
-                AdminIsMobileEnumType::NAME    => AdminIsMobileEnumType::class,
-                AdminRoleEnumType::NAME        => AdminRoleEnumType::class,
+                AdminStatusEnumType::NAME    => AdminStatusEnumType::class,
+                SuccessFailureEnumType::NAME => SuccessFailureEnumType::class,
+                YesNoEnumType::NAME          => YesNoEnumType::class,
+                AdminRoleEnumType::NAME      => AdminRoleEnumType::class,
             ],
         ];
     }

…/DBAL/Types/AdminLoginStatusEnumType.php …rc/DBAL/Types/SuccessFailureEnumType.phpsrc/Admin/src/DBAL/Types/AdminLoginStatusEnumType.php renamed to src/Admin/src/DBAL/Types/SuccessFailureEnumType.php src/Admin/src/DBAL/Types/AdminLoginStatusEnumType.php renamed to src/Admin/src/DBAL/Types/SuccessFailureEnumType.php

@@ -4,16 +4,16 @@
 
 namespace Admin\Admin\DBAL\Types;
 
-use Admin\Admin\Enum\AdminLoginStatusEnum;
+use Admin\Admin\Enum\SuccessFailureEnum;
 use Admin\App\DBAL\Types\AbstractEnumType;
 
-class AdminLoginStatusEnumType extends AbstractEnumType
+class SuccessFailureEnumType extends AbstractEnumType
 {
-    public const NAME = 'admin_login_status_enum';
+    public const NAME = 'success_failure_enum';
 
     protected function getEnumClass(): string
     {
-        return AdminLoginStatusEnum::class;
+        return SuccessFailureEnum::class;
     }
 
     public function getName(): string

…src/DBAL/Types/AdminIsMobileEnumType.php …c/Admin/src/DBAL/Types/YesNoEnumType.phpsrc/Admin/src/DBAL/Types/AdminIsMobileEnumType.php renamed to src/Admin/src/DBAL/Types/YesNoEnumType.php src/Admin/src/DBAL/Types/AdminIsMobileEnumType.php renamed to src/Admin/src/DBAL/Types/YesNoEnumType.php

@@ -4,16 +4,16 @@
 
 namespace Admin\Admin\DBAL\Types;
 
-use Admin\Admin\Enum\AdminIsMobileEnum;
+use Admin\Admin\Enum\YesNoEnum;
 use Admin\App\DBAL\Types\AbstractEnumType;
 
-class AdminIsMobileEnumType extends AbstractEnumType
+class YesNoEnumType extends AbstractEnumType
 {
-    public const NAME = 'admin_is_mobile_enum';
+    public const NAME = 'yes_no_enum';
 
     protected function getEnumClass(): string
     {
-        return AdminIsMobileEnum::class;
+        return YesNoEnum::class;
     }
 
     public function getName(): string

src/Admin/src/Entity/AdminLogin.php

@@ -4,8 +4,8 @@
 
 namespace Admin\Admin\Entity;
 
-use Admin\Admin\Enum\AdminIsMobileEnum;
-use Admin\Admin\Enum\AdminLoginStatusEnum;
+use Admin\Admin\Enum\SuccessFailureEnum;
+use Admin\Admin\Enum\YesNoEnum;
 use Admin\Admin\Repository\AdminLoginRepository;
 use Admin\App\Entity\AbstractEntity;
 use Admin\App\Entity\TimestampsTrait;
@@ -40,8 +40,8 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'deviceModel', type: 'string', length: 40, nullable: true)]
     protected ?string $deviceModel = null;
 
-    #[ORM\Column(type: 'admin_is_mobile_enum')]
-    protected ?AdminIsMobileEnum $isMobile = null;
+    #[ORM\Column(type: 'yes_no_enum')]
+    protected ?YesNoEnum $isMobile = null;
 
     #[ORM\Column(name: 'osName', type: 'string', length: 20, nullable: true)]
     protected ?string $osName = null;
@@ -64,8 +64,8 @@ class AdminLogin extends AbstractEntity
     #[ORM\Column(name: 'clientVersion', type: 'string', length: 20, nullable: true)]
     protected ?string $clientVersion = null;
 
-    #[ORM\Column(type: 'admin_login_status_enum', nullable: true)]
-    protected ?AdminLoginStatusEnum $loginStatus = null;
+    #[ORM\Column(type: 'success_failure_enum', nullable: true)]
+    protected ?SuccessFailureEnum $loginStatus = null;
 
     #[ORM\Column(name: 'identity', type: 'string', length: 100, nullable: true)]
     protected ?string $identity = null;
@@ -154,12 +154,12 @@ public function setDeviceModel(?string $deviceModel): self
         return $this;
     }
 
-    public function getIsMobile(): ?AdminIsMobileEnum
+    public function getIsMobile(): ?YesNoEnum
     {
         return $this->isMobile;
     }
 
-    public function setIsMobile(?AdminIsMobileEnum $isMobile): self
+    public function setIsMobile(?YesNoEnum $isMobile): self
     {
         $this->isMobile = $isMobile;
 
@@ -250,12 +250,12 @@ public function setClientVersion(?string $clientVersion): self
         return $this;
     }
 
-    public function getLoginStatus(): ?AdminLoginStatusEnum
+    public function getLoginStatus(): ?SuccessFailureEnum
     {
         return $this->loginStatus;
     }
 
-    public function setLoginStatus(?AdminLoginStatusEnum $loginStatus): self
+    public function setLoginStatus(?SuccessFailureEnum $loginStatus): self
     {
         $this->loginStatus = $loginStatus;
 

src/Admin/src/Enum/AdminIsMobileEnum.php

@@ -4,8 +4,15 @@
 
 namespace Admin\Admin\Enum;
 
+use function array_column;
+
 enum AdminRoleEnum: string
 {
     case Admin     = 'admin';
     case Superuser = 'superuser';
+
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
 }

src/Admin/src/Enum/AdminLoginStatusEnum.php

@@ -4,8 +4,15 @@
 
 namespace Admin\Admin\Enum;
 
+use function array_column;
+
 enum AdminStatusEnum: string
 {
     case Active   = 'active';
-    case Inactive = 'pending';
+    case Inactive = 'inactive';
+
+    public static function values(): array
+    {
+        return array_column(self::cases(), 'value');
+    }
 }