mongodb transport, fixes

makasim · makasim · commit 1b2327099d91 · 2018-05-03T22:59:49.000+03:00
diff --git a/bin/run-fun-test.sh b/bin/run-fun-test.sh
@@ -3,4 +3,4 @@
 set -x
 set -e
 
-COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@"
+docker-compose run --workdir="/mqdev" --rm dev ./bin/test "$@"
diff --git a/composer.json b/composer.json
@@ -61,7 +61,8 @@
     "platform": {
       "ext-amqp": "1.9.3",
       "ext-gearman": "1.1",
-      "ext-rdkafka": "3.3"
+      "ext-rdkafka": "3.3",
+      "ext-mongodb": "1.3"
     }
   },
   "repositories": [
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -105,7 +105,7 @@ services:
       entrypoint: 'gcloud beta emulators pubsub start --host-port=0.0.0.0:8085'
 
   mongo:
-      image: mongo
+      image: mongo:3.7
       ports:
         - "27017:27017"
 
diff --git a/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php b/pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php
@@ -14,7 +14,6 @@
 use Interop\Queue\PsrQueue;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * @group functional
@@ -93,14 +92,11 @@ public function provideEnqueueConfigs()
             ],
         ]];
 
-        // Symfony 2.x does not such env syntax
-        if (version_compare(Kernel::VERSION, '3.2', '>=')) {
-            yield 'default_dsn_as_env' => [[
-                'transport' => [
-                    'default' => '%env(AMQP_DSN)%',
-                ],
-            ]];
-        }
+        yield 'default_dsn_as_env' => [[
+            'transport' => [
+                'default' => '%env(AMQP_DSN)%',
+            ],
+        ]];
 
         yield 'default_dbal_as_dsn' => [[
             'transport' => [
diff --git a/pkg/mongodb/JSON.php b/pkg/mongodb/JSON.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Enqueue\Mongodb;
+
+class JSON
+{
+    /**
+     * @param string $string
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return array
+     */
+    public static function decode($string)
+    {
+        if (!is_string($string)) {
+            throw new \InvalidArgumentException(sprintf(
+                'Accept only string argument but got: "%s"',
+                is_object($string) ? get_class($string) : gettype($string)
+            ));
+        }
+
+        // PHP7 fix - empty string and null cause syntax error
+        if (empty($string)) {
+            return null;
+        }
+
+        $decoded = json_decode($string, true);
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf(
+                'The malformed json given. Error %s and message %s',
+                json_last_error(),
+                json_last_error_msg()
+            ));
+        }
+
+        return $decoded;
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return string
+     */
+    public static function encode($value)
+    {
+        $encoded = json_encode($value, JSON_UNESCAPED_UNICODE);
+
+        if (JSON_ERROR_NONE !== json_last_error()) {
+            throw new \InvalidArgumentException(sprintf(
+                'Could not encode value into json. Error %s and message %s',
+                json_last_error(),
+                json_last_error_msg()
+            ));
+        }
+
+        return $encoded;
+    }
+}
diff --git a/pkg/mongodb/MongodbConnectionFactory.php b/pkg/mongodb/MongodbConnectionFactory.php
@@ -16,7 +16,7 @@ class MongodbConnectionFactory implements PsrConnectionFactory
      * The config could be an array, string DSN or null. In case of null it will attempt to connect to Mongodb localhost with default credentials.
      *
      * $config = [
-     *   'uri' => 'mongodb://127.0.0.1/' - Mongodb connection string. see http://docs.mongodb.org/manual/reference/connection-string/
+     *   'dsn' => 'mongodb://127.0.0.1/' - Mongodb connection string. see http://docs.mongodb.org/manual/reference/connection-string/
      *   'dbname' => 'enqueue',          - database name.
      *   'collection_name' => 'enqueue'  - collection name
      *   'polling_interval' => '1000',   - How often query for new messages (milliseconds)
@@ -39,7 +39,7 @@ public function __construct($config = 'mongodb:')
             throw new \LogicException('The config must be either an array of options, a DSN string or null');
         }
         $config = array_replace([
-            'uri' => 'mongodb://127.0.0.1/',
+            'dsn' => 'mongodb://127.0.0.1/',
             'dbname' => 'enqueue',
             'collection_name' => 'enqueue',
         ], $config);
@@ -49,7 +49,7 @@ public function __construct($config = 'mongodb:')
 
     public function createContext()
     {
-        $client = new Client($this->config['uri']);
+        $client = new Client($this->config['dsn']);
 
         return new MongodbContext($client, $this->config);
     }
@@ -75,10 +75,10 @@ public static function parseDsn($dsn)
         }
         if ('mongodb:' === $dsn) {
             return [
-                'uri' => 'mongodb://127.0.0.1/',
+                'dsn' => 'mongodb://127.0.0.1/',
             ];
         }
-        $config['uri'] = $dsn;
+        $config['dsn'] = $dsn;
         if (isset($parsedUrl['path']) && '/' !== $parsedUrl['path']) {
             $pathParts = explode('/', $parsedUrl['path']);
             //DB name
diff --git a/pkg/mongodb/MongodbConsumer.php b/pkg/mongodb/MongodbConsumer.php
@@ -163,7 +163,10 @@ protected function receiveMessage()
      */
     protected function convertMessage(array $mongodbMessage)
     {
-        $message = $this->context->createMessage($mongodbMessage['body'], $mongodbMessage['properties'], $mongodbMessage['headers']);
+        $properties = JSON::decode($mongodbMessage['properties']);
+        $headers = JSON::decode($mongodbMessage['headers']);
+
+        $message = $this->context->createMessage($mongodbMessage['body'], $properties, $headers);
         $message->setId((string) $mongodbMessage['_id']);
         $message->setPriority((int) $mongodbMessage['priority']);
         $message->setRedelivered((bool) $mongodbMessage['redelivered']);
diff --git a/pkg/mongodb/MongodbProducer.php b/pkg/mongodb/MongodbProducer.php
@@ -80,8 +80,8 @@ public function send(PsrDestination $destination, PsrMessage $message)
         $mongoMessage = [
             'published_at' => $publishedAt,
             'body' => $body,
-            'headers' => $message->getHeaders(),
-            'properties' => $message->getProperties(),
+            'headers' => JSON::encode($message->getHeaders()),
+            'properties' => JSON::encode($message->getProperties()),
             'priority' => $message->getPriority(),
             'queue' => $destination->getName(),
             'redelivered' => $message->isRedelivered(),
diff --git a/pkg/mongodb/Tests/Functional/MongodbConsumerTest.php b/pkg/mongodb/Tests/Functional/MongodbConsumerTest.php
@@ -4,15 +4,15 @@
 
 use Enqueue\Mongodb\MongodbContext;
 use Enqueue\Mongodb\MongodbMessage;
-use Enqueue\Mongodb\Tests\Spec\CreateMongodbContextTrait;
+use Enqueue\Test\MongodbExtensionTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
  * @group functional
  */
 class MongodbConsumerTest extends TestCase
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * @var MongodbContext
@@ -21,7 +21,7 @@ class MongodbConsumerTest extends TestCase
 
     public function setUp()
     {
-        $this->context = $this->createMongodbContext();
+        $this->context = $this->buildMongodbContext();
     }
 
     protected function tearDown()
diff --git a/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php b/pkg/mongodb/Tests/MongodbConnectionFactoryTest.php
@@ -22,7 +22,7 @@ public function testShouldImplementConnectionFactoryInterface()
     public function testCouldBeConstructedWithEmptyConfiguration()
     {
         $params = [
-            'uri' => 'mongodb://127.0.0.1/',
+            'dsn' => 'mongodb://127.0.0.1/',
             'dbname' => 'enqueue',
             'collection_name' => 'enqueue',
         ];
@@ -34,7 +34,7 @@ public function testCouldBeConstructedWithEmptyConfiguration()
     public function testCouldBeConstructedWithCustomConfiguration()
     {
         $params = [
-            'uri' => 'mongodb://127.0.0.3/',
+            'dsn' => 'mongodb://127.0.0.3/',
             'uriOptions' => ['testValue' => 123],
             'driverOptions' => ['testValue' => 123],
             'dbname' => 'enqueue',
diff --git a/pkg/mongodb/Tests/Spec/MongodbContextTest.php b/pkg/mongodb/Tests/Spec/MongodbContextTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\PsrContextSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbContextTest extends PsrContextSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbProducerTest.php b/pkg/mongodb/Tests/Spec/MongodbProducerTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\PsrProducerSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbProducerTest extends PsrProducerSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createProducer()
     {
-        return $this->createMongodbContext()->createProducer();
+        return $this->buildMongodbContext()->createProducer();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbRequeueMessageTest.php b/pkg/mongodb/Tests/Spec/MongodbRequeueMessageTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\RequeueMessageSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbRequeueMessageTest extends RequeueMessageSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendAndReceiveDelayedMessageFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendAndReceiveDelayedMessageFromQueueTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbSendAndReceiveDelayedMessageFromQueueTest extends SendAndReceiveDelayedMessageFromQueueSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendAndReceivePriorityMessagesFromQueueTest.php
@@ -4,6 +4,7 @@
 
 use Enqueue\Mongodb\MongodbContext;
 use Enqueue\Mongodb\MongodbMessage;
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\PsrContext;
 use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec;
 
@@ -13,7 +14,7 @@
  */
 class MongodbSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePriorityMessagesFromQueueSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     private $publishedAt;
 
@@ -29,7 +30,7 @@ public function setUp()
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 
     /**
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendAndReceiveTimeToLiveMessagesFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendAndReceiveTimeToLiveMessagesFromQueueTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\SendAndReceiveTimeToLiveMessagesFromQueueSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbSendAndReceiveTimeToLiveMessagesFromQueueTest extends SendAndReceiveTimeToLiveMessagesFromQueueSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveFromQueueTest.php
@@ -2,6 +2,7 @@
 
 namespace Enqueue\Mongodb\Tests\Spec;
 
+use Enqueue\Test\MongodbExtensionTrait;
 use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;
 
 /**
@@ -10,13 +11,13 @@
  */
 class MongodbSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
-    use CreateMongodbContextTrait;
+    use MongodbExtensionTrait;
 
     /**
      * {@inheritdoc}
      */
     protected function createContext()
     {
-        return $this->createMongodbContext();
+        return $this->buildMongodbContext();
     }
 }
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveFromTopicTest.php b/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveFromTopicTest.php
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveNoWaitFromQueueTest.php b/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveNoWaitFromQueueTest.php
diff --git a/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveNoWaitFromTopicTest.php b/pkg/mongodb/Tests/Spec/MongodbSendToAndReceiveNoWaitFromTopicTest.php
diff --git a/pkg/mongodb/composer.json b/pkg/mongodb/composer.json
diff --git a/pkg/simple-client/SimpleClient.php b/pkg/simple-client/SimpleClient.php
diff --git a/pkg/simple-client/Tests/Functional/SimpleClientTest.php b/pkg/simple-client/Tests/Functional/SimpleClientTest.php
diff --git a/pkg/test/MongodbExtensionTrait.php b/pkg/test/MongodbExtensionTrait.php

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Enqueue\Mongodb\Tests\Spec;`
`4`	`4`
	`5`	`+use Enqueue\Test\MongodbExtensionTrait;`
`5`	`6`	`use Interop\Queue\Spec\PsrContextSpec;`
`6`	`7`
`7`	`8`	`/**`
`@@ -10,13 +11,13 @@`
`10`	`11`	`*/`
`11`	`12`	`class MongodbContextTest extends PsrContextSpec`
`12`	`13`	`{`
`13`		`- use CreateMongodbContextTrait;`
	`14`	`+ use MongodbExtensionTrait;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* {@inheritdoc}`
`17`	`18`	`*/`
`18`	`19`	`protected function createContext()`
`19`	`20`	`{`
`20`		`- return $this->createMongodbContext();`
	`21`	`+ return $this->buildMongodbContext();`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use Enqueue\Mongodb\MongodbContext;`
`6`	`6`	`use Enqueue\Mongodb\MongodbMessage;`
	`7`	`+use Enqueue\Test\MongodbExtensionTrait;`
`7`	`8`	`use Interop\Queue\PsrContext;`
`8`	`9`	`use Interop\Queue\Spec\SendAndReceivePriorityMessagesFromQueueSpec;`
`9`	`10`
`@@ -13,7 +14,7 @@`
`13`	`14`	`*/`
`14`	`15`	`class MongodbSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePriorityMessagesFromQueueSpec`
`15`	`16`	`{`
`16`		`- use CreateMongodbContextTrait;`
	`17`	`+ use MongodbExtensionTrait;`
`17`	`18`
`18`	`19`	`private $publishedAt;`
`19`	`20`
`@@ -29,7 +30,7 @@ public function setUp()`
`29`	`30`	`*/`
`30`	`31`	`protected function createContext()`
`31`	`32`	`{`
`32`		`- return $this->createMongodbContext();`
	`33`	`+ return $this->buildMongodbContext();`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`/**`