Merge pull request #63 from sandrokeil/feature/disable-isolated

Allow to disable MongoDB $isolated

Author: codeliner

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7
 

src/Container/MongoDbEventStoreAdapterFactory.php

@@ -58,7 +58,8 @@ public function __invoke(ContainerInterface $container)
             $config['db_name'],
             $config['write_concern'],
             $config['transaction_timeout'],
-            $config['stream_collection_map']
+            $config['stream_collection_map'],
+            !empty($config['disable_isolated']) ? true : false
         );
     }
 

src/MongoDbEventStoreAdapter.php

@@ -89,6 +89,15 @@ final class MongoDbEventStoreAdapter implements Adapter, CanHandleTransaction
      */
     private $streamCollectionMap = [];
 
+    /**
+     * Disable $isolated in MongoDB update
+     *
+     * This is only useful if you want to upgrade to MongoDB 4.0
+     *
+     * @var bool
+     */
+    private $disableIsolated;
+
     /**
      * @param MessageFactory $messageFactory
      * @param MessageConverter $messageConverter
@@ -97,6 +106,7 @@ final class MongoDbEventStoreAdapter implements Adapter, CanHandleTransaction
      * @param array|null $writeConcern
      * @param int|null $transactionTimeout
      * @param array $streamCollectionMap
+     * @param bool $disableIsolated
      */
     public function __construct(
         MessageFactory $messageFactory,
@@ -105,7 +115,8 @@ public function __construct(
         $dbName,
         array $writeConcern = null,
         $transactionTimeout = null,
-        array $streamCollectionMap = []
+        array $streamCollectionMap = [],
+        $disableIsolated = false
     ) {
         Assertion::minLength($dbName, 1, 'Mongo database name is missing');
 
@@ -114,6 +125,7 @@ public function __construct(
         $this->mongoClient      = $mongoClient;
         $this->dbName           = $dbName;
         $this->streamCollectionMap = $streamCollectionMap;
+        $this->disableIsolated = (bool)$disableIsolated;
 
         if (null !== $writeConcern) {
             $this->writeConcern = $writeConcern;
@@ -302,12 +314,18 @@ public function commit()
 
         $updateBatch = $this->getUpdateBatch($this->currentStreamName);
 
+        $q = [
+            'transaction_id' => $this->transactionId,
+            '$isolated' => 1
+        ];
+
+        if ($this->disableIsolated) {
+            unset($q['$isolated']);
+        }
+
         $updateBatch->add(
             [
-                'q' => [
-                    'transaction_id' => $this->transactionId,
-                    '$isolated' => 1
-                ],
+                'q' => $q,
                 'u' => [
                     '$unset' => [
                         'expire_at' => 1,

tests/MongoDbEventStoreAdapterTest.php renamed to tests/AbstractMongoDbEventStoreAdapterTest.php

@@ -24,17 +24,17 @@
  * Class MongoDbEventStoreAdapterTest
  * @package ProophTest\EventStore\Adapter\MongoDb
  */
-final class MongoDbEventStoreAdapterTest extends TestCase
+abstract class AbstractMongoDbEventStoreAdapterTest extends TestCase
 {
     /**
      * @var MongoDbEventStoreAdapter
      */
-    private $adapter;
+    protected $adapter;
 
     /**
      * @var \MongoClient
      */
-    private $client;
+    protected $client;
 
     protected function setUp()
     {
@@ -47,10 +47,16 @@ protected function setUp()
             new FQCNMessageFactory(),
             new NoOpMessageConverter(),
             $this->client,
-            $dbName
+            $dbName,
+            null,
+            null,
+            [],
+            $this->disableIsolated()
         );
     }
 
+    abstract public function disableIsolated();
+
     protected function tearDown()
     {
         if (null !== $this->client) {

tests/MongoDbEventStoreAdapterDisabledIsolatedTest.php

@@ -0,0 +1,24 @@
+<?php
+/*
+ * This file is part of the prooph/event-store-mongodb-adapter.
+ * (c) 2014 - 2015 prooph software GmbH <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Date: 08/08/15 - 20:32
+ */
+
+namespace ProophTest\EventStore\Adapter\MongoDb;
+
+/**
+ * Class MongoDbEventStoreAdapterTest
+ * @package ProophTest\EventStore\Adapter\MongoDb
+ */
+final class MongoDbEventStoreAdapterDisabledIsolatedTest extends AbstractMongoDbEventStoreAdapterTest
+{
+    public function disableIsolated()
+    {
+        return true;
+    }
+}

tests/MongoDbEventStoreAdapterIsolatedTest.php

@@ -0,0 +1,24 @@
+<?php
+/*
+ * This file is part of the prooph/event-store-mongodb-adapter.
+ * (c) 2014 - 2015 prooph software GmbH <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Date: 08/08/15 - 20:32
+ */
+
+namespace ProophTest\EventStore\Adapter\MongoDb;
+
+/**
+ * Class MongoDbEventStoreAdapterTest
+ * @package ProophTest\EventStore\Adapter\MongoDb
+ */
+final class MongoDbEventStoreAdapterIsolatedTest extends AbstractMongoDbEventStoreAdapterTest
+{
+    public function disableIsolated()
+    {
+        return false;
+    }
+}