Merge pull request #2 from dejwCake/change-config

Change config

Author: dejwCake

.docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM php:8.4-cli
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    git \
+    zip \
+    unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install PHP extensions
+RUN docker-php-ext-install sockets pcntl
+
+# Install Composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+WORKDIR /app

README.md

@@ -596,20 +596,23 @@ To run the test suite you can use the following commands:
 
 ```bash
 # To run both style and unit tests.
-composer test
+docker compose exec -it app composer install
+
+# To run both style and unit tests.
+docker compose exec -it app composer test
 
 # To run only style tests.
-composer test:style
+docker compose exec -it app composer test:style
 
 # To run only unit tests.
-composer test:unit
+docker compose exec -it app composer test:unit
 ```
 
 If you receive any errors from the style tests, you can automatically fix most,
 if not all the issues with the following command:
 
 ```bash
-composer fix:style
+docker compose exec -it php composer fix:style
 ```
 
 ## Contribution

docker-compose.yml

@@ -1,7 +1,20 @@
-version: '3.7'
-
 services:
 
+  app:
+    build:
+      context: .
+      dockerfile: .docker/app/Dockerfile
+    environment:
+      HOST: rabbitmq
+      PORT: 5672
+    volumes:
+      - .:/app
+    working_dir: /app
+    tty: true
+    stdin_open: true
+    depends_on:
+      - rabbitmq
+
   rabbitmq:
     image: rabbitmq:3.8
     environment:
@@ -17,8 +30,6 @@ services:
       - "./tests/files/rootCA.pem:/rootCA.pem:ro"
       - "./tests/files/rootCA.key:/rootCA.key:ro"
     ports:
-      - "15671:15671"
-      - "15672:15672"
       - "5671:5671"
       - "5672:5672"
 
@@ -39,5 +50,3 @@ services:
     ports:
       - 15671:15671
       - 15672:15672
-      - 5671:5671
-      - 5672:5672

src/Queue/RabbitMQQueue.php

@@ -62,14 +62,14 @@ class RabbitMQQueue extends Queue implements QueueContract, RabbitMQQueueContrac
     /**
      * Holds the Configuration
      */
-    protected QueueConfig $config;
+    protected QueueConfig $rabbitMQConfig;
 
     /**
      * RabbitMQQueue constructor.
      */
     public function __construct(QueueConfig $config)
     {
-        $this->config = $config;
+        $this->rabbitMQConfig = $config;
         $this->dispatchAfterCommit = $config->isDispatchAfterCommit();
     }
 
