Fixed caching to be provider-dependent.

mikebronner · mikebronner · commit 3e95ab164890 · 2020-06-21T09:06:01.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [4.3.4] - 2020-06-21
 ### Fixed
 - non-caching declaration to only apply to current query.
+- caching to take provider into account.
 
 ### Changed
 - `getProvider()` method to no longer be deprecated, and instead return the
diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php
@@ -197,7 +197,7 @@ protected function cacheRequest(string $cacheKey, array $queryElements, string $
             return collect($this->aggregator->{$queryType}(...$queryElements));
         }
 
-        $hashedCacheKey = sha1($cacheKey);
+        $hashedCacheKey = sha1($this->getProvider()->getName() . "-" . $cacheKey);
         $duration = config("geocoder.cache.duration", 0);
         $store = config('geocoder.cache.store');
 
diff --git a/tests/Feature/Providers/GeocoderServiceTest.php b/tests/Feature/Providers/GeocoderServiceTest.php
@@ -160,7 +160,10 @@ public function testGeocoder()
 
     public function testCacheIsUsed()
     {
-        $cacheKey = sha1(Str::slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA'))));
+        $cacheKey = sha1(
+            app('geocoder')->getProvider()->getName()
+            . "-" . Str::slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA')))
+        );
 
         $result = app('geocoder')
             ->geocode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA')
@@ -271,7 +274,9 @@ public function testGetProvider()
 
     public function testJapaneseCharacterGeocoding()
     {
-        $cacheKey = sha1(Str::slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３'))));
+        $cacheKey = sha1(app('geocoder')->getProvider()->getName()
+            . "-" . Str::slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３')))
+        );
 
         app('geocoder')
             ->geocode('108-0075 東京都港区港南２丁目１６－３')

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ protected function cacheRequest(string $cacheKey, array $queryElements, string $`
`197`	`197`	`return collect($this->aggregator->{$queryType}(...$queryElements));`
`198`	`198`	`}`
`199`	`199`
`200`		`- $hashedCacheKey = sha1($cacheKey);`
	`200`	`+ $hashedCacheKey = sha1($this->getProvider()->getName() . "-" . $cacheKey);`
`201`	`201`	`$duration = config("geocoder.cache.duration", 0);`
`202`	`202`	`$store = config('geocoder.cache.store');`
`203`	`203`