Added splitting of the options array as we're modifying it, and make sure we only accept array zvals for options.

Author: derickr

gridfs.c

@@ -412,9 +412,9 @@ PHP_METHOD(MongoGridFS, storeBytes) {
   chunks = zend_read_property(mongo_ce_GridFS, getThis(), "chunks", strlen("chunks"), NOISY TSRMLS_CC);
   ensure_gridfs_index(&temp, chunks TSRMLS_CC);
 
-  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|az", &bytes, &bytes_len, &extra, &options) == FAILURE) {
-    return;
-  }
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|aa/", &bytes, &bytes_len, &extra, &options) == FAILURE) {
+		return;
+	}
 
   // file array object
   MAKE_STD_ZVAL(zfile);
@@ -586,9 +586,9 @@ PHP_METHOD(MongoGridFS, storeFile) {
 
   ensure_gridfs_index(&temp, chunks TSRMLS_CC);
 
-  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|az", &fh, &extra, &options) == FAILURE) {
-    return;
-  }
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|aa/", &fh, &extra, &options) == FAILURE) {
+		return;
+	}
 
   if (Z_TYPE_P(fh) == IS_RESOURCE) {
     zend_rsrc_list_entry *le;

tests/bug00320-2.phpt

@@ -19,9 +19,10 @@ Test for bug PHP-320: GridFS transaction issues with storeBytes().
 	echo "######################################\n";
 	echo "# Saving files to GridFS\n";
 	echo "######################################\n";
+	$options = array( 'safe' => false );
 	for ($i = 0; $i < 3; $i++) {
 		try {
-			$new_saved_file_object_id = $GridFS->storeBytes($temporary_file_data, array( '_id' => "file{$i}", 'filename' => '/tmp/GridFS_test.txt'));
+			$new_saved_file_object_id = $GridFS->storeBytes($temporary_file_data, array( '_id' => "file{$i}", 'filename' => '/tmp/GridFS_test.txt'), $options);
 			echo "[Saved file] New file id:".$new_saved_file_object_id."\n";
 		}
 		catch (MongoException $e) {
@@ -30,6 +31,7 @@ Test for bug PHP-320: GridFS transaction issues with storeBytes().
 		}
 
 	}
+	var_dump( $options );
 
 	echo "\n";
 	echo "######################################\n";
@@ -57,6 +59,10 @@ error message: Could not store file: E11000 duplicate key error index: phpunit.f
 error code: 0
 error message: Could not store file: E11000 duplicate key error index: phpunit.fs.files.$filename_1  dup key: { : "/tmp/GridFS_test.txt" }
 error code: 0
+array(1) {
+  ["safe"]=>
+  bool(false)
+}
 ######################################
 # Current documents in fs.files
 ######################################

tests/bug00320.phpt

@@ -21,9 +21,10 @@ Test for bug PHP-320: GridFS transaction issues with storeFile().
 	echo "######################################\n";
 	echo "# Saving files to GridFS\n";
 	echo "######################################\n";
+	$options = array( 'safe' => false );
 	for ($i = 0; $i < 3; $i++) {
 		try {
-			$new_saved_file_object_id = $GridFS->storeFile($temporary_file_name, array( '_id' => "file{$i}"));
+			$new_saved_file_object_id = $GridFS->storeFile($temporary_file_name, array( '_id' => "file{$i}"), $options);
 			echo "[Saved file] New file id:".$new_saved_file_object_id."\n";
 		}
 		catch (MongoException $e) {
@@ -32,6 +33,7 @@ Test for bug PHP-320: GridFS transaction issues with storeFile().
 		}
 
 	}
+	var_dump( $options );
 
 	echo "\n";
 	echo "######################################\n";
@@ -59,6 +61,10 @@ error message: Could not store file: E11000 duplicate key error index: phpunit.f
 error code: 0
 error message: Could not store file: E11000 duplicate key error index: phpunit.fs.files.$filename_1  dup key: { : "/tmp/GridFS_test.txt" }
 error code: 0
+array(1) {
+  ["safe"]=>
+  bool(false)
+}
 ######################################
 # Current documents in fs.files
 ######################################