Types for medallists

PennyDreadfulMTG · Nov 21, 2024 · c851224 · c851224
1 parent c527b89
commit c851224
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/gatherling/Models/Event.php b/gatherling/Models/Event.php
@@ -1638,10 +1638,10 @@ public function assignMedalsByStandings(): void
 
         $t8 = $t4 = [];
         if ($medalCount >= 8) {
-            $t8 = array_map(fn($i) => $players[$i]->player, [4, 5, 6, 7]);
+            $t8 = array_values(array_filter(array_map(fn($i) => $players[$i]->player ?? null, [4, 5, 6, 7])));
         }
         if ($medalCount >= 4) {
-            $t4 = array_map(fn($i) => $players[$i]->player, [2, 3]);
+            $t4 = array_values(array_filter(array_map(fn($i) => $players[$i]->player ?? null, [2, 3])));
         }
         $sec = $players[1]->player ?? null;
         $win = $players[0]->player;

diff --git a/...ing/Views/Components/HostActiveEvents.php → gatherling/Views/Components/HostEvents.php b/...ing/Views/Components/HostActiveEvents.php → gatherling/Views/Components/HostEvents.php
diff --git a/gatherling/event.php b/gatherling/event.php
@@ -528,8 +528,8 @@ function updateMedals(): void
 
     $winner = post()->string('newmatchplayer1');
     $second = post()->optionalString('newmatchplayer2');
-    $t4 = [post()->optionalString('newmatchplayer3'), post()->optionalString('newmatchplayer4')];
-    $t8 = [post()->optionalString('newmatchplayer5'), post()->optionalString('newmatchplayer6'), post()->optionalString('newmatchplayer7'), post()->optionalString('newmatchplayer8')];
+    $t4 = array_values(array_filter([post()->optionalString('newmatchplayer3'), post()->optionalString('newmatchplayer4')]));
+    $t8 = array_values(array_filter([post()->optionalString('newmatchplayer5'), post()->optionalString('newmatchplayer6'), post()->optionalString('newmatchplayer7'), post()->optionalString('newmatchplayer8')]));
 
     $event->setFinalists($winner, $second, $t4, $t8);
 }

diff --git a/...plates/partials/hostActiveEvents.mustache → ...ng/templates/partials/hostEvents.mustache b/...plates/partials/hostActiveEvents.mustache → ...ng/templates/partials/hostEvents.mustache