Merge remote-tracking branch 'origin/main'

Traineratwot · Jan 18, 2024 · fc01b8e · fc01b8e
2 parents fa09946 + 2bc3322
commit fc01b8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/Forms/Components/MapInput.php b/src/Forms/Components/MapInput.php
@@ -91,7 +91,7 @@ public function saveAsArray(): static
     protected function parseInput(mixed $state): array
     {
         $validator = Validator::make([
-            'state' => $state
+            'state' => $state,
         ], [
             'state' => ['required', new GeoPoint()],
         ]);
@@ -116,6 +116,7 @@ protected function parseInput(mixed $state): array
                     'longitude' => $state['coordinates'][0],
                 ];
             }
+
             return [
                 'latitude' => (float) $state[0],
                 'longitude' => (float) $state[1],
@@ -124,11 +125,13 @@ protected function parseInput(mixed $state): array
 
         if (is_string($state)) {
             $_state = explode(',', $state);
+
             return [
-                'latitude' => (float)$_state[0],
-                'longitude' => (float)$_state[1],
+                'latitude' => (float) $_state[0],
+                'longitude' => (float) $_state[1],
             ];
         }
+
         return [
             'latitude' => $this->latitude,
             'longitude' => $this->longitude,

diff --git a/src/Rules/GeoPoint.php b/src/Rules/GeoPoint.php
@@ -13,7 +13,7 @@ class GeoPoint implements ValidationRule
     /**
      * Run the validation rule.
      *
-     * @param Closure(string): PotentiallyTranslatedString $fail
+     * @param  Closure(string): PotentiallyTranslatedString  $fail
      */
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
@@ -32,8 +32,8 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 }
 
                 $point = [
-                    'latitude' => (float)$_value[0],
-                    'longitude' => (float)$_value[1],
+                    'latitude' => (float) $_value[0],
+                    'longitude' => (float) $_value[1],
                 ];
             }
             if (is_array($value)) {
@@ -42,16 +42,16 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                         'latitude' => $value['coordinates'][1],
                         'longitude' => $value['coordinates'][0],
                     ];
-                } else if (count($value) !== 2) {
+                } elseif (count($value) !== 2) {
                     $fail("The {$attribute} must be a valid geo point.");
                 } else {
                     $point = [
-                        'latitude' => (float)$value[0],
-                        'longitude' => (float)$value[1],
+                        'latitude' => (float) $value[0],
+                        'longitude' => (float) $value[1],
                     ];
                 }
             }
-            if (!is_numeric($point['latitude']) || !is_numeric($point['longitude'])) {
+            if (! is_numeric($point['latitude']) || ! is_numeric($point['longitude'])) {
                 $fail("The {$attribute} must be a valid geo point.");
             }
             if ($point['latitude'] < -90 || $point['latitude'] > 90) {