remove RABBITMQ_HOST,PORT etc env vars.

Author: makasim

MongodbExtensionTrait.php

@@ -3,10 +3,11 @@
 namespace Enqueue\Test;
 
 use Enqueue\Mongodb\MongodbConnectionFactory;
+use Enqueue\Mongodb\MongodbContext;
 
 trait MongodbExtensionTrait
 {
-    protected function buildMongodbContext()
+    protected function buildMongodbContext(): MongodbContext
     {
         if (false == $env = getenv('MONGO_DSN')) {
             $this->markTestSkipped('The MONGO_DSN env is not available. Skip tests');

RabbitManagementExtensionTrait.php

@@ -2,22 +2,21 @@
 
 namespace Enqueue\Test;
 
+use Enqueue\Dsn\Dsn;
+
 trait RabbitManagementExtensionTrait
 {
     /**
      * @param string $queueName
      */
     private function removeQueue($queueName)
     {
-        $rabbitmqHost = getenv('RABBITMQ_HOST');
-        $rabbitmqUser = getenv('RABBITMQ_USER');
-        $rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
-        $rabbitmqVhost = getenv('RABBITMQ_VHOST');
+        $dsn = new Dsn(getenv('RABBITMQ_AMQP_DSN'));
 
         $url = sprintf(
             'http://%s:15672/api/queues/%s/%s',
-            $rabbitmqHost,
-            urlencode($rabbitmqVhost),
+            $dsn->getHost(),
+            urlencode(ltrim($dsn->getPath(), '/')),
             $queueName
         );
 
@@ -26,7 +25,7 @@ private function removeQueue($queueName)
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-        curl_setopt($ch, CURLOPT_USERPWD, $rabbitmqUser.':'.$rabbitmqPassword);
+        curl_setopt($ch, CURLOPT_USERPWD, $dsn->getUser().':'.$dsn->getPassword());
         curl_setopt($ch, CURLOPT_HTTPHEADER, [
             'Content-Type' => 'application/json',
         ]);
@@ -46,15 +45,12 @@ private function removeQueue($queueName)
      */
     private function removeExchange($exchangeName)
     {
-        $rabbitmqHost = getenv('RABBITMQ_HOST');
-        $rabbitmqUser = getenv('RABBITMQ_USER');
-        $rabbitmqPassword = getenv('RABBITMQ_PASSWORD');
-        $rabbitmqVhost = getenv('RABBITMQ_VHOST');
+        $dsn = new Dsn(getenv('RABBITMQ_AMQP_DSN'));
 
         $url = sprintf(
             'http://%s:15672/api/exchanges/%s/%s',
-            $rabbitmqHost,
-            urlencode($rabbitmqVhost),
+            $dsn->getHost(),
+            urlencode(ltrim($dsn->getPath(), '/')),
             $exchangeName
         );
 
@@ -63,7 +59,7 @@ private function removeExchange($exchangeName)
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-        curl_setopt($ch, CURLOPT_USERPWD, $rabbitmqUser.':'.$rabbitmqPassword);
+        curl_setopt($ch, CURLOPT_USERPWD, $dsn->getUser().':'.$dsn->getPassword());
         curl_setopt($ch, CURLOPT_HTTPHEADER, [
             'Content-Type' => 'application/json',
         ]);

RabbitmqAmqpExtension.php

@@ -12,27 +12,7 @@ trait RabbitmqAmqpExtension
      */
     private function buildAmqpContext()
     {
-        if (false == getenv('RABBITMQ_HOST')) {
-            throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
-        }
-
-        $config = [
-            'host' => getenv('RABBITMQ_HOST'),
-            'port' => getenv('RABBITMQ_AMQP__PORT'),
-            'user' => getenv('RABBITMQ_USER'),
-            'pass' => getenv('RABBITMQ_PASSWORD'),
-            'vhost' => getenv('RABBITMQ_VHOST'),
-        ];
-
-        return (new AmqpConnectionFactory($config))->createContext();
-    }
-
-    /**
-     * @return AmqpContext
-     */
-    private function buildAmqpContextFromDsn()
-    {
-        if (false == $dsn = getenv('AMQP_DSN')) {
+        if (false == $dsn = getenv('RABBITMQ_AMQP_DSN')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 

RabbitmqStompExtension.php

@@ -7,24 +7,12 @@
 
 trait RabbitmqStompExtension
 {
-    /**
-     * @return StompContext
-     */
-    private function buildStompContext()
+    private function buildStompContext(): StompContext
     {
-        if (false == getenv('RABBITMQ_HOST')) {
+        if (false == $dsn = getenv('RABITMQ_STOMP_DSN')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');
         }
 
-        $config = [
-            'host' => getenv('RABBITMQ_HOST'),
-            'port' => getenv('RABBITMQ_STOMP_PORT'),
-            'login' => getenv('RABBITMQ_USER'),
-            'password' => getenv('RABBITMQ_PASSWORD'),
-            'vhost' => getenv('RABBITMQ_VHOST'),
-            'sync' => true,
-        ];
-
-        return (new StompConnectionFactory($config))->createContext();
+        return (new StompConnectionFactory($dsn))->createContext();
     }
 }

SqsExtension.php

@@ -7,10 +7,7 @@
 
 trait SqsExtension
 {
-    /**
-     * @return SqsContext
-     */
-    private function buildSqsContext()
+    private function buildSqsContext(): SqsContext
     {
         if (false == getenv('AWS_SQS_ENDPOINT') && false == getenv('AWS_SQS_KEY')) {
             throw new \PHPUnit_Framework_SkippedTestError('Functional tests are not allowed in this environment');

composer.json

@@ -9,6 +9,9 @@
         "source": "https://github.com/php-enqueue/enqueue-dev",
         "docs": "https://github.com/php-enqueue/enqueue-dev/blob/master/docs/index.md"
     },
+    "require": {
+        "enqueue/dsn": "0.9.x-dev"
+    },
     "autoload": {
         "psr-4": { "Enqueue\\Test\\": "" }
     },