Update tests to reflect prefix changes

Author: alies-dev

psalm-baseline.xml

@@ -65,6 +65,9 @@
     </PropertyNotSetInConstructor>
   </file>
   <file src="src/GeoIP.php">
+    <DeprecatedMethod>
+      <code><![CDATA[setPrefix]]></code>
+    </DeprecatedMethod>
     <DocblockTypeContradiction>
       <code><![CDATA[$this->currencies === null]]></code>
       <code><![CDATA[$this->service === null]]></code>

tests/CacheTest.php

@@ -2,6 +2,7 @@
 
 namespace InteractionDesignFoundation\GeoIP\Tests;
 
+use Illuminate\Cache\CacheManager;
 use Mockery;
 
 class CacheTest extends TestCase
@@ -16,14 +17,15 @@ public function shouldReturnValidLocation()
             'lon' => -72.92,
         ];
 
-        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager')
+        $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
         $cacheMock->shouldReceive('get')
             ->with($data['ip'])
             ->andReturn($data);
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);
+        $geo_ip->getCache()->setPrefix('');
 
         $location = $geo_ip->getCache()->get($data['ip']);
 
@@ -35,10 +37,11 @@ public function shouldReturnValidLocation()
     /** @test */
     public function shouldReturnInvalidLocation()
     {
-        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager')
+        $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);
+        $geo_ip->getCache()->setPrefix('');
 
         $cacheMock->shouldReceive('get')
             ->with('81.2.69.142')
@@ -61,10 +64,11 @@ public function shouldSetLocation()
             'lon' => -72.92,
         ]);
 
-        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager')
+        $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);
+        $geo_ip->getCache()->setPrefix('');
 
         $cacheMock->shouldReceive('put')
             ->withArgs(['81.2.69.142', $location->toArray(), $geo_ip->config('cache_expires')])
@@ -80,7 +84,7 @@ public function shouldSetLocation()
     /** @test */
     public function shouldFlushLocations()
     {
-        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager')
+        $cacheMock = Mockery::mock(CacheManager::class)
             ->shouldAllowMockingProtectedMethods();
 
         $geo_ip = $this->makeGeoIP([], $cacheMock);

tests/Services/MaxMindDatabaseTest.php

@@ -17,7 +17,7 @@ public function shouldReturnConfigValue()
     /** @test */
     public function shouldReturnValidLocation()
     {
-        list($service, $config) = $this->getService();
+        [$service] = $this->getService();
 
         $location = $service->locate('81.2.69.142');
 
@@ -27,9 +27,9 @@ public function shouldReturnValidLocation()
     }
 
     /** @test */
-    public function shouldReturnInvalidLocation()
+    public function shouldReturnInvalidLocationForSpecialAddresses()
     {
-        list($service, $config) = $this->getService();
+        [$service] = $this->getService();
 
         try {
             $location = $service->locate('1.1.1.1');

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace InteractionDesignFoundation\GeoIP\Tests;
 
+use Illuminate\Cache\CacheManager;
 use Mockery;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
@@ -21,7 +22,7 @@ public function tearDown(): void
 
     protected function makeGeoIP(array $config = [], $cacheMock = null)
     {
-        $cacheMock = $cacheMock ?: Mockery::mock('Illuminate\Cache\CacheManager');
+        $cacheMock = $cacheMock ?: Mockery::mock(CacheManager::class);
 
         $config = array_merge($this->getConfig(), $config);