Merge pull request #25 from InteractionDesignFoundation/no-exception-if-tags-not-supported

Do not try to use tags and Cache driver doesn't support them

Author: alies-dev

src/Cache.php

@@ -37,7 +37,7 @@ class Cache
      */
     public function __construct(CacheManager $cache, $tags, $expires = 30)
     {
-        $this->cache = $tags ? $cache->tags($tags) : $cache;
+        $this->cache = ($tags === [] || !$cache->supportsTags()) ? $cache : $cache->tags($tags);
         $this->expires = $expires;
     }
 

tests/CacheTest.php

@@ -25,9 +25,8 @@ public function should_return_valid_location()
         $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
-        $cacheMock->shouldReceive('get')
-            ->with($data['ip'])
-            ->andReturn($data);
+        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
+        $cacheMock->shouldReceive('get')->with($data['ip'])->andReturn($data);
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);
         $geo_ip->getCache()->setPrefix('');
@@ -45,16 +44,12 @@ public function should_return_invalid_location()
         $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
+        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
+
         $geo_ip = $this->makeGeoIP([], $cacheMock);
         $geo_ip->getCache()->setPrefix('');
 
-        $cacheMock->shouldReceive('get')
-            ->with('81.2.69.142')
-            ->andReturn(null);
-
-        $cacheMock->shouldReceive('tags')
-            ->with($geo_ip->config('cache_tags'))
-            ->andReturnSelf();
+        $cacheMock->shouldReceive('get')->with('81.2.69.142')->andReturn(null);
 
         $this->assertSame($geo_ip->getCache()->get('81.2.69.142'), null);
     }
@@ -72,12 +67,12 @@ public function should_set_location()
         $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
+        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
+
         $geo_ip = $this->makeGeoIP([], $cacheMock);
         $geo_ip->getCache()->setPrefix('');
 
-        $cacheMock->shouldReceive('put')
-            ->withArgs(['81.2.69.142', $location->toArray(), $geo_ip->config('cache_expires')])
-            ->andReturn(null);
+        $cacheMock->shouldReceive('put')->withArgs(['81.2.69.142', $location->toArray(), $geo_ip->config('cache_expires')])->andReturn(null);
 
         $cacheMock->shouldReceive('tags')
             ->with($geo_ip->config('cache_tags'))
@@ -94,12 +89,10 @@ public function should_flush_locations()
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);
 
-        $cacheMock->shouldReceive('flush')
-            ->andReturn(true);
+        $cacheMock->shouldReceive('flush')->andReturn(true);
 
-        $cacheMock->shouldReceive('tags')
-            ->with($geo_ip->config('cache_tags'))
-            ->andReturnSelf();
+        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
+        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
 
         $this->assertSame($geo_ip->getCache()->flush(), true);
     }

tests/TestCase.php

@@ -28,6 +28,7 @@ protected function tearDown(): void
     protected function makeGeoIP(array $config = [], $cacheMock = null)
     {
         $cacheMock = $cacheMock ?: Mockery::mock(CacheManager::class);
+        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
 
         $config = array_merge($this->getConfig(), $config);