More tweaks

Author: willdurand

composer.json

@@ -18,7 +18,8 @@
     },
     "require-dev": {
         "geoip2/geoip2": "~0.6",
-        "symfony/stopwatch": "~2.5"
+        "symfony/stopwatch": "~2.5",
+        "ext-geoip": "*"
     },
     "suggest": {
         "ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",

src/Geocoder/Model/AddressFactory.php

@@ -76,22 +76,16 @@ private function readStringValue(array $data, $key)
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     private function valueOrNull($str)
     {
         return empty($str) ? null : $str;
     }
 
-    private function lowerize($str)
-    {
-        if (null !== $str = $this->valueOrNull($str)) {
-            return extension_loaded('mbstring') ? mb_strtolower($str, 'UTF-8') : strtolower($str);
-        }
-
-        return null;
-    }
-
+    /**
+     * @return string|null
+     */
     private function upperize($str)
     {
         if (null !== $str = $this->valueOrNull($str)) {

src/Geocoder/Provider/ArcGISOnline.php

@@ -146,6 +146,9 @@ public function getName()
         return 'arcgis_online';
     }
 
+    /**
+     * @param string $query
+     */
     private function buildQuery($query)
     {
         if (null !== $this->sourceCountry) {

src/Geocoder/Provider/MaxMindBinary.php

@@ -80,14 +80,14 @@ public function geocode($address)
             throw new NoResult(sprintf('No results found for IP address %s', $address));
         }
 
-        return array($this->fixEncoding(array_merge($this->getDefaults(), array(
+        return [ array_merge($this->getDefaults(), [
             'countryCode' => $geoIpRecord->country_code,
             'country'     => $geoIpRecord->country_name,
             'region'      => $geoIpRecord->region,
             'locality'    => $geoIpRecord->city,
             'latitude'    => $geoIpRecord->latitude,
             'longitude'   => $geoIpRecord->longitude,
-        ))));
+        ])];
     }
 
     /**