Add Redis Adapter

Author: papac

docker-compose.yml

@@ -18,7 +18,7 @@ services:
         image: mysql:8.3.0
         restart: unless-stopped
         ports:
-            - "3308:3306"
+            - "3306:3306"
         environment:
             MYSQL_DATABASE: test_db
             MYSQL_ROOT_PASSWORD: password
@@ -73,7 +73,7 @@ services:
         restart: unless-stopped
         ports:
             - "1025:1025"
-            - "1080:8025"
+            - "1080:1080"
         networks:
             - bowphp_network
         healthcheck:

src/Mail/MailQueueTask.php

@@ -60,6 +60,6 @@ public function process(): void
      */
     public function onException(Throwable $e): void
     {
-        $this->deleteJob();
+        $this->deleteTask();
     }
 }

src/Notifier/Adapters/TelegramChannelAdapter.php

@@ -15,7 +15,7 @@ class TelegramChannelAdapter implements ChannelAdapterInterface
     /**
      * @var string
      */
-    private string $botToken;
+    private ?string $botToken;
 
     /**
      * Constructor
@@ -25,10 +25,6 @@ class TelegramChannelAdapter implements ChannelAdapterInterface
     public function __construct()
     {
         $this->botToken = config('messaging.telegram.bot_token');
-
-        if (!$this->botToken) {
-            throw new InvalidArgumentException('The Telegram bot token is required');
-        }
     }
 
     /**
@@ -51,6 +47,10 @@ public function send(Model $context, Notifier $notifier): void
             throw new InvalidArgumentException('The chat ID and message are required for Telegram');
         }
 
+        if (!$this->botToken) {
+            throw new InvalidArgumentException('The Telegram bot token is required');
+        }
+
         $client = new HttpClient();
         $endpoint = "https://api.telegram.org/bot{$this->botToken}/sendMessage";
 

src/Notifier/NotifierQueueTask.php

@@ -52,6 +52,6 @@ public function process(): void
      */
     public function onException(Throwable $e): void
     {
-        $this->deleteJob();
+        $this->deleteTask();
     }
 }

src/Queue/Adapters/BeanstalkdAdapter.php

@@ -232,7 +232,7 @@ private function logError(Throwable $exception): void
         error_log($exception->getMessage());
 
         try {
-            app("logger")->error($exception->getMessage(), $exception->getTrace());
+            logger()->error($exception->getMessage(), $exception->getTrace());
         } catch (Throwable $loggerException) {
             // Logger not available, already logged to error_log
         }

src/Queue/Adapters/DatabaseAdapter.php

@@ -218,7 +218,7 @@ private function logError(Throwable $exception): void
         error_log($exception->getMessage());
 
         try {
-            app("logger")->error($exception->getMessage(), $exception->getTrace());
+            logger()->error($exception->getMessage(), $exception->getTrace());
         } catch (Throwable $loggerException) {
             // Logger not available, already logged to error_log
         }

src/Queue/Adapters/RedisAdapter.php

@@ -321,7 +321,7 @@ private function logError(Throwable $exception): void
         error_log($exception->getMessage());
 
         try {
-            app("logger")->error($exception->getMessage(), $exception->getTrace());
+            logger()->error($exception->getMessage(), $exception->getTrace());
         } catch (Throwable $loggerException) {
             // Logger not available, already logged to error_log
         }

src/Queue/Adapters/SQSAdapter.php

@@ -257,7 +257,7 @@ private function logError(Throwable $exception): void
         error_log($exception->getMessage());
 
         try {
-            app("logger")->error($exception->getMessage(), $exception->getTrace());
+            logger()->error($exception->getMessage(), $exception->getTrace());
         } catch (Throwable $loggerException) {
             // Logger not available, already logged to error_log
         }

src/Support/Env.php

@@ -45,13 +45,17 @@ class Env
      *
      * @throws
      */
-    public function __construct(string $filename)
+    public function __construct(?string $filename = null)
     {
         if ($this->isLoaded()) {
             return;
         }
 
-        $this->envs = json_decode(file_get_contents($filename), true, 512, JSON_THROW_ON_ERROR);
+        if ($filename === null || !file_exists($filename)) {
+            $this->envs = [];
+        } else {
+            $this->envs = json_decode(file_get_contents($filename), true, 512, JSON_THROW_ON_ERROR);
+        }
 
         $this->envs = $this->bindVariables($this->envs);
 

tests/Queue/QueueTest.php

@@ -186,12 +186,8 @@ public function test_can_switch_between_connections(): void
         $beanstalkdAdapter = $this->getAdapter("beanstalkd");
         $this->assertInstanceOf(BeanstalkdAdapter::class, $beanstalkdAdapter);
 
-        try {
-            $redisAdapter = $this->getAdapter("redis");
-            $this->assertInstanceOf(RedisAdapter::class, $redisAdapter);
-        } catch (\Exception $e) {
-            // Redis not available, skip this assertion
-        }
+        $redisAdapter = $this->getAdapter("redis");
+        $this->assertInstanceOf(RedisAdapter::class, $redisAdapter);
     }
 
     public function test_connection_returns_same_instance_for_same_adapter(): void
@@ -217,11 +213,6 @@ public function test_can_get_current_connection_name(): void
      */
     public function test_push_service_adapter(string $connection): void
     {
-        // Skip database adapter due to UUID collision bug
-        if ($connection === 'database') {
-            $this->markTestSkipped('Skipped: Str::uuid() generates duplicate UUIDs causing PRIMARY KEY violations');
-        }
-
         $adapter = $this->getAdapter($connection);
         $filename = $this->getProducerFilePath($connection);
 
@@ -258,11 +249,6 @@ public function test_push_service_adapter(string $connection): void
      */
     public function test_push_service_adapter_with_model(string $connection): void
     {
-        // Skip database adapter due to UUID collision bug
-        if ($connection === 'database') {
-            $this->markTestSkipped('Skipped: Str::uuid() generates duplicate UUIDs causing PRIMARY KEY violations');
-        }
-
         // Recreate table to reset auto-increment and avoid test pollution
         $this->recreatePetsTable();
 
@@ -767,6 +753,7 @@ public function test_sync_adapter_executes_without_delay(): void
 
         $startTime = microtime(true);
         $producer = $this->createBasicJob("sync");
+        $producer->setDelay(0);
         $adapter->push($producer);
         $endTime = microtime(true);