Merge pull request #164 from leroy-merlin-br/feat/upgrade-mongo-driver

Feat(MongoDB): Upgrade Driver

.gitignore

@@ -2,3 +2,5 @@
 /.coverage
 /build
 /site
+.idea
+coverage

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "mongodb/mongodb": "^1.3",
+        "mongodb/mongodb": "1.8.0",
         "illuminate/container": "^5.8 || ^6.0 || ^7.0 || ^8.0"
     },
     "require-dev": {

docker-compose.yml

@@ -9,8 +9,8 @@ services:
       - .:/var/www/html
 
   db:
-    image: mongo:4.0
-    command: mongod --smallfiles
+    image: mongo:4.2
+    command: mongod
     volumes:
       - db:/data/db
       - .:/var/www/html

src/Mongolid/Util/SequenceService.php

@@ -51,11 +51,16 @@ public function getNextValue(string $sequenceName): int
             ['upsert' => true]
         );
 
-        if ($sequenceValue) {
-            $_id = $sequenceValue->seq + 1;
+        if (!$sequenceValue) {
+            return 1;
         }
 
-        return $_id ?? 1;
+        // On MongoDB 4.0 or below, this value will be an
+        // object. From 4.1 it is returned as an array.
+        // so we cast it to object to make sure.
+        $sequenceValue = (object) $sequenceValue;
+
+        return $sequenceValue->seq + 1;
     }
 
     /**

tests/Mongolid/Util/SequenceServiceTest.php

@@ -38,9 +38,7 @@ public function testShouldGetNextValue($sequenceName, $currentValue, $expectatio
                 ['_id' => $sequenceName],
                 ['$inc' => ['seq' => 1]],
                 ['upsert' => true]
-            )->andReturn(
-                $currentValue ? (object) ['seq' => $currentValue] : null
-            );
+            )->andReturn($currentValue);
 
         // Assertion
         $this->assertEquals(
@@ -80,19 +78,22 @@ public function sequenceScenarios()
         return [
             'New sequence in collection "products"' => [
                 'sequenceName' => 'products',
-                'currentValue' => 0,
+                'currentValue' => null,
                 'expectation' => 1,
             ],
-            // -----------------------
             'Existing sequence in collection "unicorns"' => [
                 'sequenceName' => 'unicorns',
-                'currentValue' => 7,
+                'currentValue' => (object) ['seq' => 7],
                 'expectation' => 8,
             ],
-            // -----------------------
-            'Existing sequence in collection "unicorns"' => [
+            'Existing one more sequence in collection "unicorns"' => [
+                'sequenceName' => 'unicorns',
+                'currentValue' => (object) ['seq' => 3],
+                'expectation' => 4,
+            ],
+            'Returned as an array instead of object' => [
                 'sequenceName' => 'unicorns',
-                'currentValue' => 3,
+                'currentValue' => ['seq' => 3],
                 'expectation' => 4,
             ],
         ];