Merge pull request #861

Author: jmikola

tests/bulk/bulkwrite-delete_error-004.phpt

@@ -0,0 +1,30 @@
+--TEST--
+MongoDB\Driver\BulkWrite::delete() collation option requires MongoDB 3.4
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_server_version('>=', '3.4'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+$bulk = new MongoDB\Driver\BulkWrite();
+
+$bulk->delete(
+    ['name' => 'foo'],
+    ['collation' => ['locale' => 'en_US']]
+);
+
+echo throws(function() use ($manager, $bulk) {
+    $manager->executeBulkWrite(DATABASE_NAME . '.' . COLLECTION_NAME, $bulk);
+}, 'MongoDB\Driver\Exception\RuntimeException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\RuntimeException
+The selected server does not support collation
+===DONE===

tests/bulk/bulkwrite-update-arrayFilters-001.phpt renamed to tests/bulk/bulkwrite-update-002.phpt

@@ -1,5 +1,5 @@
 --TEST--
-MongoDB\Driver\BulkWrite::update with arrayFilters
+MongoDB\Driver\BulkWrite::update() with arrayFilters option
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
 <?php skip_if_not_live(); ?>
@@ -21,7 +21,7 @@ $manager->executeBulkWrite(DATABASE_NAME . '.' . COLLECTION_NAME, $bulk);
 
 $updateBulk = new MongoDB\Driver\BulkWrite();
 
-$query = new MongoDB\Driver\Query(['grades' => ['$gte' => 100]]);
+$query = ['grades' => ['$gte' => 100]];
 $update = [ '$set' => [ 'grades.$[element]' => 100 ] ];
 $options = [
     'arrayFilters' => [ [ 'element' => [ '$gte' => 100 ] ] ],

tests/bulk/bulkwrite-update_error-006.phpt

@@ -0,0 +1,31 @@
+--TEST--
+MongoDB\Driver\BulkWrite::update() collation option requires MongoDB 3.4
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_server_version('>=', '3.4'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+$bulk = new MongoDB\Driver\BulkWrite();
+
+$bulk->update(
+    ['name' => 'foo'],
+    ['$inc' => ['size' => 1]],
+    ['collation' => ['locale' => 'en_US']]
+);
+
+echo throws(function() use ($manager, $bulk) {
+    $manager->executeBulkWrite(DATABASE_NAME . '.' . COLLECTION_NAME, $bulk);
+}, 'MongoDB\Driver\Exception\RuntimeException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\RuntimeException
+The selected server does not support collation
+===DONE===

tests/bulk/bulkwrite-update_error-007.phpt

@@ -0,0 +1,34 @@
+--TEST--
+MongoDB\Driver\BulkWrite::update() arrayFilters option requires MongoDB 3.6
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+<?php skip_if_server_version('>=', '3.6'); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = new MongoDB\Driver\Manager(URI);
+
+$bulk = new MongoDB\Driver\BulkWrite();
+
+$bulk->update(
+    ['grades' => ['$gte' => 100]],
+    ['$set' => ['grades.$[element]' => 100 ]],
+    [
+        'arrayFilters' => [['element' => ['$gte' => 100]]],
+        'multi' => true,
+    ]
+);
+
+echo throws(function() use ($manager, $bulk) {
+    $manager->executeBulkWrite(DATABASE_NAME . '.' . COLLECTION_NAME, $bulk);
+}, 'MongoDB\Driver\Exception\RuntimeException'), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got MongoDB\Driver\Exception\RuntimeException
+The selected server does not support array filters
+===DONE===