GH-139 Turn validator into parser for reusability

mdziekon · May 25, 2022 · 3a4916f · 3a4916f
1 parent 6f993ca
commit 3a4916f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/fleet1.php b/fleet1.php
@@ -90,14 +90,14 @@
 
 // Management of ShipsList
 if (!empty($_POST['ship'])) {
-    $fleetArrayValidationResult = FlightControl\Utils\Validators\validateFleetArray([
+    $fleetArrayParsingResult = FlightControl\Utils\Validators\parseFleetArray([
         'fleet' => $_POST['ship'],
         'planet' => &$_Planet,
         'isFromDirectUserInput' => true,
     ]);
 
-    if (!$fleetArrayValidationResult['isValid']) {
-        $firstValidationError = $fleetArrayValidationResult['errors'][0];
+    if (!$fleetArrayParsingResult['isValid']) {
+        $firstValidationError = $fleetArrayParsingResult['errors'][0];
 
         $errorMessage = null;
         switch ($firstValidationError['errorCode']) {

diff --git a/fleet2.php b/fleet2.php
@@ -171,14 +171,14 @@
     message($_Lang['fl1_NoShipsGiven'], $ErrorTitle, 'fleet.php', 3);
 }
 
-$fleetArrayValidationResult = FlightControl\Utils\Validators\validateFleetArray([
+$fleetArrayParsingResult = FlightControl\Utils\Validators\parseFleetArray([
     'fleet' => $Fleet['array'],
     'planet' => &$_Planet,
     'isFromDirectUserInput' => false,
 ]);
 
-if (!$fleetArrayValidationResult['isValid']) {
-    $firstValidationError = $fleetArrayValidationResult['errors'][0];
+if (!$fleetArrayParsingResult['isValid']) {
+    $firstValidationError = $fleetArrayParsingResult['errors'][0];
 
     $errorMessage = null;
     switch ($firstValidationError['errorCode']) {

diff --git a/fleet3.php b/fleet3.php
@@ -188,14 +188,14 @@ function messageRed($Text, $Title)
     messageRed($_Lang['fl1_NoShipsGiven'], $ErrorTitle);
 }
 
-$fleetArrayValidationResult = FlightControl\Utils\Validators\validateFleetArray([
+$fleetArrayParsingResult = FlightControl\Utils\Validators\parseFleetArray([
     'fleet' => $Fleet['array'],
     'planet' => &$_Planet,
     'isFromDirectUserInput' => false,
 ]);
 
-if (!$fleetArrayValidationResult['isValid']) {
-    $firstValidationError = $fleetArrayValidationResult['errors'][0];
+if (!$fleetArrayParsingResult['isValid']) {
+    $firstValidationError = $fleetArrayParsingResult['errors'][0];
     $errorMessage = FlightControl\Utils\Errors\mapFleetArrayValidationErrorToReadableMessage($firstValidationError);
 
     messageRed($errorMessage, $ErrorTitle);

diff --git a/modules/flightControl/utils/errors/fleetArray.utils.php b/modules/flightControl/utils/errors/fleetArray.utils.php
@@ -3,7 +3,7 @@
 namespace UniEngine\Engine\Modules\FlightControl\Utils\Errors;
 
 /**
- * @param object $error As returned by FlightControl\Utils\Validators\validateFleetArray
+ * @param object $error As returned by FlightControl\Utils\Validators\parseFleetArray
  */
 function mapFleetArrayValidationErrorToReadableMessage($error) {
     global $_Lang;

diff --git a/modules/flightControl/utils/validators/fleetArray.validator.php b/modules/flightControl/utils/validators/fleetArray.validator.php
@@ -10,12 +10,13 @@
  *  - Allows ships count to be prettified
  *  - Allows ships count to be 0
  */
-function validateFleetArray ($props) {
+function parseFleetArray ($props) {
     global $_Vars_ElementCategories;
 
-    $isValid = function () {
+    $isValid = function ($payload) {
         return [
             'isValid' => true,
+            'payload' => $payload,
         ];
     };
     $isInvalid = function ($errors) {
@@ -33,6 +34,8 @@ function validateFleetArray ($props) {
             false
     );
 
+    $parsedFleet = [];
+
     foreach ($fleet as $inputShipId => $inputShipCount) {
         $shipId = intval($inputShipId);
 
@@ -75,10 +78,14 @@ function validateFleetArray ($props) {
             ]);
         }
 
+        $parsedFleet[$shipId] = $shipCount;
+
         continue;
     }
 
-    return $isValid();
+    return $isValid([
+        'parsedFleet' => $parsedFleet,
+    ]);
 }
 
 ?>