Merge branch 'hotfix/zendframework/zendframework#6361-fix-zendframewo…

…rk/zf2#6281-mongodb-saveoptions-not-recognized' Close zendframework/zendframework#6361 Close zendframework/zendframework#6281
zendframework · Jul 28, 2014 · 4506dc7 · 4506dc7
2 parents bfab3bd + 1d63254
commit 4506dc7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/SaveHandler/MongoDBOptions.php b/src/SaveHandler/MongoDBOptions.php
@@ -68,6 +68,19 @@ class MongoDBOptions extends AbstractOptions
      */
     protected $modifiedField = 'modified';
 
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct($options = null)
+    {
+        parent::__construct($options);
+
+        if ($this->saveOptions === array('w' => 1) && version_compare(phpversion('mongo'), '1.3.0', '<')) {
+            $this->saveOptions = array('safe' => true);
+        }
+    }
+
     /**
      * Set database name
      *

diff --git a/test/SaveHandler/MongoDBOptionsTest.php b/test/SaveHandler/MongoDBOptionsTest.php
@@ -22,7 +22,8 @@ public function testDefaults()
         $options = new MongoDBOptions();
         $this->assertNull($options->getDatabase());
         $this->assertNull($options->getCollection());
-        $this->assertEquals(array('w' => true), $options->getSaveOptions());
+        $defaultSaveOptions = version_compare(phpversion('mongo'), '1.3.0', '<') ? array('safe' => true) : array('w' => 1);
+        $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
         $this->assertEquals('name', $options->getNameField());
         $this->assertEquals('data', $options->getDataField());
         $this->assertEquals('lifetime', $options->getLifetimeField());