GH-139 Handle empty fleet array detection in the parser

mdziekon · May 26, 2022 · 0d4bee1 · 0d4bee1
1 parent 3a4916f
commit 0d4bee1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/fleet1.php b/fleet1.php
@@ -113,6 +113,9 @@
             case 'SHIP_COUNT_EXCEEDS_AVAILABLE':
                 $errorMessage = $_Lang['fl1_NoEnoughShips'];
                 break;
+            case 'NO_SHIPS':
+                $errorMessage = $_Lang['fl1_NoShipsGiven'];
+                break;
             default:
                 $errorMessage = $_Lang['fleet_generic_errors_unknown'];
                 break;
@@ -151,11 +154,6 @@
     }
 }
 
-if($Fleet['count'] <= 0)
-{
-    message($_Lang['fl1_NoShipsGiven'], $ErrorTitle, 'fleet.php', 3);
-}
-
 $slowestShipSpeed = min(
     array_map_withkeys($shipsDetails, function ($shipDetails) {
         return $shipDetails['speed'];

diff --git a/fleet2.php b/fleet2.php
@@ -194,6 +194,9 @@
         case 'SHIP_COUNT_EXCEEDS_AVAILABLE':
             $errorMessage = $_Lang['fl1_NoEnoughShips'];
             break;
+        case 'NO_SHIPS':
+            $errorMessage = $_Lang['fl1_NoShipsGiven'];
+            break;
         default:
             $errorMessage = $_Lang['fleet_generic_errors_unknown'];
             break;
@@ -217,9 +220,6 @@
     }
 }
 
-if ($Fleet['count'] <= 0) {
-    message($_Lang['fl1_NoShipsGiven'], $ErrorTitle, 'fleet.php', 3);
-}
 $Fleet['array'] = $FleetArray;
 unset($FleetArray);
 

diff --git a/fleet3.php b/fleet3.php
@@ -216,9 +216,6 @@ function messageRed($Text, $Title)
     }
 }
 
-if ($Fleet['count'] <= 0) {
-    messageRed($_Lang['fl1_NoShipsGiven'], $ErrorTitle);
-}
 $Fleet['array'] = $FleetArray;
 unset($FleetArray);
 

diff --git a/modules/flightControl/utils/errors/fleetArray.utils.php b/modules/flightControl/utils/errors/fleetArray.utils.php
@@ -15,6 +15,7 @@ function mapFleetArrayValidationErrorToReadableMessage($error) {
         'SHIP_WITH_NO_ENGINE'           => $_Lang['fl1_CantSendUnflyable'],
         'INVALID_SHIP_COUNT'            => $_Lang['fleet_generic_errors_invalidshipcount'],
         'SHIP_COUNT_EXCEEDS_AVAILABLE'  => $_Lang['fl1_NoEnoughShips'],
+        'NO_SHIPS'                      => $_Lang['fl1_NoShipsGiven'],
     ];
 
     if (!isset($knownErrorsByCode[$errorCode])) {

diff --git a/modules/flightControl/utils/validators/fleetArray.validator.php b/modules/flightControl/utils/validators/fleetArray.validator.php
@@ -78,9 +78,17 @@ function parseFleetArray ($props) {
             ]);
         }
 
+        if ($shipCount == 0) {
+            continue;
+        }
+
         $parsedFleet[$shipId] = $shipCount;
+    }
 
-        continue;
+    if (empty($parsedFleet)) {
+        return $isInvalid([
+            [ 'errorCode' => 'NO_SHIPS', ],
+        ]);
     }
 
     return $isValid([