Merge pull request #14 from RedberryProducts/fix/test-cases-fail-reasons

Fix/test cases fail reasons

Author: nikajorjika

.github/workflows/run-tests.yml

@@ -29,9 +29,7 @@ jobs:
             testbench: 10.*
           - laravel: 11.*
             testbench: 9.*
-          - laravel: 10.*
-            testbench: ^8.22
-    
+
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

config/inbox.php

@@ -5,10 +5,14 @@
     'public' => env('INBOX_PUBLIC', false),
     'store' => [
         'driver' => env('INBOX_STORE_DRIVER', 'file'),
+        'resolvers' => [
+            // 'custom' => fn() => new \App\CustomMessageStore,
+        ],
         'file' => [
             'path' => env('INBOX_FILE_PATH', storage_path('app/inbox')),
         ],
     ],
+
     'retention' => [
         'seconds' => (int) env('INBOX_RETENTION', 60 * 60 * 24),
     ],

src/StoreManager.php

@@ -9,17 +9,32 @@ class StoreManager
 {
     public function create(): MessageStore
     {
-        $driver = config('mailbox-for-laravel.storage_driver', 'file');
-        $options = config('mailbox-for-laravel.storage', []);
+        $driver = config('inbox.store.driver', 'file');
+        $resolvers = config('inbox.store.resolvers', []);
 
-        $resolvers = config('mailbox-for-laravel.storage_resolvers', []);
-        if (isset($resolvers[$driver]) && is_callable($resolvers[$driver])) {
-            return $resolvers[$driver]($options);
+        // Check for a custom resolver first, if available and it should implement MessageStore
+        $customStore = $this->resolveCustomStore($driver, $resolvers);
+        if ($customStore !== null) {
+            return $customStore;
         }
 
         return match ($driver) {
-            'file' => new FileStorage($options['path'] ?? config('mailbox-for-laravel.storage_path')),
+            'file' => new FileStorage(config('inbox.store.file.path', storage_path('mailbox'))),
             default => throw new \InvalidArgumentException("Unsupported storage driver [{$driver}]"),
         };
     }
+
+    private function resolveCustomStore($driver, $resolvers): ?MessageStore
+    {
+        if (! isset($resolvers[$driver]) || ! is_callable($resolvers[$driver])) {
+            return null;
+        }
+
+        $store = $resolvers[$driver]();
+        if (! $store instanceof MessageStore) {
+            return null;
+        }
+
+        return $store;
+    }
 }

tests/Unit/Contracts/MessageStoreContractTest.php

@@ -1,10 +1,9 @@
 <?php
 
 use Redberry\MailboxForLaravel\Contracts\MessageStore;
-use ReflectionClass;
 
 describe(MessageStore::class, function () {
-    it('defines required methods: store, retrieve, keys, delete, purgeOlderThan', function () {
+    it('defines required methods: store, retrieve, keys, update, delete, purgeOlderThan, clear', function () {
         $methods = array_map(
             fn ($m) => $m->getName(),
             (new ReflectionClass(MessageStore::class))->getMethods()
@@ -15,7 +14,9 @@
             'retrieve',
             'keys',
             'delete',
+            'update',
             'purgeOlderThan',
+            'clear',
         ]);
     });
 

tests/Unit/StoreManagerTest.php

@@ -6,15 +6,15 @@
 
 describe(StoreManager::class, function () {
     it('creates a file-based MessageStore when driver=file', function () {
-        config(['mailbox-for-laravel.storage_driver' => 'file']);
+        config(['inbox.store.driver' => 'file']);
 
         $store = (new StoreManager)->create();
 
         expect($store)->toBeInstanceOf(FileStorage::class);
     });
 
     it('throws when an unknown driver is configured', function () {
-        config(['mailbox-for-laravel.storage_driver' => 'foo']);
+        config(['inbox.store.driver' => 'foo']);
 
         expect(fn () => (new StoreManager)->create())
             ->toThrow(InvalidArgumentException::class);
@@ -45,29 +45,45 @@ public function delete(string $key): void
                 unset($this->stored[$key]);
             }
 
+            public function update(string $key, array $value): ?array
+            {
+                if (! isset($this->stored[$key])) {
+                    return null;
+                }
+                $this->stored[$key] = array_merge($this->stored[$key], $value);
+
+                return $this->stored[$key];
+            }
+
             public function purgeOlderThan(int $seconds): void
             {
                 $this->stored = [];
             }
+
+            public function clear(): bool
+            {
+                $this->stored = [];
+
+                return true;
+            }
         };
 
-        config([
-            'mailbox-for-laravel.storage_driver' => 'memory',
-            'mailbox-for-laravel.storage_resolvers' => [
-                'memory' => fn () => $custom,
-            ],
+        Config::set('inbox.store.driver', 'memory');
+        Config::set('inbox.store.resolvers', [
+            'memory' => fn () => $custom,
         ]);
 
         $store = (new StoreManager)->create();
+
         expect($store)->toBe($custom);
     });
 
     it('passes configuration options to store implementations', function () {
         $tmp = sys_get_temp_dir().'/mailbox-tests';
         @mkdir($tmp, 0777, true);
         config([
-            'mailbox-for-laravel.storage_driver' => 'file',
-            'mailbox-for-laravel.storage' => ['path' => $tmp],
+            'inbox.store.driver' => 'file',
+            'inbox.store.file' => ['path' => $tmp],
         ]);
 
         $store = (new StoreManager)->create();