Fixes zendframework/zendframework#6281

zendframework · Jul 28, 2014 · 98a5f68 · 98a5f68
1 parent bfab3bd
commit 98a5f68
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/SaveHandler/MongoDBOptions.php b/src/SaveHandler/MongoDBOptions.php
@@ -142,6 +142,9 @@ public function setSaveOptions(array $saveOptions)
      */
     public function getSaveOptions()
     {
+        if ($this->saveOptions == array('w' => 1) && version_compare(phpversion('mongo'), '1.3.0', '<')) {
+            $this->saveOptions = array('safe' => true);
+        }
         return $this->saveOptions;
     }
 

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' => true);
+        $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
         $this->assertEquals('name', $options->getNameField());
         $this->assertEquals('data', $options->getDataField());
         $this->assertEquals('lifetime', $options->getLifetimeField());
@@ -31,10 +32,11 @@ public function testDefaults()
 
     public function testSetConstructor()
     {
+        $defaultSaveOptions = version_compare(phpversion('mongo'), '1.3.0', '<') ? array('safe' => 2) : array('w' => 2);
         $options = new MongoDBOptions(array(
             'database' => 'testDatabase',
             'collection' => 'testCollection',
-            'saveOptions' => array('w' => 2),
+            'saveOptions' => $defaultSaveOptions,
             'nameField' => 'testName',
             'dataField' => 'testData',
             'lifetimeField' => 'testLifetime',
@@ -43,7 +45,7 @@ public function testSetConstructor()
 
         $this->assertEquals('testDatabase', $options->getDatabase());
         $this->assertEquals('testCollection', $options->getCollection());
-        $this->assertEquals(array('w' => 2), $options->getSaveOptions());
+        $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
         $this->assertEquals('testName', $options->getNameField());
         $this->assertEquals('testData', $options->getDataField());
         $this->assertEquals('testLifetime', $options->getLifetimeField());
@@ -52,18 +54,19 @@ public function testSetConstructor()
 
     public function testSetters()
     {
+        $defaultSaveOptions = version_compare(phpversion('mongo'), '1.3.0', '<') ? array('safe' => 2) : array('w' => 2);
         $options = new MongoDBOptions();
         $options->setDatabase('testDatabase')
                 ->setCollection('testCollection')
-                ->setSaveOptions(array('w' => 2))
+                ->setSaveOptions($defaultSaveOptions)
                 ->setNameField('testName')
                 ->setDataField('testData')
                 ->setLifetimeField('testLifetime')
                 ->setModifiedField('testModified');
 
         $this->assertEquals('testDatabase', $options->getDatabase());
         $this->assertEquals('testCollection', $options->getCollection());
-        $this->assertEquals(array('w' => 2), $options->getSaveOptions());
+        $this->assertEquals($defaultSaveOptions, $options->getSaveOptions());
         $this->assertEquals('testName', $options->getNameField());
         $this->assertEquals('testData', $options->getDataField());
         $this->assertEquals('testLifetime', $options->getLifetimeField());