Add tests

src/IdResolvers/CacheResolver.php

@@ -2,7 +2,8 @@
 
 namespace Glhd\Bits\IdResolvers;
 
-use Illuminate\Cache\CacheManager;
+use Illuminate\Contracts\Cache\LockProvider;
+use Illuminate\Contracts\Cache\Store;
 use Illuminate\Support\DateFactory;
 use RuntimeException;
 
@@ -11,7 +12,7 @@ class CacheResolver extends IdResolver
 	protected ?int $value = null;
 
 	public function __construct(
-		protected CacheManager $cache,
+		protected Store&LockProvider $cache,
 		protected DateFactory $dates,
 		protected int $max = 0b1111111111,
 	) {
@@ -30,9 +31,10 @@ protected function acquire(): int
 
 		return $this->cache->lock('glhd-bits-ids:lock')
 			->block(5, function() {
-				$reserved = $this->cache->get('glhd-bits-ids:reserved', fn() => []);
+				$reserved = $this->cache->get('glhd-bits-ids:reserved') ?? [];
+				$id = $this->firstAvailable($reserved) ?? $this->findExpired($reserved);
 
-				if ($id = $this->firstAvailable($reserved) ?? $this->findExpired($reserved)) {
+				if (null !== $id) {
 					$reserved[$id] = $this->dates->now()->addHour()->unix();
 					$this->cache->forever('glhd-bits-ids:reserved', $reserved);
 					return $id;

src/Support/BitsServiceProvider.php

@@ -40,7 +40,7 @@ public function register()
 
 		$this->app->singleton(CacheResolver::class, function(Container $container) {
 			$config = $container->make(Repository::class);
-			$cache = $container->make(CacheManager::class);
+			$cache = $container->make(CacheManager::class)->store();
 			$dates = $container->make(DateFactory::class);
 
 			$format = $config->get('bits.format', 'snowflake');

tests/Unit/CacheIdResolverTest.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Glhd\Bits\Tests\Unit;
+
+use Glhd\Bits\IdResolvers\CacheResolver;
+use Glhd\Bits\Tests\TestCase;
+use Illuminate\Cache\ArrayStore;
+use Illuminate\Support\DateFactory;
+use Illuminate\Support\Facades\Date;
+use RuntimeException;
+
+class CacheIdResolverTest extends TestCase
+{
+	public function test_it_increments_sequences(): void
+	{
+		Date::setTestNow(now());
+
+		$store = new ArrayStore();
+
+		// Should get 0b00
+		$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+		$this->assertEquals(0b00, $resolver->get(1, 1)->first());
+		$this->assertEquals(0b00, $resolver->get(1, 1)->second());
+
+		Date::setTestNow(now()->addMinutes(10));
+
+		// Should get 0b01
+		$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+		$this->assertEquals(0b00, $resolver->get(1, 1)->first());
+		$this->assertEquals(0b01, $resolver->get(1, 1)->second());
+
+		Date::setTestNow(now()->addMinutes(10));
+
+		// Should get 0b10
+		$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+		$this->assertEquals(0b01, $resolver->get(1, 1)->first());
+		$this->assertEquals(0b00, $resolver->get(1, 1)->second());
+
+		Date::setTestNow(now()->addMinutes(10));
+
+		// Should get 0b11
+		$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+		$this->assertEquals(0b01, $resolver->get(1, 1)->first());
+		$this->assertEquals(0b01, $resolver->get(1, 1)->second());
+
+		// Now we've run out of IDs… should throw
+		$this->assertThrows(function() use ($store) {
+			$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+			$resolver->get(1, 1);
+		}, RuntimeException::class);
+
+		Date::setTestNow(now()->addMinutes(30));
+
+		// 0b00 has not expired, so we should be able to acquire it
+		$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+		$this->assertEquals(0b00, $resolver->get(1, 1)->first());
+		$this->assertEquals(0b00, $resolver->get(1, 1)->second());
+
+		// But everything else is locked, so we should throw again
+		$this->assertThrows(function() use ($store) {
+			$resolver = new CacheResolver($store, app(DateFactory::class), 0b11);
+			$resolver->get(1, 1);
+		}, RuntimeException::class);
+	}
+}