Skip to content

PHPC-757: Implement The MongoDB Handshake Protocol #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 31, 2016
Merged

PHPC-757: Implement The MongoDB Handshake Protocol #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f761be
Upgrade libbson and libmongoc to latest master (1.5.0-dev)
derickr Aug 31, 2016
24b65ca
PHPC-619: Implement Decimal128 type (again)
derickr Aug 31, 2016
3904421
Fixed tests, as MongoDB 3.3 adds an extra item
derickr Aug 31, 2016
f7b8905
Debugging through mongodb.debug no longer works
derickr Aug 31, 2016
91aaf65
PHPC-757: Implement The MongoDB Handshake Protocol
derickr Aug 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ if test "$MONGODB" != "no"; then
bson-atomic.c \
bson-clock.c \
bson-context.c \
bson-decimal128.c \
bson-error.c \
bson-iter.c \
bson-iso8601.c \
Expand Down Expand Up @@ -241,13 +242,15 @@ if test "$MONGODB" != "no"; then
mongoc-cursor-cursorid.c \
mongoc-cursor-transform.c \
mongoc-database.c \
mongoc-linux-distro-scanner.c \
mongoc-find-and-modify.c \
mongoc-host-list.c \
mongoc-init.c \
mongoc-gridfs.c \
mongoc-gridfs-file.c \
mongoc-gridfs-file-page.c \
mongoc-gridfs-file-list.c \
mongoc-handshake.c \
mongoc-index.c \
mongoc-list.c \
mongoc-log.c \
Expand Down Expand Up @@ -350,8 +353,6 @@ PHP_ARG_WITH(libbson, whether to use system libbson,
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)

AC_SUBST(BSON_EXPERIMENTAL_FEATURES, 0)
fi

dnl libmongoc stuff {{{
Expand Down Expand Up @@ -414,8 +415,9 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0)
AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)

AC_SUBST(MONGOC_ENABLE_SSL_LIBRESSL, 0)

AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
AC_SUBST(MONGOC_EXPERIMENTAL_FEATURES, 0)
fi


Expand Down
4 changes: 1 addition & 3 deletions config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ if (PHP_MONGODB != "no") {
ADD_SOURCES(configure_module_dirname + "/src/MongoDB/Exception", "Exception.c LogicException.c RuntimeException.c UnexpectedValueException.c InvalidArgumentException.c ConnectionException.c AuthenticationException.c SSLConnectionException.c ExecutionTimeoutException.c ConnectionTimeoutException.c WriteException.c BulkWriteException.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/yajl", "yajl_version.c yajl.c yajl_encode.c yajl_lex.c yajl_parser.c yajl_buf.c yajl_tree.c yajl_alloc.c yajl_gen.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", "bcon.c bson.c bson-atomic.c bson-clock.c bson-context.c bson-error.c bson-iter.c bson-iso8601.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libbson/src/bson", "bcon.c bson.c bson-atomic.c bson-clock.c bson-context.c bson-decimal128.c bson-error.c bson-iter.c bson-iso8601.c bson-json.c bson-keys.c bson-md5.c bson-memory.c bson-oid.c bson-reader.c bson-string.c bson-timegm.c bson-utf8.c bson-value.c bson-version-functions.c bson-writer.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-apm.c mongoc-array.c mongoc-async.c mongoc-async-cmd.c mongoc-buffer.c mongoc-bulk-operation.c mongoc-b64.c mongoc-client.c mongoc-client-pool.c mongoc-cluster.c mongoc-collection.c mongoc-counters.c mongoc-cursor.c mongoc-cursor-array.c mongoc-cursor-cursorid.c mongoc-cursor-transform.c mongoc-database.c mongoc-find-and-modify.c mongoc-host-list.c mongoc-init.c mongoc-gridfs.c mongoc-gridfs-file.c mongoc-gridfs-file-page.c mongoc-gridfs-file-list.c mongoc-index.c mongoc-list.c mongoc-log.c mongoc-matcher-op.c mongoc-matcher.c mongoc-memcmp.c mongoc-opcode.c mongoc-queue.c mongoc-read-concern.c mongoc-read-prefs.c mongoc-rpc.c mongoc-server-description.c mongoc-server-stream.c mongoc-set.c mongoc-socket.c mongoc-stream.c mongoc-stream-buffered.c mongoc-stream-file.c mongoc-stream-gridfs.c mongoc-stream-socket.c mongoc-topology.c mongoc-topology-description.c mongoc-topology-scanner.c mongoc-uri.c mongoc-util.c mongoc-version-functions.c mongoc-write-command.c mongoc-write-concern.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto.c mongoc-scram.c", "mongodb");
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-stream-tls.c mongoc-ssl.c", "mongodb");
Expand Down Expand Up @@ -81,7 +81,6 @@ if (PHP_MONGODB != "no") {
BSON_EXTRA_ALIGN: 0,
BSON_HAVE_SYSCALL_TID: 0,
BSON_HAVE_DECIMAL128: 0,
BSON_EXPERIMENTAL_FEATURES: 0
};

if (CHECK_FUNC_IN_HEADER("stdio.h", "_set_output_format")) {
Expand Down Expand Up @@ -116,7 +115,6 @@ if (PHP_MONGODB != "no") {
MONGOC_HAVE_SASL_CLIENT_DONE: 0,
MONGOC_HAVE_WEAK_SYMBOLS: 0,
MONGOC_NO_AUTOMATIC_GLOBALS: 1,
MONGOC_EXPERIMENTAL_FEATURES: 0
};

if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) &&
Expand Down
22 changes: 12 additions & 10 deletions php_phongo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1390,8 +1390,6 @@ static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zv
const char *mongoc_version, *bson_version;
mongoc_client_t *client;

ENTRY;

#if PHP_VERSION_ID >= 70000
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume php_phongo_make_mongo_client() was the only use of libmongoc tracing in PHPC. Is that correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. As this was the only file that failed to compile now @bjori made it not leak.

if (driverOptions && (zdebug = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "debug", sizeof("debug")-1)) != NULL) {
zend_string *key = zend_string_init(PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI)-1, 0);
Expand Down Expand Up @@ -1432,17 +1430,17 @@ static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zv
client = mongoc_client_new_from_uri(uri);

if (!client) {
RETURN(NULL);
return NULL;
}

if (mongoc_uri_get_ssl(uri) && driverOptions) {
if (!php_phongo_apply_ssl_opts(client, driverOptions TSRMLS_CC)) {
mongoc_client_destroy(client);
RETURN(NULL);
return NULL;
}
}

RETURN(client);
return client;
} /* }}} */

bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC) /* {{{ */
Expand Down Expand Up @@ -1524,7 +1522,6 @@ void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data,
intern->type = (uint8_t) type;
} /* }}} */

#ifdef BSON_EXPERIMENTAL_FEATURES
void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TSRMLS_DC) /* {{{ */
{
php_phongo_decimal128_t *intern;
Expand All @@ -1535,7 +1532,6 @@ void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TS
memcpy(&intern->decimal, decimal, sizeof(bson_decimal128_t));
intern->initialized = true;
} /* }}} */
#endif

void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC) /* {{{ */
{
Expand Down Expand Up @@ -1878,13 +1874,21 @@ PHP_GINIT_FUNCTION(mongodb)
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(mongodb)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
char *php_version_string;

(void)type; /* We don't care if we are loaded via dl() or extension= */

REGISTER_INI_ENTRIES();

/* Initialize libmongoc */
mongoc_init();

/* Set handshake options */
php_version_string = malloc(4 + sizeof(PHP_VERSION) + 1);
snprintf(php_version_string, 4 + sizeof(PHP_VERSION) + 1, "PHP %s", PHP_VERSION);
mongoc_handshake_data_append("ext-mongodb:PHP", MONGODB_VERSION_S, php_version_string);
free(php_version_string);

/* Initialize libbson */
bson_mem_set_vtable(&MONGODB_G(bsonMemVTable));

Expand Down Expand Up @@ -1933,9 +1937,7 @@ PHP_MINIT_FUNCTION(mongodb)
PHP_MINIT(Unserializable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Persistable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Binary)(INIT_FUNC_ARGS_PASSTHRU);
#ifdef BSON_EXPERIMENTAL_FEATURES
PHP_MINIT(Decimal128)(INIT_FUNC_ARGS_PASSTHRU);
#endif
PHP_MINIT(Javascript)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MaxKey)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MinKey)(INIT_FUNC_ARGS_PASSTHRU);
Expand Down
2 changes: 0 additions & 2 deletions php_phongo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,7 @@ void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, uint32_
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC);
void php_phongo_new_javascript_from_javascript_and_scope(int init, zval *object, const char *code, size_t code_len, const bson_t *scope TSRMLS_DC);
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC);
#ifdef BSON_EXPERIMENTAL_FEATURES
void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TSRMLS_DC);
#endif
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC);

zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
Expand Down
14 changes: 0 additions & 14 deletions php_phongo_classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,9 @@ static inline php_phongo_writeresult_t* php_writeresult_fetch_object(zend_object
static inline php_phongo_binary_t* php_binary_fetch_object(zend_object *obj) {
return (php_phongo_binary_t *)((char *)obj - XtOffsetOf(php_phongo_binary_t, std));
}
#ifdef BSON_EXPERIMENTAL_FEATURES
static inline php_phongo_decimal128_t* php_decimal128_fetch_object(zend_object *obj) {
return (php_phongo_decimal128_t *)((char *)obj - XtOffsetOf(php_phongo_decimal128_t, std));
}
#endif
static inline php_phongo_javascript_t* php_javascript_fetch_object(zend_object *obj) {
return (php_phongo_javascript_t *)((char *)obj - XtOffsetOf(php_phongo_javascript_t, std));
}
Expand Down Expand Up @@ -106,9 +104,7 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
# define Z_WRITEERROR_OBJ_P(zv) (php_writeerror_fetch_object(Z_OBJ_P(zv)))
# define Z_WRITERESULT_OBJ_P(zv) (php_writeresult_fetch_object(Z_OBJ_P(zv)))
# define Z_BINARY_OBJ_P(zv) (php_binary_fetch_object(Z_OBJ_P(zv)))
#ifdef BSON_EXPERIMENTAL_FEATURES
# define Z_DECIMAL128_OBJ_P(zv) (php_decimal128_fetch_object(Z_OBJ_P(zv)))
#endif
# define Z_JAVASCRIPT_OBJ_P(zv) (php_javascript_fetch_object(Z_OBJ_P(zv)))
# define Z_MAXKEY_OBJ_P(zv) (php_maxkey_fetch_object(Z_OBJ_P(zv)))
# define Z_MINKEY_OBJ_P(zv) (php_minkey_fetch_object(Z_OBJ_P(zv)))
Expand All @@ -131,9 +127,7 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
# define Z_OBJ_WRITEERROR(zo) (php_writeerror_fetch_object(zo))
# define Z_OBJ_WRITERESULT(zo) (php_writeresult_fetch_object(zo))
# define Z_OBJ_BINARY(zo) (php_binary_fetch_object(zo))
#ifdef BSON_EXPERIMENTAL_FEATURES
# define Z_OBJ_DECIMAL128(zo) (php_decimal128_fetch_object(zo))
#endif
# define Z_OBJ_JAVASCRIPT(zo) (php_javascript_fetch_object(zo))
# define Z_OBJ_MAXKEY(zo) (php_maxkey_fetch_object(zo))
# define Z_OBJ_MINKEY(zo) (php_minkey_fetch_object(zo))
Expand All @@ -158,9 +152,7 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
# define Z_WRITEERROR_OBJ_P(zv) ((php_phongo_writeerror_t *)zend_object_store_get_object(zv TSRMLS_CC))
# define Z_WRITERESULT_OBJ_P(zv) ((php_phongo_writeresult_t *)zend_object_store_get_object(zv TSRMLS_CC))
# define Z_BINARY_OBJ_P(zv) ((php_phongo_binary_t *)zend_object_store_get_object(zv TSRMLS_CC))
#ifdef BSON_EXPERIMENTAL_FEATURES
# define Z_DECIMAL128_OBJ_P(zv) ((php_phongo_decimal128_t *)zend_object_store_get_object(zv TSRMLS_CC))
#endif
# define Z_JAVASCRIPT_OBJ_P(zv) ((php_phongo_javascript_t *)zend_object_store_get_object(zv TSRMLS_CC))
# define Z_MAXKEY_OBJ_P(zv) ((php_phongo_maxkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
# define Z_MINKEY_OBJ_P(zv) ((php_phongo_minkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
Expand All @@ -183,9 +175,7 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
# define Z_OBJ_WRITEERROR(zo) ((php_phongo_writeerror_t *)zo)
# define Z_OBJ_WRITERESULT(zo) ((php_phongo_writeresult_t *)zo)
# define Z_OBJ_BINARY(zo) ((php_phongo_binary_t *)zo)
#ifdef BSON_EXPERIMENTAL_FEATURES
# define Z_OBJ_DECIMAL128(zo) ((php_phongo_decimal128_t *)zo)
#endif
# define Z_OBJ_JAVASCRIPT(zo) ((php_phongo_javascript_t *)zo)
# define Z_OBJ_MAXKEY(zo) ((php_phongo_maxkey_t *)zo)
# define Z_OBJ_MINKEY(zo) ((php_phongo_minkey_t *)zo)
Expand Down Expand Up @@ -235,9 +225,7 @@ extern PHONGO_API zend_class_entry *php_phongo_persistable_ce;
extern PHONGO_API zend_class_entry *php_phongo_unserializable_ce;
extern PHONGO_API zend_class_entry *php_phongo_serializable_ce;
extern PHONGO_API zend_class_entry *php_phongo_binary_ce;
#ifdef BSON_EXPERIMENTAL_FEATURES
extern PHONGO_API zend_class_entry *php_phongo_decimal128_ce;
#endif
extern PHONGO_API zend_class_entry *php_phongo_javascript_ce;
extern PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
extern PHONGO_API zend_class_entry *php_phongo_minkey_ce;
Expand Down Expand Up @@ -284,9 +272,7 @@ PHP_MINIT_FUNCTION(Unserializable);
PHP_MINIT_FUNCTION(Serializable);
PHP_MINIT_FUNCTION(Persistable);
PHP_MINIT_FUNCTION(Binary);
#ifdef BSON_EXPERIMENTAL_FEATURES
PHP_MINIT_FUNCTION(Decimal128);
#endif
PHP_MINIT_FUNCTION(Javascript);
PHP_MINIT_FUNCTION(MaxKey);
PHP_MINIT_FUNCTION(MinKey);
Expand Down
2 changes: 0 additions & 2 deletions php_phongo_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,12 @@ typedef struct {
PHONGO_ZEND_OBJECT_POST
} php_phongo_binary_t;

#ifdef BSON_EXPERIMENTAL_FEATURES
typedef struct {
PHONGO_ZEND_OBJECT_PRE
bool initialized;
bson_decimal128_t decimal;
PHONGO_ZEND_OBJECT_POST
} php_phongo_decimal128_t;
#endif

typedef struct {
PHONGO_ZEND_OBJECT_PRE
Expand Down
4 changes: 0 additions & 4 deletions src/BSON/Decimal128.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
#include <bson.h>
#include <mongoc.h>

#ifdef BSON_EXPERIMENTAL_FEATURES

/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
Expand Down Expand Up @@ -285,8 +283,6 @@ PHP_MINIT_FUNCTION(Decimal128)
}
/* }}} */

#endif /* BSON_EXPERIMENTAL_FEATURES */

/*
* Local variables:
* tab-width: 4
Expand Down
8 changes: 0 additions & 8 deletions src/bson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ uint8_t php_phongo_binary_get_type(zval *object TSRMLS_DC)
return intern->type;
}

#ifdef BSON_EXPERIMENTAL_FEATURES
static bson_decimal128_t *php_phongo_decimal128_get_decimal128(zval *object TSRMLS_DC)
{
php_phongo_decimal128_t *intern;
Expand All @@ -160,7 +159,6 @@ static bson_decimal128_t *php_phongo_decimal128_get_decimal128(zval *object TSRM

return &intern->decimal;
}
#endif

char *php_phongo_regex_get_pattern(zval *object TSRMLS_DC)
{
Expand Down Expand Up @@ -349,7 +347,6 @@ bool php_phongo_bson_visit_date_time(const bson_iter_t *iter ARG_UNUSED, const c
}
/* }}} */

#ifdef BSON_EXPERIMENTAL_FEATURES
bool php_phongo_bson_visit_decimal128(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_decimal128_t *decimal, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
Expand All @@ -373,7 +370,6 @@ bool php_phongo_bson_visit_decimal128(const bson_iter_t *iter ARG_UNUSED, const
return false;
}
/* }}} */
#endif

bool php_phongo_bson_visit_null(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
Expand Down Expand Up @@ -620,9 +616,7 @@ static const bson_visitor_t php_bson_visitors = {
php_phongo_bson_visit_maxkey,
php_phongo_bson_visit_minkey,
php_phongo_bson_visit_unsupported_type,
#ifdef BSON_EXPERIMENTAL_FEATURES
php_phongo_bson_visit_decimal128,
#endif
{ NULL }
};

Expand Down Expand Up @@ -976,13 +970,11 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
bson_append_binary(bson, key, key_len, php_phongo_binary_get_type(object TSRMLS_CC), data, data_len);
return;
}
#ifdef BSON_EXPERIMENTAL_FEATURES
if (instanceof_function(Z_OBJCE_P(object), php_phongo_decimal128_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Decimal128");
bson_append_decimal128(bson, key, key_len, php_phongo_decimal128_get_decimal128(object TSRMLS_CC));
return;
}
#endif
if (instanceof_function(Z_OBJCE_P(object), php_phongo_regex_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Regex");
bson_append_regex(bson, key, key_len, php_phongo_regex_get_pattern(object TSRMLS_CC), php_phongo_regex_get_flags(object TSRMLS_CC));
Expand Down
2 changes: 1 addition & 1 deletion src/libbson
Open in desktop
Submodule libbson updated 39 files
+16 −0 .evergreen/cmake.sh
+16 −4 .evergreen/compile-unix.sh
+1 −2 .evergreen/compile-windows.sh
+17 −0 .evergreen/compile.sh
+129 −21 .evergreen/config.yml
+2 −0 .evergreen/llvm-gcov.sh
+5 −0 .gitignore
+12 −42 CMakeLists.txt
+30 −0 NEWS
+1 −1 VERSION_CURRENT
+1 −1 build/autotools/Coverage.m4
+1 −8 build/autotools/PrintBuildConfiguration.m4
+0 −10 build/autotools/ReadCommandLineArguments.m4
+0 −2 build/autotools/SetupAutomake.m4
+0 −191 build/cmake/libbson-experimental.def
+10 −5 build/cmake/libbson.def
+1 −4 doc/html/Makefile.am
+10 −0 examples/Makefile.am
+2 −10 src/bson/Makefile.am
+0 −12 src/bson/bcon.c
+0 −8 src/bson/bcon.h
+0 −8 src/bson/bson-config.h.in
+0 −12 src/bson/bson-iter.c
+0 −6 src/bson/bson-iter.h
+0 −8 src/bson/bson-json.c
+0 −10 src/bson/bson-types.h
+0 −4 src/bson/bson-value.c
+0 −10 src/bson/bson.c
+0 −6 src/bson/bson.h
+7 −12 tests/Makefile.am
+0 −4 tests/test-bcon-basic.c
+0 −4 tests/test-bcon-extract.c
+0 −10 tests/test-bson.c
+0 −1 tests/test-decimal128.c
+0 −16 tests/test-iter.c
+0 −17 tests/test-json.c
+1 −2 tests/test-libbson.c
+0 −3 tests/test-type.c
+0 −4 tests/test-value.c
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 250 files
2 changes: 0 additions & 2 deletions tests/bson/bug0544.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
PHPC-544: Consult SIZEOF_ZEND_LONG for 64-bit integer support
--SKIPIF--
<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
--INI--
mongodb.debug=stderr
--FILE--
<?php

Expand Down
2 changes: 0 additions & 2 deletions tests/bson/bug0623.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
PHPC-623: Numeric keys limited to unsigned 32-bit integer
--SKIPIF--
<?php if (8 !== PHP_INT_SIZE) { die('skip Only for 64-bit platform'); } ?>
--INI--
mongodb.debug=stderr
--FILE--
<?php
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how this ended up here and in bug0544.phpt, but thanks for removing.


Expand Down
26 changes: 0 additions & 26 deletions tests/manager/manager-debug-003.phpt
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions tests/manager/manager-var-dump-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ object(MongoDB\Driver\Manager)#%d (%d) {
["is_passive"]=>
bool(false)
["last_is_master"]=>
array(8) {
array(%d) {
["ismaster"]=>
bool(true)
["maxBsonObjectSize"]=>
Expand All @@ -68,8 +68,7 @@ object(MongoDB\Driver\Manager)#%d (%d) {
int(%d)
["minWireVersion"]=>
int(0)
["ok"]=>
float(1)
%a
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw https://github.com/mongodb/mongo-hhvm-driver/pull/127/files#r76989497. Makes sense.

}
["round_trip_time"]=>
int(%d)
Expand Down
Loading