Cleanup dev dependencies

Author: alies-dev

composer.json

@@ -21,12 +21,11 @@
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.50",
     "geoip2/geoip2": "^3.0",
-    "mockery/mockery": "^1.6",
+    "orchestra/testbench": "^8.8 || ^9.0",
     "phpstan/phpstan": "^1.10",
     "phpunit/phpunit": "^10.5 || ^11.0",
     "squizlabs/php_codesniffer": "^3.9",
-    "vimeo/psalm": "^5.22",
-    "vlucas/phpdotenv": "^5.4"
+    "vimeo/psalm": "^5.22"
   },
   "suggest": {
     "geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
@@ -43,10 +42,7 @@
   "autoload-dev": {
     "psr-4": {
       "InteractionDesignFoundation\\GeoIP\\Tests\\": "tests/"
-    },
-    "files": [
-      "tests/TestFunctions.php"
-    ]
+    }
   },
   "config": {
     "sort-packages": true

tests/CacheTest.php

@@ -5,95 +5,51 @@
 namespace InteractionDesignFoundation\GeoIP\Tests;
 
 use Illuminate\Cache\CacheManager;
-use Mockery;
+use InteractionDesignFoundation\GeoIP\Cache;
+use InteractionDesignFoundation\GeoIP\Location;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Test;
 
-/**
- * @covers \InteractionDesignFoundation\GeoIP\Cache
- */
+#[CoversClass(Cache::class)]
 class CacheTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function should_return_valid_location(): void
     {
-        $data = [
+        $cache = new Cache(app(CacheManager::class), [], 30);
+        $originalLocation = new Location([
             'ip' => '81.2.69.142',
             'iso_code' => 'US',
             'lat' => 41.31,
             'lon' => -72.92,
-        ];
-
-        $cacheMock = Mockery::mock(CacheManager::class)
-            ->shouldAllowMockingProtectedMethods();
-
-        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
-        $cacheMock->shouldReceive('get')->with($data['ip'])->andReturn($data);
-
-        $geo_ip = $this->makeGeoIP([], $cacheMock);
-        $geo_ip->getCache()->setPrefix('');
-
-        $location = $geo_ip->getCache()->get($data['ip']);
-
-        $this->assertInstanceOf(\InteractionDesignFoundation\GeoIP\Location::class, $location);
-        $this->assertSame($location->ip, $data['ip']);
-        $this->assertSame($location->default, false);
-    }
-
-    /** @test */
-    public function should_return_invalid_location(): void
-    {
-        $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);
+        $cache->set($originalLocation['ip'], $originalLocation);
+        $uncachedLocation = $cache->get($originalLocation['ip']);
 
-        $this->assertSame($geo_ip->getCache()->get('81.2.69.142'), null);
+        $this->assertInstanceOf(Location::class, $uncachedLocation);
+        $this->assertSame($uncachedLocation->ip, $originalLocation->ip);
+        $this->assertSame($uncachedLocation->default, false);
     }
 
-    /** @test */
-    public function should_set_location(): void
+    #[Test]
+    public function it_flushes_empty_cache(): void
     {
-        $location = new \InteractionDesignFoundation\GeoIP\Location([
-            'ip' => '81.2.69.142',
-            'iso_code' => 'US',
-            'lat' => 41.31,
-            'lon' => -72.92,
-        ]);
-
-        $cacheMock = Mockery::mock(CacheManager::class)
-            ->shouldAllowMockingProtectedMethods();
+        $cache = new Cache(app(CacheManager::class), [], 30);
 
-        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
+        $flushResult = $cache->flush();
 
-        $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('tags')
-            ->with($geo_ip->config('cache_tags'))
-            ->andReturnSelf();
-
-        $this->assertSame($geo_ip->getCache()->set('81.2.69.142', $location), null);
+        $this->assertTrue($flushResult);
     }
 
-    /** @test */
-    public function should_flush_locations(): void
+    #[Test]
+    public function it_flushes_non_empty_cache(): void
     {
-        $cacheMock = Mockery::mock(CacheManager::class)
-            ->shouldAllowMockingProtectedMethods();
-        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
-
-        $geo_ip = $this->makeGeoIP([], $cacheMock);
-
-        $cacheMock->shouldReceive('flush')->andReturn(true);
+        $cache = new Cache(app(CacheManager::class), [], 30);
+        $cache->set('42', new Location());
 
-        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
+        $flushResult = $cache->flush();
 
-        $this->assertSame($geo_ip->getCache()->flush(), true);
+        $this->assertTrue($flushResult);
     }
 }

tests/TestCase.php

@@ -4,38 +4,23 @@
 
 namespace InteractionDesignFoundation\GeoIP\Tests;
 
-use Illuminate\Cache\CacheManager;
 use InteractionDesignFoundation\GeoIP\GeoIP;
-use Mockery;
-use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+use PHPUnit\Framework\Attributes\CoversNothing;
 
-/**
- * @coversNothing
- */
-class TestCase extends PHPUnitTestCase
+#[CoversNothing]
+class TestCase extends \Orchestra\Testbench\TestCase
 {
-    public static $functions;
-
+    /** @inheritDoc */
     protected function setUp(): void
     {
-        self::$functions = Mockery::mock();
-    }
-
-    protected function tearDown(): void
-    {
-        Mockery::close();
+        parent::setUp();
     }
 
-    protected function makeGeoIP(array $config = [], $cacheMock = null): GeoIP
+    protected function makeGeoIP(array $config = []): GeoIP
     {
-        $cacheMock = $cacheMock ?: Mockery::mock(CacheManager::class);
-        $cacheMock->shouldReceive('supportsTags')->andReturn(false);
-
         $config = array_merge($this->getConfig(), $config);
 
-        $cacheMock->shouldReceive('tags')->with(['laravel-geoip-location'])->andReturnSelf();
-
-        return new GeoIP($config, $cacheMock);
+        return new GeoIP($config, $this->app['cache']);
     }
 
     protected function getConfig(): array