fix: traits cant have arrays as default

VATSIM-UK · Oct 9, 2023 · 0096424 · 0096424
1 parent 8cf81d0
commit 0096424
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 22 deletions.
diff --git a/app/Allocator/Stand/OrdersStandsByCommonConditions.php b/app/Allocator/Stand/OrdersStandsByCommonConditions.php
@@ -18,25 +18,37 @@ trait OrdersStandsByCommonConditions
     private string $otherStandRequests = 'other_stand_requests.id ASC';
     private string $random = 'RAND() ASC';
 
-    private array $commonOrderByConditions = [
-        $this->aerodromeReferenceCode,
-        $this->assignmentPriority,
-        $this->otherStandRequests,
-        $this->random,
-    ];
+    private function commonOrderByConditions(): array
+    {
+        return [
+            $this->aerodromeReferenceCode,
+            $this->assignmentPriority,
+            $this->otherStandRequests,
+            $this->random,
+        ];
+    }
 
-    private array $commonOrderByConditionsWithoutAssignmentPriority = [
-        $this->aerodromeReferenceCode,
-        $this->otherStandRequests,
-        $this->random,
-    ];
+    private function commonOrderByConditionsWithoutAssignmentPriority(): array
+    {
+        return [
+            $this->aerodromeReferenceCode,
+            $this->otherStandRequests,
+            $this->random,
+        ];
+    }
 
-    private array $commonOrderByConditionsForRanking = [
-        $this->aerodromeReferenceCode,
-        $this->assignmentPriority,
-    ];
+    private function commonOrderByConditionsForRanking(): array
+    {
+        return [
+            $this->aerodromeReferenceCode,
+            $this->assignmentPriority,
+        ];
+    }
 
-    private array $commonOrderByConditionsWithoutAssignmentPriorityForRanking = [
-        $this->aerodromeReferenceCode,
-    ];
+    private function commonOrderByConditionsWithoutAssignmentPriorityForRanking(): array
+    {
+        return [
+            $this->aerodromeReferenceCode,
+        ];
+    }
 }
diff --git a/app/Allocator/Stand/SelectsStandsUsingStandardConditions.php b/app/Allocator/Stand/SelectsStandsUsingStandardConditions.php
@@ -81,12 +81,12 @@ private function orderByForStandsQuery(array $customOrders, bool $includeAssignm
          */
         if ($includeAssignmentPriority) {
             $commonConditions = $isRanking
-                ? $this->commonOrderByConditionsForRanking
-                : $this->commonOrderByConditions;
+                ? $this->commonOrderByConditionsForRanking()
+                : $this->commonOrderByConditions();
         } else {
             $commonConditions = $isRanking
-                ? $this->commonOrderByConditionsWithoutAssignmentPriorityForRanking
-                : $this->commonOrderByConditionsWithoutAssignmentPriority;
+                ? $this->commonOrderByConditionsWithoutAssignmentPriorityForRanking()
+                : $this->commonOrderByConditionsWithoutAssignmentPriority();
         }
 
         return array_merge(