Fixed broken master (#677)

* Test fixes

* Adding "provide" section

* Fixed tomtom tests

* Added tomtom cached responses

* Updated file names

* cs

* cs

* Fixing more tests

* cs

* Disable tests on maxmind binary

* Bugfix

* Exclude maxmind

* Disable maxmind better

* cs

Author: Nyholm

Model/AddressBuilder.php

@@ -100,6 +100,11 @@ public function build($class = Address::class)
             throw new \LogicException('First parameter to LocationBuilder::build must be a class name extending Geocoder\Model\Address');
         }
 
+        $country = null;
+        if (!empty($this->country) || !empty($this->country)) {
+            $country = new Country($this->country, $this->countryCode);
+        }
+
         return new $class(
             $this->providedBy,
             new AdminLevelCollection($this->adminLevels),
@@ -110,7 +115,7 @@ public function build($class = Address::class)
             $this->postalCode,
             $this->locality,
             $this->subLocality,
-            new Country($this->country, $this->countryCode),
+            $country,
             $this->timezone
         );
     }

Provider/AbstractHttpProvider.php

@@ -59,7 +59,7 @@ protected function getUrlContents($url)
         $response = $this->getHttpClient()->sendRequest($request);
 
         $statusCode = $response->getStatusCode();
-        if (401 === $statusCode) {
+        if (401 === $statusCode || 403 === $statusCode) {
             throw new InvalidCredentials();
         } elseif (429 === $statusCode) {
             throw new QuotaExceeded();