#7170 Simplifying the geoCoordinate() code

cakephp · Aug 6, 2015 · ccf8cb9 · ccf8cb9
1 parent 2c0c9c6
commit ccf8cb9
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -1031,7 +1031,7 @@ public static function uploadedFile($file, array $options = [])
      *
      * ### Options
      *
-     * - `type` - A string of the coordinate format, right now only `longLat`.
+     * - `type` - A string of the coordinate format, right now only `latLong`.
      * - `latLong` - By default `both`, can be `long` and `lat` as well to validate
      *   only a part of the coordinate.
      *
@@ -1045,18 +1045,17 @@ public static function geoCoordinate($value, array $options = [])
             'latLong' => 'both',
             'type' => 'latLong'
         ];
+        if  ($options['type'] !== 'latLong') {
+            throw new \RuntimeException(sprintf('Unsupported coordinate type "%s".', $options['type']));
+        }
         if ($options['type'] === 'latLong') {
-            if ($options['latLong'] === 'both') {
-                $pattern = '/^' . self::$_pattern['latitude'] . ',\s*' . self::$_pattern['longitude'] . '$/';
-            }
+            $pattern = '/^' . self::$_pattern['latitude'] . ',\s*' . self::$_pattern['longitude'] . '$/';
             if ($options['latLong'] === 'long') {
                 $pattern = '/^' . self::$_pattern['longitude'] . '$/';
             }
             if ($options['latLong'] === 'lat') {
                 $pattern = '/^' . self::$_pattern['latitude'] . '$/';
             }
-        } else {
-            throw new \RuntimeException(sprintf('Unsupported coordinate type "%s".', $options['type']));
         }
         return (bool)preg_match($pattern, $value);
     }