develop

Author: makasim

composer.json

@@ -42,8 +42,7 @@
     "symfony/console": "^2.8|^3|^4",
     "friendsofphp/php-cs-fixer": "^2",
     "empi89/php-amqp-stubs": "*@dev",
-    "php-http/client-common": "^1.7@dev",
-    "mongodb/mongodb": "^1.3"
+    "php-http/client-common": "^1.7@dev"
   },
   "autoload": {
     "files": [

docker-compose.yml

@@ -108,6 +108,7 @@ services:
       image: mongo
       ports:
         - "27017:27017"
+
 volumes:
   mysql-data:
     driver: local

pkg/mongodb/MongodbConsumer.php

@@ -135,8 +135,18 @@ protected function receiveMessage()
     {
         $now = time();
         $collection = $this->context->getCollection();
-        $message = $collection->findOneAndDelete(['$or' => [['delayed_until' => ['$exists' => false]], ['delayed_until' => ['$lte' => $now]]]],
-            ['sort' => ['priority' => -1, 'published_at' => 1], 'typeMap' => ['root' => 'array', 'document' => 'array']]);
+        $message = $collection->findOneAndDelete(
+            [
+                '$or' => [
+                    ['delayed_until' => ['$exists' => false]],
+                    ['delayed_until' => ['$lte' => $now]],
+                ],
+            ],
+            [
+                'sort' => ['priority' => -1, 'published_at' => 1],
+                'typeMap' => ['root' => 'array', 'document' => 'array'],
+            ]
+        );
 
         if (!$message) {
             return null;
@@ -154,7 +164,7 @@ protected function receiveMessage()
     protected function convertMessage(array $mongodbMessage)
     {
         $message = $this->context->createMessage($mongodbMessage['body'], $mongodbMessage['properties'], $mongodbMessage['headers']);
-        $message->setId($mongodbMessage['_id']->__toString());
+        $message->setId((string) $mongodbMessage['_id']);
         $message->setPriority((int) $mongodbMessage['priority']);
         $message->setRedelivered((bool) $mongodbMessage['redelivered']);
         $message->setPublishedAt((int) $mongodbMessage['published_at']);

pkg/mongodb/MongodbContext.php

@@ -78,7 +78,10 @@ public function close()
 
     public function getCollection()
     {
-        return $this->client->selectDatabase($this->config['dbname'])->selectCollection($this->config['collection_name']);
+        return $this->client
+            ->selectDatabase($this->config['dbname'])
+            ->selectCollection($this->config['collection_name'])
+            ;
     }
 
     /**

pkg/mongodb/composer.json

@@ -10,7 +10,7 @@
   "homepage": "https://enqueue.forma-pro.com/",
   "license": "MIT",
   "require": {
-    "php": ">=5.6",
+    "php": "^7.1",
     "queue-interop/queue-interop": "^0.6@dev|^1.0.0-alpha1",
     "mongodb/mongodb": "^1.3"
   },