Fixed cache key to work with utf8 characters

Author: mikebronner

src/ProviderAndDumperAggregator.php

@@ -110,8 +110,7 @@ public function getName() : string
 
     public function geocode(string $value) : self
     {
-        #https://stackoverflow.com/questions/22112029/strslug-alternative-for-hindi-and-arabic-strings?noredirect=1&lq=1
-        $cacheKey = (empty(str_slug($value)))?urlencode($value):str_slug($value);
+        $cacheKey = str_slug(strtolower(urlencode($value)));
         $this->results = cache()->remember(
             "geocoder-{$cacheKey}",
             config('geocoder.cache-duraction', 0),
@@ -125,9 +124,9 @@ function () use ($value) {
 
     public function reverse(float $latitude, float $longitude) : self
     {
-        $cacheId = str_slug("{$latitude}-{$longitude}");
+        $cacheKey = str_slug(strtolower(urlencode("{$latitude}-{$longitude}")));
         $this->results = cache()->remember(
-            "geocoder-{$cacheId}",
+            "geocoder-{$cacheKey}",
             config('geocoder.cache-duraction', 0),
             function () use ($latitude, $longitude) {
                 return collect($this->aggregator->reverse($latitude, $longitude));

tests/Laravel5_3/Providers/GeocoderServiceTest.php

@@ -177,12 +177,13 @@ public function testGeocoder()
 
     public function testCacheIsUsed()
     {
+        $cacheKey = str_slug(strtolower(urlencode('1600 Pennsylvania Ave., Washington, DC USA')));
+
         $result = app('geocoder')->geocode('1600 Pennsylvania Ave., Washington, DC USA')
             ->get();
-        $cacheKey = 'geocoder-' . str_slug('1600 Pennsylvania Ave., Washington, DC USA');
 
-        $this->assertTrue(cache()->has($cacheKey));
-        $this->assertEquals($result, cache($cacheKey));
+        $this->assertTrue(cache()->has("geocoder-{$cacheKey}"));
+        $this->assertEquals($result, cache("geocoder-{$cacheKey}"));
     }
 
     /**
@@ -266,4 +267,16 @@ public function testGetProviders()
         $this->assertTrue($providers->has('bing_maps'));
         $this->assertTrue($providers->has('google_maps'));
     }
+
+
+    public function testJapaneseCharacterGeocoding()
+    {
+        $cacheKey = str_slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３')));
+
+        app('geocoder')->geocode('108-0075 東京都港区港南２丁目１６－３')
+            ->get();
+
+        $this->assertEquals($cacheKey, '108-0075e69db1e4baace983bde6b8afe58cbae6b8afe58d97efbc92e4b881e79baeefbc91efbc96efbc8defbc93');
+        $this->assertTrue(cache()->has("geocoder-{$cacheKey}"));
+    }
 }