[Mapbox] Check for "short_code" key before using it (#1067)

* [Mapbox] Check for "short_code" key before using it

* Use isset instead of !empty and fix CS

Author: damienalexandre

src/Provider/Mapbox/Mapbox.php

@@ -347,7 +347,9 @@ private function updateAddressComponent(AddressBuilder $builder, string $type, a
 
             case 'country':
                 $builder->setCountry($value['text']);
-                $builder->setCountryCode(strtoupper($value['short_code']));
+                if (isset($value['short_code'])) {
+                    $builder->setCountryCode(strtoupper($value['short_code']));
+                }
 
                 break;
 

src/Provider/Mapbox/Tests/.cached_responses/api.mapbox.com_20d856dd6d6ae671b181193de4e52f7fb651fd97

@@ -0,0 +1 @@
+s:967:"{"type":"FeatureCollection","query":["princ"],"features":[{"id":"place.4899176537126140","type":"Feature","place_type":["place"],"relevance":1,"properties":{"wikidata":"Q235"},"text_it":"Principato di Monaco","language_it":"it","place_name_it":"Principato di Monaco, Principato di Monaco","text":"Principato di Monaco","language":"it","place_name":"Principato di Monaco, Principato di Monaco","bbox":[7.408977,43.724643,7.440014,43.751895],"center":[7.41974,43.73125],"geometry":{"type":"Point","coordinates":[7.41974,43.73125]},"context":[{"id":"country.3435803554126140","wikidata":"Q235","text_it":"Principato di Monaco","language_it":"it","text":"Principato di Monaco","language":"it"}]}],"attribution":"NOTICE: © 2020 Mapbox and its suppliers. All rights reserved. Use of this data is subject to the Mapbox Terms of Service (https://www.mapbox.com/about/maps/). This response and the information it contains may not be retained. POI(s) provided by Foursquare."}";

src/Provider/Mapbox/Tests/MapboxTest.php

@@ -16,6 +16,7 @@
 use Geocoder\Location;
 use Geocoder\Model\Address;
 use Geocoder\Model\AddressCollection;
+use Geocoder\Model\Bounds;
 use Geocoder\Query\GeocodeQuery;
 use Geocoder\Query\ReverseQuery;
 use Geocoder\Provider\Mapbox\Mapbox;
@@ -75,6 +76,49 @@ public function testGeocodeWithQuotaExceeded()
         $provider->geocodeQuery(GeocodeQuery::create('10 avenue Gambetta, Paris, France'));
     }
 
+    public function testGeocodePlaceWithNoCountryShortCode()
+    {
+        $provider = new Mapbox($this->getHttpClient($_SERVER['MAPBOX_GEOCODING_KEY']), $_SERVER['MAPBOX_GEOCODING_KEY']);
+
+        $query = GeocodeQuery::create('princ'); // Principato di Monaco
+        $query = $query->withLocale('it');
+        $query = $query->withBounds(new Bounds(
+            35.82809688193029,
+            -11.36323261153737,
+            59.05992036364424,
+            34.33947713277206
+        ));
+        $query = $query->withLimit(1);
+        $query = $query->withData('location_type', [
+            Mapbox::TYPE_PLACE,
+            Mapbox::TYPE_LOCALITY,
+            Mapbox::TYPE_NEIGHBORHOOD,
+            Mapbox::TYPE_POI,
+            Mapbox::TYPE_POI_LANDMARK,
+        ]);
+
+        $results = $provider->geocodeQuery($query);
+
+        $this->assertInstanceOf(AddressCollection::class, $results);
+        $this->assertCount(1, $results);
+
+        /** @var Location $result */
+        $result = $results->first();
+        $this->assertInstanceOf(Address::class, $result);
+        $this->assertEquals(43.73125, $result->getCoordinates()->getLatitude(), '', 0.001);
+        $this->assertEquals(7.41974, $result->getCoordinates()->getLongitude(), '', 0.001);
+        $this->assertEquals('Principato di Monaco', $result->getStreetName());
+        $this->assertEquals('Principato di Monaco', $result->getCountry()->getName());
+        $this->assertEquals('place.4899176537126140', $result->getId());
+
+        // not provided
+        $this->assertNull($result->getCountry()->getCode());
+        $this->assertNull($result->getPostalCode());
+        $this->assertNull($result->getLocality());
+        $this->assertNull($result->getTimezone());
+        $this->assertNull($result->getStreetNumber());
+    }
+
     public function testGeocodeWithRealAddress()
     {
         if (!isset($_SERVER['MAPBOX_GEOCODING_KEY'])) {