admin/mongo-php-driver
1
0
Fork 0
mirror of https://github.com/macintoshplus/mongo-php-driver.git synced 2026-04-26 01:48:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged pull request #887

Browse Source
This commit is contained in:
Derick Rethans
2018-07-20 16:40:02 +01:00
parent 1ded6fb4e6 e272bb5e47
commit 99383ba28f
41 changed files with 132 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.scripts/setup_mo.sh
+4
View File
@@ -23,6 +23,10 @@ case $DEPLOYMENT in
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/replica_sets/replicaset.json start > /tmp/mo-result.json
cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri;' > /tmp/uri.txt
;;
REPLICASET_OLD)
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/replica_sets/replicaset-old.json start > /tmp/mo-result.json
cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri;' > /tmp/uri.txt
;;
*)
${TRAVIS_BUILD_DIR}/.travis.scripts/mo.sh ${TRAVIS_BUILD_DIR}/scripts/presets/travis/standalone/standalone.json start > /tmp/mo-result.json
cat /tmp/mo-result.json | tail -n 1 | php -r 'echo json_decode(file_get_contents("php://stdin"))->mongodb_uri;' > /tmp/uri.txt
.travis.yml
+4
View File
@@ -33,6 +33,10 @@ matrix:
- php: 7.2
env:
- DEPLOYMENT=REPLICASET
- php: 7.2
env:
- SERVER_VERSION=3.0.15
- DEPLOYMENT=REPLICASET_OLD
- php: 7.0
env:
- SERVER_VERSION=3.0.15
scripts/presets/travis/replica_sets/replicaset-old.json
+66
View File
@@ -0,0 +1,66 @@
{
"id": "REPLICASET_OLD",
"name": "mongod",
"members": [
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3500/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3500/mongod.log",
"journal": true,
"nssize": 1,
"port": 3500,
"bind_ip": "::,0.0.0.0",
"smallfiles": true
},
"rsParams": {
"priority": 99,
"tags": {
"ordinal": "one",
"dc": "pa"
}
},
"server_id": "RS-OLD-one"
},
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3501/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3501/mongod.log",
"journal": true,
"nssize": 1,
"port": 3501,
"bind_ip": "::,0.0.0.0",
"smallfiles": true
},
"rsParams": {
"priority": 1.1,
"tags": {
"ordinal": "two",
"dc": "nyc"
}
},
"server_id": "RS-OLD-two"
},
{
"procParams": {
"dbpath": "/tmp/REPLICASET/3502/",
"ipv6": true,
"logappend": true,
"logpath": "/tmp/REPLICASET/3502/mongod.log",
"journal": true,
"nssize": 1,
"port": 3502,
"bind_ip": "::,0.0.0.0",
"smallfiles": true
},
"rsParams": {
"arbiterOnly": true
},
"server_id": "RS-OLD-arbiter"
}
]
}
tests/causal-consistency/causal-consistency-001.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: new session has no operation time
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/causal-consistency/causal-consistency-002.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: first read in session does not include afterClusterTime
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/causal-consistency/causal-consistency-003.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: first read or write in session updates operationTime
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/causal-consistency/causal-consistency-004.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: first read or write in session updates operationTime (even o
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/causal-consistency/causal-consistency-005.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/causal-consistency/causal-consistency-006.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: second read's afterClusterTime uses last reply's operationTi
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/causal-consistency/causal-consistency-007.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: reads in non-causally consistent session never include after
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/causal-consistency/causal-consistency-008.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: default read concern includes afterClusterTime but not level
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/causal-consistency/causal-consistency-009.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: custom read concern merges afterClusterTime and level
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/causal-consistency/causal-consistency-010.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: unacknowledged write does not update operationTime
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/causal-consistency/causal-consistency-012.phpt
+1
View File
@@ -4,6 +4,7 @@ Causal consistency: $clusterTime is sent in commands to supported deployments
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/manager/manager-executeWriteCommand_error-002.phpt
+1
View File
@@ -3,6 +3,7 @@ MongoDB\Driver\Manager::executeWriteCommand() throws CommandException for invali
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/query/bug0705-002.phpt
+1
View File
@@ -3,6 +3,7 @@ PHPC-705: Do not unnecessarily wrap filters in $query (currentOp query)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_live(); ?>
<?php skip_if_not_standalone(); ?>
<?php skip_if_server_version('>=', '3.1'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
tests/replicaset/bug0898-001.phpt
+1
View File
@@ -3,6 +3,7 @@ PHPC-898: readConcern option should not be included in getMore commands (URI opt
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/replicaset/bug0898-002.phpt
+1
View File
@@ -3,6 +3,7 @@ PHPC-898: readConcern option should not be included in getMore commands (query o
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/replicaset/manager-getservers-001.phpt
+6 -6
View File
@@ -31,7 +31,7 @@ array(3) {
["host"]=>
string(%d) "%s"
["port"]=>
int(3000)
int(%d)
["type"]=>
int(4)
["is_primary"]=>
@@ -63,7 +63,7 @@ array(3) {
["host"]=>
string(%d) "%s"
["port"]=>
int(3001)
int(%d)
["type"]=>
int(5)
["is_primary"]=>
@@ -95,7 +95,7 @@ array(3) {
["host"]=>
string(%d) "%s"
["port"]=>
int(3002)
int(%d)
["type"]=>
int(6)
["is_primary"]=>
@@ -116,7 +116,7 @@ array(3) {
int(%d)
}
}
%s:3000 - primary: 1, secondary: 0, arbiter: 0
%s:3001 - primary: 0, secondary: 1, arbiter: 0
%s:3002 - primary: 0, secondary: 0, arbiter: 1
%s:%d - primary: 1, secondary: 0, arbiter: 0
%s:%d - primary: 0, secondary: 1, arbiter: 0
%s:%d - primary: 0, secondary: 0, arbiter: 1
===DONE===
tests/replicaset/readconcern-001.phpt
+1
View File
@@ -3,6 +3,7 @@ ReadConcern: MongoDB\Driver\Manager::executeQuery() with readConcern option (fin
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/replicaset/server-001.phpt
+4 -4
View File
@@ -48,19 +48,19 @@ array(2) {
string(3) "one"
}
int(%d)
int(3000)
int(%d)
bool(true)
bool(true)
bool(false)
bool(false)
bool(false)
bool(false)
string(10) "REPLICASET"
string(%d) "REPLICASET%S"
array(2) {
[0]=>
string(%d) "%s:3000"
string(%d) "%s:%d"
[1]=>
string(%d) "%s:3001"
string(%d) "%s:%d"
}
bool(true)
===DONE===
tests/replicaset/server-002.phpt
+4 -4
View File
@@ -43,19 +43,19 @@ array(2) {
string(3) "two"
}
int(%d)
int(3001)
int(%d)
bool(true)
bool(false)
bool(true)
bool(false)
bool(false)
bool(false)
string(10) "REPLICASET"
string(%s) "REPLICASET%S"
array(2) {
[0]=>
string(%d) "%s:3000"
string(%d) "%s:%d"
[1]=>
string(%d) "%s:3001"
string(%d) "%s:%d"
}
bool(true)
===DONE===
tests/replicaset/writeresult-getserver-001.phpt
+2 -2
View File
@@ -39,6 +39,6 @@ var_dump($server->getPort(), $server3->getPort());
--EXPECTF--
bool(true)
bool(false)
int(3000)
int(3001)
int(%d)
int(%d)
===DONE===
tests/replicaset/writeresult-getserver-002.phpt
+3 -3
View File
@@ -55,8 +55,8 @@ $server3->executeCommand("local", $cmd);
--EXPECTF--
bool(true)
bool(false)
int(3000)
int(3001)
int(%d)
int(%d)
object(MongoDB\Driver\WriteResult)#%d (%d) {
["nInserted"]=>
int(1)
@@ -81,7 +81,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
}
}
string(%d) "%s"
int(3001)
int(%d)
object(stdClass)#%d (2) {
["_id"]=>
object(%s\ObjectId)#%d (1) {
tests/retryable-writes/retryable-writes-001.phpt
+2 -1
View File
@@ -4,6 +4,7 @@ Retryable writes: supported single-statement operations include transaction IDs
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
@@ -81,4 +82,4 @@ update command includes transaction ID: yes
Testing findAndModify
findAndModify command includes transaction ID: yes
===DONE===
===DONE===
tests/retryable-writes/retryable-writes-002.phpt
+2 -1
View File
@@ -4,6 +4,7 @@ Retryable writes: supported multi-statement operations include transaction IDs
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
@@ -82,4 +83,4 @@ insert command includes transaction ID: yes
Testing insertMany (ordered=false)
insert command includes transaction ID: yes
===DONE===
===DONE===
tests/retryable-writes/retryable-writes-003.phpt
+2 -1
View File
@@ -4,6 +4,7 @@ Retryable writes: unsupported operations do not include transaction IDs
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
@@ -96,4 +97,4 @@ update command includes transaction ID: no
Testing aggregate
aggregate command includes transaction ID: no
===DONE===
===DONE===
tests/retryable-writes/retryable-writes-004.phpt
+1
View File
@@ -6,6 +6,7 @@ Depends on CDRIVER-2432
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/retryable-writes/retryable-writes-005.phpt
+2 -1
View File
@@ -4,6 +4,7 @@ Retryable writes: non-write command methods do not include transaction IDs
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
@@ -67,4 +68,4 @@ findAndModify command includes transaction ID: yes
Testing Manager::executeWriteCommand()
findAndModify command includes transaction ID: yes
===DONE===
===DONE===
tests/server/server-executeCommand-002.phpt
+1
View File
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeCommand() takes a read preference
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
--FILE--
<?php
tests/server/server-executeQuery-006.phpt
+1
View File
@@ -3,6 +3,7 @@ MongoDB\Driver\Server::executeQuery() takes a read preference (find command)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.2'); ?>
<?php skip_if_not_clean(DATABASE_NAME, 'system.profile'); ?>
--FILE--
<?php
tests/session/session-002.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session spec test: $clusterTime in commands
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
<?php skip_if_not_clean(); ?>
--FILE--
<?php
tests/session/session-advanceClusterTime-001.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceClusterTime()
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-advanceOperationTime-001.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime()
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-advanceOperationTime-002.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with Timestamp
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-advanceOperationTime-003.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-advanceOperationTime_error-001.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::advanceOperationTime() with TimestampInterface exception
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-debug-002.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session debug output (after an operation)
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-getClusterTime-001.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::getClusterTime()
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/session/session-getOperationTime-001.phpt
+1
View File
@@ -4,6 +4,7 @@ MongoDB\Driver\Session::getOperationTime()
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php skip_if_not_libmongoc_crypto(); ?>
<?php skip_if_not_replica_set(); ?>
<?php skip_if_server_version('<', '3.6'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
tests/writeResult/writeresult-debug-002.phpt
+3 -3
View File
@@ -70,7 +70,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
[0]=>
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(108) "E11000 duplicate key error collection: phongo.writeResult_writeresult_debug_002 index: _id_ dup key: { : 1 }"
string(%d) "E11000 duplicate key %S phongo.writeResult_writeresult_debug_002%s dup key: { : 1 }"
["code"]=>
int(11000)
["index"]=>
@@ -81,7 +81,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
[1]=>
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(108) "E11000 duplicate key error collection: phongo.writeResult_writeresult_debug_002 index: _id_ dup key: { : 2 }"
string(%d) "E11000 duplicate key %S phongo.writeResult_writeresult_debug_002%s dup key: { : 2 }"
["code"]=>
int(11000)
["index"]=>
@@ -92,7 +92,7 @@ object(MongoDB\Driver\WriteResult)#%d (%d) {
[2]=>
object(MongoDB\Driver\WriteError)#%d (%d) {
["message"]=>
string(108) "E11000 duplicate key error collection: phongo.writeResult_writeresult_debug_002 index: _id_ dup key: { : 3 }"
string(%d) "E11000 duplicate key %S phongo.writeResult_writeresult_debug_002%s dup key: { : 3 }"
["code"]=>
int(11000)
["index"]=>