Merge pull request #63 from chadicus/bug/object-as-array

Bug/object as array

Author: chadicus

.travis.yml

@@ -2,18 +2,10 @@ language: php
 php:
   - 7.0
   - 5.6
-env:
-  - DB_PACKAGE=mongodb-10gen
-  - DB_PACKAGE=mongodb-org
-before_install:
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-  - "sudo apt-get update"
-  - "sudo apt-get install ${DB_PACKAGE}"
+services:
+  - mongodb
 before_script:
   - composer self-update
-  - printf "\n" | pecl install --force mongodb
-    # wait for mongo, start is only needed for 2.4 package, see http://tldp.org/LDP/abs/html/devref1.html for description of this syntax.
-  - sudo service mongodb start; bash -c 'while ! exec 6<>/dev/tcp/localhost/27017; do echo "$(date) - still trying to connect to mongo"; sleep 1; done'
+  - yes '' | pecl install -f mongodb-1.1
 script: ./build.php
 after_script: ./vendor/bin/coveralls -v

src/Queue.php

@@ -175,7 +175,8 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
         $resetTimestamp = min(max(0, $resetTimestamp * 1000), self::MONGO_INT32_MAX);
 
         $update = ['$set' => ['earliestGet' => new UTCDateTime($resetTimestamp)]];
-        $options = ['sort' => ['priority' => 1, 'created' => 1]];
+        $findOneAndUpdateOptions = ['sort' => ['priority' => 1, 'created' => 1]];
+        $findOneOptions = ['typeMap' => ['root' => 'array', 'document' => 'array', 'array' => 'array']];
 
         //ints overflow to floats, should be fine
         $end = microtime(true) + ($waitDurationInMillis / 1000.0);
@@ -189,14 +190,14 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
         }   //@codeCoverageIgnoreEnd
 
         while (true) {
-            $message = $this->collection->findOneAndUpdate($completeQuery, $update, $options);
-            //checking if _id exist because findAndModify doesnt seem to return null when it can't match the query on
-            //older mongo extension
-            if ($message !== null && array_key_exists('_id', $message)) {
+            $id = $this->getIdFromMessage(
+                $this->collection->findOneAndUpdate($completeQuery, $update, $findOneAndUpdateOptions)
+            );
+            if ($id !== null) {
                 // findOneAndUpdate does not correctly return result according to typeMap options so just refetch.
-                $message = $this->collection->findOne(['_id' => $message->_id]);
+                $message = $this->collection->findOne(['_id' => $id], $findOneOptions);
                 //id on left of union operator so a possible id in payload doesnt wipe it out the generated one
-                return ['id' => $message['_id']] + (array)$message['payload'];
+                return ['id' => $id] + $message['payload'];
             }
 
             if (microtime(true) >= $end) {
@@ -211,6 +212,19 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
     }
     //@codeCoverageIgnoreEnd
 
+    private function getIdFromMessage($message)
+    {
+        if (is_array($message)) {
+            return array_key_exists('_id', $message) ? $message['_id'] : null;
+        }
+
+        if (is_object($message)) {
+            return isset($message->_id) ? $message->_id : null;
+        }
+
+        return null;
+    }
+
     /**
      * Count queue messages.
      *