Make sure we never use a country with name AND code as null (#768)

Nyholm · web-flow · commit 57ae86d0d5ee · 2017-09-16T12:20:13.000+02:00
* Make sure we never use a country with name AND code as null

* cs

* Bugfixes

* Make sure one cannot create a country without data
diff --git a/Formatter/StringFormatter.php b/Formatter/StringFormatter.php
@@ -50,8 +50,13 @@ final class StringFormatter
      */
     public function format(Location $location, string $format): string
     {
-        if (null !== $code = $location->getCountry()->getCode()) {
-            $code = strtoupper($code);
+        $countryName = null;
+        $code = null;
+        if (null !== $country = $location->getCountry()) {
+            $countryName = $country->getName();
+            if (null !== $code = $country->getCode()) {
+                $code = strtoupper($code);
+            }
         }
 
         $replace = [
@@ -60,7 +65,7 @@ public function format(Location $location, string $format): string
             self::LOCALITY => $location->getLocality(),
             self::POSTAL_CODE => $location->getPostalCode(),
             self::SUB_LOCALITY => $location->getSubLocality(),
-            self::COUNTRY => $location->getCountry()->getName(),
+            self::COUNTRY => $countryName,
             self::COUNTRY_CODE => $code,
             self::TIMEZONE => $location->getTimezone(),
         ];
diff --git a/Model/Address.php b/Model/Address.php
@@ -265,10 +265,7 @@ public static function createFromArray(array $data)
             $data['postalCode'],
             $data['locality'],
             $data['subLocality'],
-            new Country(
-                $data['country'],
-                $data['countryCode']
-            ),
+            self::createCountry($data['country'], $data['countryCode']),
             $data['timezone']
         );
     }
@@ -288,6 +285,21 @@ private static function createCoordinates($latitude, $longitude)
         return new Coordinates($latitude, $longitude);
     }
 
+    /**
+     * @param string|null $name
+     * @param string|null $code
+     *
+     * @return Country|null
+     */
+    private static function createCountry($name, $code)
+    {
+        if (null === $name && null === $code) {
+            return null;
+        }
+
+        return new Country($name, $code);
+    }
+
     /**
      * @param float $south
      * @param float $west
diff --git a/Model/Country.php b/Model/Country.php
@@ -12,7 +12,11 @@
 
 namespace Geocoder\Model;
 
+use Geocoder\Exception\InvalidArgument;
+
 /**
+ * A Country has either a name or a code. A Country will never be without data.
+ *
  * @author William Durand <william.durand1@gmail.com>
  */
 final class Country
@@ -33,6 +37,10 @@ final class Country
      */
     public function __construct(string $name = null, string $code = null)
     {
+        if (null === $name && null === $code) {
+            throw new InvalidArgument('A country must have either a name or a code');
+        }
+
         $this->name = $name;
         $this->code = $code;
     }
