Merge pull request #61 from php-enqueue/client-hardcode-queue-name

[client] Add ability to hardcode queue name. It is used as is and not adjusted or modified in any way

bin/release

@@ -13,7 +13,7 @@ fi
 
 CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 
-for REMOTE in origin psr-queue stomp amqp-ext fs redis dbal enqueue enqueue-bundle job-queue test
+for REMOTE in origin psr-queue stomp amqp-ext fs redis dbal null enqueue enqueue-bundle job-queue test
 do
 	TMP_DIR="/tmp/enqueue-repo"
     REMOTE_URL=`git remote get-url $REMOTE`

bin/subtree-split

@@ -50,6 +50,7 @@ remote amqp-ext [email protected]:php-enqueue/amqp-ext.git
 remote fs [email protected]:php-enqueue/fs.git
 remote redis [email protected]:php-enqueue/redis.git
 remote dbal [email protected]:php-enqueue/dbal.git
+remote null [email protected]:php-enqueue/null.git
 remote enqueue-bundle [email protected]:php-enqueue/enqueue-bundle.git
 remote job-queue [email protected]:php-enqueue/job-queue.git
 remote test [email protected]:php-enqueue/test.git
@@ -61,6 +62,7 @@ split 'pkg/amqp-ext' amqp-ext
 split 'pkg/fs' fs
 split 'pkg/redis' redis
 split 'pkg/dbal' dbal
+split 'pkg/null' null
 split 'pkg/enqueue-bundle' enqueue-bundle
 split 'pkg/job-queue' job-queue
 split 'pkg/test' test

composer.json

@@ -10,6 +10,7 @@
     "enqueue/amqp-ext": "*@dev",
     "enqueue/redis": "*@dev",
     "enqueue/fs": "*@dev",
+    "enqueue/null": "*@dev",
     "enqueue/dbal": "*@dev",
     "enqueue/enqueue-bundle": "*@dev",
     "enqueue/job-queue": "*@dev",
@@ -64,6 +65,10 @@
       "type": "path",
       "url": "pkg/fs"
     },
+    {
+      "type": "path",
+      "url": "pkg/null"
+    },
     {
       "type": "path",
       "url": "pkg/dbal"

docs/transport/null.md

@@ -10,14 +10,14 @@ Useful in tests for example.
 ## Installation
 
 ```bash
-$ composer require enqueue/enqueue
+$ composer require enqueue/null
 ```
 
 ## Create context
 
 ```php
 <?php
-use Enqueue\Transport\Null\NullConnectionFactory;
+use Enqueue\Null\NullConnectionFactory;
 
 $connectionFactory = new NullConnectionFactory();
 

phpunit.xml.dist

@@ -21,11 +21,11 @@
             <directory>pkg/enqueue/Tests</directory>
         </testsuite>
 
-        <testsuite name="stomp">
+        <testsuite name="stomp transport">
             <directory>pkg/stomp/Tests</directory>
         </testsuite>
 
-        <testsuite name="amqp-ext">
+        <testsuite name="amqp-ext transport">
             <directory>pkg/amqp-ext/Tests</directory>
         </testsuite>
 
@@ -41,6 +41,10 @@
             <directory>pkg/dbal/Tests</directory>
         </testsuite>
 
+        <testsuite name="null transport">
+            <directory>pkg/null/Tests</directory>
+        </testsuite>
+
         <testsuite name="enqueue-bundle">
             <directory>pkg/enqueue-bundle/Tests</directory>
         </testsuite>

pkg/amqp-ext/Client/AmqpDriver.php

@@ -115,7 +115,9 @@ public function setupBroker(LoggerInterface $logger = null)
      */
     public function createQueue($queueName)
     {
-        $queue = $this->context->createQueue($this->config->createTransportQueueName($queueName));
+        $transportName = $this->queueMetaRegistry->getQueueMeta($queueName)->getTransportName();
+
+        $queue = $this->context->createQueue($transportName);
         $queue->addFlag(AMQP_DURABLE);
 
         return $queue;

pkg/amqp-ext/Tests/AmqpContextTest.php

@@ -12,8 +12,8 @@
 use Enqueue\Psr\PsrContext;
 use Enqueue\Psr\InvalidDestinationException;
 use Enqueue\Test\ClassExtensionTrait;
-use Enqueue\Transport\Null\NullQueue;
-use Enqueue\Transport\Null\NullTopic;
+use Enqueue\Null\NullQueue;
+use Enqueue\Null\NullTopic;
 use PHPUnit\Framework\TestCase;
 
 class AmqpContextTest extends TestCase
@@ -96,7 +96,7 @@ public function testShouldThrowIfNotAmqpTopicGivenOnDeleteTopicCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Transport\Null\NullTopic.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Null\NullTopic.');
         $context->deleteTopic(new NullTopic('aName'));
     }
 
@@ -105,7 +105,7 @@ public function testShouldThrowIfNotAmqpTopicGivenOnDeclareTopicCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Transport\Null\NullTopic.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Null\NullTopic.');
         $context->declareTopic(new NullTopic('aName'));
     }
 
@@ -128,7 +128,7 @@ public function testShouldThrowIfNotAmqpQueueGivenOnDeleteQueueCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Transport\Null\NullQueue.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Null\NullQueue.');
         $context->deleteQueue(new NullQueue('aName'));
     }
 
@@ -137,7 +137,7 @@ public function testShouldThrowIfNotAmqpQueueGivenOnDeclareQueueCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Transport\Null\NullQueue.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Null\NullQueue.');
         $context->declareQueue(new NullQueue('aName'));
     }
 
@@ -172,7 +172,7 @@ public function testShouldThrowIfNotAmqpQueueGivenOnCreateConsumerCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Transport\Null\NullQueue.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Null\NullQueue.');
         $context->createConsumer(new NullQueue('aName'));
     }
 
@@ -181,7 +181,7 @@ public function testShouldThrowIfNotAmqpTopicGivenOnCreateConsumerCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Transport\Null\NullTopic.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Null\NullTopic.');
         $context->createConsumer(new NullTopic('aName'));
     }
 
@@ -291,7 +291,7 @@ public function testShouldThrowIfSourceNotAmqpTopicOnBindCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Transport\Null\NullTopic.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpTopic but got Enqueue\Null\NullTopic.');
         $context->bind(new NullTopic('aName'), new AmqpQueue('aName'));
     }
 
@@ -300,7 +300,7 @@ public function testShouldThrowIfTargetNotAmqpQueueOnBindCall()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Transport\Null\NullQueue.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Null\NullQueue.');
         $context->bind(new AmqpTopic('aName'), new NullQueue('aName'));
     }
 
@@ -309,7 +309,7 @@ public function testShouldThrowIfGivenQueueNotAmqpQueueOnPurge()
         $context = new AmqpContext($this->createExtChannelMock());
 
         $this->expectException(InvalidDestinationException::class);
-        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Transport\Null\NullQueue.');
+        $this->expectExceptionMessage('The destination must be an instance of Enqueue\AmqpExt\AmqpQueue but got Enqueue\Null\NullQueue.');
         $context->purge(new NullQueue('aName'));
     }
 
@@ -326,6 +326,9 @@ private function createExtChannelMock()
      */
     private function createExtConnectionMock()
     {
-        return $this->createMock(\AMQPConnection::class);
+        return $this->getMockBuilder(\AMQPConnection::class)
+            ->setMethods(['isPersistent', 'isConnected', 'pdisconnect', 'disconnect'])
+            ->getMock()
+        ;
     }
 }