QA

koencaerels · Jul 11, 2024 · 74850c6 · 74850c6
1 parent a181734
commit 74850c6
Show file tree

Hide file tree

Showing 33 changed files with 47 additions and 103 deletions.
diff --git a/.github/workflows/php_build_and_qa_test.yml b/.github/workflows/php_build_and_qa_test.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: shivammathur/setup-php@2cb9b829437ee246e9b3cac53555a39208ca6d28
         with:
-           php-version: '8.2'
+           php-version: '8.3'
 
       - uses: actions/checkout@v3
 

diff --git a/application/YoshiKan/Application/QueryBus.php b/application/YoshiKan/Application/QueryBus.php
@@ -35,7 +35,7 @@ class QueryBus
     use GetMemberTrait;
 
     protected BasePermissionService $permission;
-    private const ADMIN = 1;
+    private const int ADMIN = 1;
 
     // ——————————————————————————————————————————————————————————————————————————
     // Constructor

diff --git a/application/YoshiKan/Application/Security/BasePermissionService.php b/application/YoshiKan/Application/Security/BasePermissionService.php
@@ -18,8 +18,8 @@
 
 class BasePermissionService
 {
-    protected const NOT_ALLOWED_DATA = 'Action not allowed for this user.';
-    protected const NOT_ALLOWED_ROLE = 'Action not allowed for this user.';
+    protected const string NOT_ALLOWED_DATA = 'Action not allowed for this user.';
+    protected const string NOT_ALLOWED_ROLE = 'Action not allowed for this user.';
 
     // ————————————————————————————————————————————————————————————————————
     // Constructor

diff --git a/application/YoshiKan/Domain/Model/Member/FederationRepository.php b/application/YoshiKan/Domain/Model/Member/FederationRepository.php
@@ -10,7 +10,7 @@ interface FederationRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Federation $model): ?int;
+    public function save(Federation $model): int;
 
     public function delete(Federation $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/GradeLogRepository.php b/application/YoshiKan/Domain/Model/Member/GradeLogRepository.php
@@ -19,7 +19,7 @@ interface GradeLogRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(GradeLog $model): ?int;
+    public function save(GradeLog $model): int;
 
     public function delete(GradeLog $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/GradeRepository.php b/application/YoshiKan/Domain/Model/Member/GradeRepository.php
@@ -19,7 +19,7 @@ interface GradeRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Grade $model): ?int;
+    public function save(Grade $model): int;
 
     public function delete(Grade $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/GroupRepository.php b/application/YoshiKan/Domain/Model/Member/GroupRepository.php
@@ -19,7 +19,7 @@ interface GroupRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Group $model): ?int;
+    public function save(Group $model): int;
 
     public function delete(Group $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/LocationRepository.php b/application/YoshiKan/Domain/Model/Member/LocationRepository.php
@@ -19,7 +19,7 @@ interface LocationRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Location $model): ?int;
+    public function save(Location $model): int;
 
     public function delete(Location $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/MemberImageRepository.php b/application/YoshiKan/Domain/Model/Member/MemberImageRepository.php
@@ -10,7 +10,7 @@ interface MemberImageRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(MemberImage $model): ?int;
+    public function save(MemberImage $model): int;
 
     public function delete(MemberImage $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/MemberRepository.php b/application/YoshiKan/Domain/Model/Member/MemberRepository.php
@@ -19,7 +19,7 @@ interface MemberRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Member $model): ?int;
+    public function save(Member $model): int;
 
     public function delete(Member $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/PeriodRepository.php b/application/YoshiKan/Domain/Model/Member/PeriodRepository.php
@@ -19,7 +19,7 @@ interface PeriodRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Period $model): ?int;
+    public function save(Period $model): int;
 
     public function delete(Period $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/SettingsRepository.php b/application/YoshiKan/Domain/Model/Member/SettingsRepository.php
@@ -19,7 +19,7 @@ interface SettingsRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Settings $model): ?int;
+    public function save(Settings $model): int;
 
     public function delete(Settings $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/SubscriptionItemRepository.php b/application/YoshiKan/Domain/Model/Member/SubscriptionItemRepository.php
@@ -10,7 +10,7 @@ interface SubscriptionItemRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(SubscriptionItem $model): ?int;
+    public function save(SubscriptionItem $model): int;
 
     public function delete(SubscriptionItem $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Member/SubscriptionRepository.php b/application/YoshiKan/Domain/Model/Member/SubscriptionRepository.php
@@ -19,7 +19,7 @@ interface SubscriptionRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Subscription $model): ?int;
+    public function save(Subscription $model): int;
 
     public function delete(Subscription $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Message/MessageRepository.php b/application/YoshiKan/Domain/Model/Message/MessageRepository.php
@@ -12,7 +12,7 @@ interface MessageRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Message $model): ?int;
+    public function save(Message $model): int;
 
     public function delete(Message $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/Product/JudogiRepository.php b/application/YoshiKan/Domain/Model/Product/JudogiRepository.php
@@ -19,7 +19,7 @@ interface JudogiRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(Judogi $model): ?int;
+    public function save(Judogi $model): int;
 
     public function delete(Judogi $model): bool;
 

diff --git a/application/YoshiKan/Domain/Model/TwoFactor/MemberAccessCodeRepository.php b/application/YoshiKan/Domain/Model/TwoFactor/MemberAccessCodeRepository.php
@@ -20,7 +20,7 @@ interface MemberAccessCodeRepository
 {
     public function nextIdentity(): Uuid;
 
-    public function save(MemberAccessCode $model): ?int;
+    public function save(MemberAccessCode $model): int;
 
     public function delete(MemberAccessCode $model): bool;
 

diff --git a/application/YoshiKan/Infrastructure/Database/Member/FederationRepository.php b/application/YoshiKan/Infrastructure/Database/Member/FederationRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Federation $model): ?int
+    public function save(Federation $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Federation $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/GradeLogRepository.php b/application/YoshiKan/Infrastructure/Database/Member/GradeLogRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(GradeLog $model): ?int
+    public function save(GradeLog $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(GradeLog $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/GradeRepository.php b/application/YoshiKan/Infrastructure/Database/Member/GradeRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Grade $model): ?int
+    public function save(Grade $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Grade $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/GroupRepository.php b/application/YoshiKan/Infrastructure/Database/Member/GroupRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Group $model): ?int
+    public function save(Group $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Group $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/LocationRepository.php b/application/YoshiKan/Infrastructure/Database/Member/LocationRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Location $model): ?int
+    public function save(Location $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Location $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/MemberImageRepository.php b/application/YoshiKan/Infrastructure/Database/Member/MemberImageRepository.php
@@ -32,17 +32,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(MemberImage $model): ?int
+    public function save(MemberImage $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(MemberImage $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/MemberRepository.php b/application/YoshiKan/Infrastructure/Database/Member/MemberRepository.php
@@ -45,17 +45,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Member $model): ?int
+    public function save(Member $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Member $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/PeriodRepository.php b/application/YoshiKan/Infrastructure/Database/Member/PeriodRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Period $model): ?int
+    public function save(Period $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Period $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/SettingsRepository.php b/application/YoshiKan/Infrastructure/Database/Member/SettingsRepository.php
@@ -41,17 +41,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Settings $model): ?int
+    public function save(Settings $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Settings $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/SubscriptionItemRepository.php b/application/YoshiKan/Infrastructure/Database/Member/SubscriptionItemRepository.php
@@ -33,17 +33,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(SubscriptionItem $model): ?int
+    public function save(SubscriptionItem $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(SubscriptionItem $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Member/SubscriptionRepository.php b/application/YoshiKan/Infrastructure/Database/Member/SubscriptionRepository.php
@@ -44,17 +44,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Subscription $model): ?int
+    public function save(Subscription $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Subscription $model): bool

diff --git a/application/YoshiKan/Infrastructure/Database/Message/MessageRepository.php b/application/YoshiKan/Infrastructure/Database/Message/MessageRepository.php
@@ -34,17 +34,13 @@ public function nextIdentity(): Uuid
     // Single entity functions
     // —————————————————————————————————————————————————————————————————————————
 
-    public function save(Message $model): ?int
+    public function save(Message $model): int
     {
         $model->setChecksum();
         $em = $this->getEntityManager();
         $em->persist($model);
-        $id = 0;
-        if ($model->getId()) {
-            $id = $model->getId();
-        }
 
-        return $id;
+        return $model->getId() ?? 0;
     }
 
     public function delete(Message $model): bool