From a322da316717eda1fb38afdc3db1b5bfc7d29ef6 Mon Sep 17 00:00:00 2001 From: Mike Bronner Date: Wed, 12 Jul 2017 18:25:36 -0700 Subject: [PATCH] Replace cache helper with cache from IOC --- src/ProviderAndDumperAggregator.php | 4 ++-- tests/Laravel5_3/Providers/GeocoderServiceTest.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ProviderAndDumperAggregator.php b/src/ProviderAndDumperAggregator.php index 5fb049b..2599dfa 100644 --- a/src/ProviderAndDumperAggregator.php +++ b/src/ProviderAndDumperAggregator.php @@ -75,7 +75,7 @@ public function dump($dumper) public function geocode($value) { $cacheKey = str_slug(strtolower(urlencode($value))); - $this->results = cache()->remember( + $this->results = app('cache')->remember( "geocoder-{$cacheKey}", config('geocoder.cache-duraction', 0), function () use ($value) { @@ -102,7 +102,7 @@ public function get() public function reverse($latitude, $longitude) { $cacheKey = str_slug(strtolower(urlencode("{$latitude}-{$longitude}"))); - $this->results = cache()->remember( + $this->results = app('cache')->remember( "geocoder-{$cacheKey}", config('geocoder.cache-duraction', 0), function () use ($latitude, $longitude) { diff --git a/tests/Laravel5_3/Providers/GeocoderServiceTest.php b/tests/Laravel5_3/Providers/GeocoderServiceTest.php index 8f8638b..d8a795b 100644 --- a/tests/Laravel5_3/Providers/GeocoderServiceTest.php +++ b/tests/Laravel5_3/Providers/GeocoderServiceTest.php @@ -180,8 +180,8 @@ public function testCacheIsUsed() ->get(); $cacheKey = str_slug(strtolower(urlencode('1600 Pennsylvania Ave., Washington, DC USA'))); - $this->assertEquals($result, cache("geocoder-{$cacheKey}")); - $this->assertTrue(cache()->has("geocoder-{$cacheKey}")); + $this->assertEquals($result, app('cache')->get("geocoder-{$cacheKey}")); + $this->assertTrue(app('cache')->has("geocoder-{$cacheKey}")); } public function testJapaneseCharacterGeocoding() @@ -192,7 +192,7 @@ public function testJapaneseCharacterGeocoding() ->get(); $this->assertEquals($cacheKey, '108-0075e69db1e4baace983bde6b8afe58cbae6b8afe58d97efbc92e4b881e79baeefbc91efbc96efbc8defbc93'); - $this->assertTrue(cache()->has("geocoder-{$cacheKey}")); + $this->assertTrue(app('cache')->has("geocoder-{$cacheKey}")); } public function testFailedGeocodingCanBeCaught()