Fixed caching to be provider-dependent.

Author: mikebronner

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

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');
 

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 東京都港区港南２丁目１６－３')