Skip to content

Commit

Permalink
Merge branch 'v1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmikola
jmikola committed Mar 15, 2017
2 parents ef3a52f + d2fa380 commit cdd10fe
Show file tree
Hide file tree
Showing 174 changed files with 323 additions and 188 deletions.
3 changes: 2 additions & 1 deletion tests/bson/bson-generate-document-id.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
_id should only be generated for top-level document, not embedded docs
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bson/bson-utcdatetime-001.phpt
View file
Expand Up @@ -3,7 +3,8 @@ MongoDB\BSON\UTCDateTime #001
--INI--
date.timezone=America/Los_Angeles
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php

Expand Down
3 changes: 2 additions & 1 deletion tests/bson/typemap-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor::setTypeMap(): Setting typemaps
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php

Expand Down
3 changes: 2 additions & 1 deletion tests/bson/typemap-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor::setTypeMap(): Setting using type "object"
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php

Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/bulkwrite-delete-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite::delete() should always encode __pclass for Persistable objects
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/bulkwrite-insert-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite::insert() should always encode __pclass for Persistable objects
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/bulkwrite-update-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite::update() should always encode __pclass for Persistable objects
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/bulkwrite_error-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite cannot be executed multiple times
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/write-0001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite: #001 Variety Bulk
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/bulk/write-0002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\BulkWrite: #002 Get the generated ID
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/command/command-ctor-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Command construction should always encode __pclass for Persistable objects
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/bug0720.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
PHPC-720: Do not persist SSL streams to avoid SSL reinitialization errors
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
4 changes: 2 additions & 2 deletions tests/connect/replicaset-seedlist-001.phpt
View file
@@ -1,8 +1,8 @@
--TEST--
MongoDB\Driver\Manager: Connecting to Replica Set with only secondary in seedlist
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
<?php CLEANUP(REPLICASET); PREDICTABLE(); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('REPLICASET'); CLEANUP(REPLICASET); PREDICTABLE(); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
4 changes: 2 additions & 2 deletions tests/connect/replicaset-seedlist-002.phpt
View file
@@ -1,8 +1,8 @@
--TEST--
MongoDB\Driver\Manager: Connecting to Replica Set with only arbiter in seedlist
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
<?php CLEANUP(REPLICASET); PREDICTABLE(); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('REPLICASET'); CLEANUP(REPLICASET); PREDICTABLE(); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
4 changes: 2 additions & 2 deletions tests/connect/standalone-auth-0001.phpt
View file
@@ -1,8 +1,8 @@
--TEST--
Connect to MongoDB with using default auth mechanism
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_AUTH"); ?>
<?php CLEANUP(STANDALONE_AUTH) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_AUTH'); CLEANUP(STANDALONE_AUTH); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
4 changes: 2 additions & 2 deletions tests/connect/standalone-auth-0002.phpt
View file
@@ -1,8 +1,8 @@
--TEST--
Connect to MongoDB with using default auth mechanism #002
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_AUTH"); ?>
<?php CLEANUP(STANDALONE_AUTH) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_AUTH'); CLEANUP(STANDALONE_AUTH); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
4 changes: 2 additions & 2 deletions tests/connect/standalone-plain-0001.phpt
View file
@@ -1,8 +1,8 @@
--TEST--
Connect to MongoDB with using PLAIN auth mechanism
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_PLAIN"); ?>
<?php CLEANUP(STANDALONE_PLAIN) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_PLAIN'); CLEANUP(STANDALONE_PLAIN); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-plain-0002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with using PLAIN auth mechanism #002
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_PLAIN"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_PLAIN'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-no_verify-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and no host/cert verification
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-no_verify-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and no host/cert verification (context options)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-verify_cert-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and cert verification
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-verify_cert-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and cert verification (context options)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-verify_cert-error-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and cert verification error
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-ssl-verify_cert-error-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and cert verification error (context options)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_SSL"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_SSL'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-x509-auth-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and X509 auth
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_X509'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-x509-auth-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and X509 auth (stream context)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_X509'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-x509-error-0001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
X509 connection should not reuse previous stream after an auth failure
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_X509'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-x509-extract_username-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and X509 auth and username retrieved from cert
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_X509'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/connect/standalone-x509-extract_username-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
Connect to MongoDB with SSL and X509 auth and username retrieved from cert (stream context)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("STANDALONE_X509"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_X509'); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/bug0671-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
PHPC-671: Segfault if Manager is already freed when destructing live Cursor
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/bug0732-001.phpt
View file
Expand Up @@ -2,7 +2,8 @@
PHPC-732: Possible mongoc_client_t use-after-free with Cursor wrapped in generator
--SKIPIF--
<?php if (PHP_VERSION_ID < 50500) exit("skip PHP 5.5 is required for generators"); ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/bug0849-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
PHPC-849: Cursor::setTypeMap() leaks current element if called during iteration
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/bug0924-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
PHPC-924: Cursor::setTypeMap() may unnecessarily convert first BSON document (type map)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/bug0924-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
PHPC-924: Cursor::setTypeMap() may unnecessarily convert first BSON document (__pclass)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/cursor-IteratorIterator-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor query result iteration through IteratorIterator
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/cursor-IteratorIterator-002.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor command result iteration through IteratorIterator
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/cursor-IteratorIterator-003.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor iteration beyond last document (find command)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/cursor-IteratorIterator-004.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor iteration beyond last document (OP_QUERY)
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE_30) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE_30'); CLEANUP(STANDALONE_30); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down
3 changes: 2 additions & 1 deletion tests/cursor/cursor-destruct-001.phpt
View file
@@ -1,7 +1,8 @@
--TEST--
MongoDB\Driver\Cursor destruct should kill a live cursor
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE) ?>
<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
<?php NEEDS('STANDALONE'); CLEANUP(STANDALONE); ?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
Expand Down

0 comments on commit cdd10fe

Please sign in to comment.