@@ -293,7 +293,7 @@ public function setConnection(AbstractConnection $connection): RabbitMQQueue
      */
     public function getJobClass(): string
     {
-        $job = $this->getConfig()->getAbstractJob();
+        $job = $this->getRabbitMQConfig()->getAbstractJob();
 
         throw_if(
             ! is_a($job, RabbitMQJob::class, true),
@@ -309,7 +309,7 @@ public function getJobClass(): string
      */
     public function getQueue($queue = null): string
     {
-        return $queue ?: $this->getConfig()->getQueue();
+        return $queue ?: $this->getRabbitMQConfig()->getQueue();
     }
 
     /**
@@ -523,7 +523,7 @@ protected function createMessage($payload, int $attempts = 0): array
             $properties['correlation_id'] = $correlationId;
         }
 
-        if ($this->getConfig()->isPrioritizeDelayed()) {
+        if ($this->getRabbitMQConfig()->isPrioritizeDelayed()) {
             $properties['priority'] = $attempts;
         }
 
@@ -605,16 +605,16 @@ protected function getQueueArguments(string $destination): array
         // Messages with a priority which is higher than the queue's maximum, are treated as if they were
         // published with the maximum priority.
         // Quorum queues does not support priority.
-        if ($this->getConfig()->isPrioritizeDelayed() && ! $this->getConfig()->isQuorum()) {
-            $arguments['x-max-priority'] = $this->getConfig()->getQueueMaxPriority();
+        if ($this->getRabbitMQConfig()->isPrioritizeDelayed() && ! $this->getRabbitMQConfig()->isQuorum()) {
+            $arguments['x-max-priority'] = $this->getRabbitMQConfig()->getQueueMaxPriority();
         }
 
-        if ($this->getConfig()->isRerouteFailed()) {
+        if ($this->getRabbitMQConfig()->isRerouteFailed()) {
             $arguments['x-dead-letter-exchange'] = $this->getFailedExchange();
             $arguments['x-dead-letter-routing-key'] = $this->getFailedRoutingKey($destination);
         }
 
-        if ($this->getConfig()->isQuorum()) {
+        if ($this->getRabbitMQConfig()->isQuorum()) {
             $arguments['x-queue-type'] = 'quorum';
         }
 
@@ -639,7 +639,7 @@ protected function getDelayQueueArguments(string $destination, int $ttl): array
      */
     protected function getExchange(?string $exchange = null): string
     {
-        return $exchange ?? $this->getConfig()->getExchange();
+        return $exchange ?? $this->getRabbitMQConfig()->getExchange();
     }
 
     /**
@@ -648,15 +648,15 @@ protected function getExchange(?string $exchange = null): string
      */
     protected function getRoutingKey(string $destination): string
     {
-        return ltrim(sprintf($this->getConfig()->getExchangeRoutingKey(), $destination), '.');
+        return ltrim(sprintf($this->getRabbitMQConfig()->getExchangeRoutingKey(), $destination), '.');
     }
 
     /**
      * Get the exchangeType, or AMQPExchangeType::DIRECT as default.
      */
     protected function getExchangeType(?string $type = null): string
     {
-        $constant = AMQPExchangeType::class.'::'.Str::upper($type ?: $this->getConfig()->getExchangeType());
+        $constant = AMQPExchangeType::class.'::'.Str::upper($type ?: $this->getRabbitMQConfig()->getExchangeType());
 
         return defined($constant) ? constant($constant) : AMQPExchangeType::DIRECT;
     }
@@ -666,7 +666,7 @@ protected function getExchangeType(?string $type = null): string
      */
     protected function getFailedExchange(?string $exchange = null): string
     {
-        return $exchange ?? $this->getConfig()->getFailedExchange();
+        return $exchange ?? $this->getRabbitMQConfig()->getFailedExchange();
     }
 
     /**
@@ -675,7 +675,7 @@ protected function getFailedExchange(?string $exchange = null): string
      */
     protected function getFailedRoutingKey(string $destination): string
     {
-        return ltrim(sprintf($this->getConfig()->getFailedRoutingKey(), $destination), '.');
+        return ltrim(sprintf($this->getRabbitMQConfig()->getFailedRoutingKey(), $destination), '.');
     }
 
     /**
@@ -735,9 +735,9 @@ protected function publishProperties($queue, array $options = []): array
         return [$destination, $exchange, $exchangeType, $attempts];
     }
 
-    protected function getConfig(): QueueConfig
+    protected function getRabbitMQConfig(): QueueConfig
     {
-        return $this->config;
+        return $this->rabbitMQConfig;
     }
 
     /**

tests/Feature/ConnectorTest.php

@@ -12,7 +12,7 @@
 
 class ConnectorTest extends \VladimirYuldashev\LaravelQueueRabbitMQ\Tests\TestCase
 {
-    public function test_lazy_connection(): void
+    public function testLazyConnection(): void
     {
         $this->app['config']->set('queue.connections.rabbitmq', [
             'driver' => 'rabbitmq',
@@ -55,7 +55,7 @@ public function test_lazy_connection(): void
         $this->assertTrue($connection->getConnection()->isConnected());
     }
 
-    public function test_lazy_stream_connection(): void
+    public function testLazyStreamConnection(): void
     {
         $this->app['config']->set('queue.connections.rabbitmq', [
             'driver' => 'rabbitmq',
@@ -98,7 +98,7 @@ public function test_lazy_stream_connection(): void
         $this->assertTrue($connection->getConnection()->isConnected());
     }
 
-    public function test_ssl_connection(): void
+    public function testSslConnection(): void
     {
         $this->markTestSkipped();
 
@@ -142,7 +142,7 @@ public function test_ssl_connection(): void
     }
 
     // Test to validate ssl connection params
-    public function test_no_verification_ssl_connection(): void
+    public function testNoVerificationSslConnection(): void
     {
         $this->app['config']->set('queue.connections.rabbitmq', [
             'driver' => 'rabbitmq',

tests/Feature/QueueTest.php

@@ -20,12 +20,12 @@ protected function setUp(): void
         ]);
     }
 
-    public function test_connection(): void
+    public function testConnection(): void
     {
         $this->assertInstanceOf(AMQPStreamConnection::class, $this->connection()->getChannel()->getConnection());
     }
 
-    public function test_without_reconnect(): void
+    public function testWithoutReconnect(): void
     {
         $queue = $this->connection('rabbitmq');
 

tests/Feature/SslQueueTest.php

@@ -43,7 +43,7 @@ protected function getEnvironmentSetUp($app): void
         ]);
     }
 
-    public function test_connection(): void
+    public function testConnection(): void
     {
         $this->assertInstanceOf(AMQPSSLConnection::class, $this->connection()->getChannel()->getConnection());
     }