Skip to content

PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1 #362

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 1, 2016
Merged

PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1 #362

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
b462e2c
PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1
jmikola Jul 29, 2016
d8f6ad2
PHPC-629: Fix $binary and $type field in extended JSON
jmikola Jul 29, 2016
ff79f64
PHPC-758: Disable Decimal128 for bundled libbson and libmongoc 1.4.0
jmikola Jul 29, 2016
8880891
PHPC-754: Remove libmongoc-priv system dependency in config.m4
puppyofkosh Jul 25, 2016
e545a5d
PHPC-755: Remove include of private mongoc-trace.h
puppyofkosh Jul 25, 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
14 changes: 8 additions & 6 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ if test "$MONGODB" != "no"; then
bson-atomic.c \
bson-clock.c \
bson-context.c \
bson-decimal128.c \
bson-error.c \
Copy link
Contributor

Choose a reason for hiding this comment

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

Weren't we going to leave it compiled in? AFAIK, @bjori said there was a feature flag protection in it.

Copy link
Member Author

Choose a reason for hiding this comment

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

He was mistaken. Both this and the client metadata sources in libmongoc are missing an #ifdef wrap.

bson-iter.c \
bson-iso8601.c \
Expand Down Expand Up @@ -351,6 +350,8 @@ 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 All @@ -365,11 +366,11 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
if test "$PHP_LIBMONGOC" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libmongoc)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0 && $PKG_CONFIG --exists libmongoc-priv; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.3.3; then
LIBMONGOC_INC=`$PKG_CONFIG libmongoc-priv --cflags`
LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-priv --libs`
LIBMONGOC_VER=`$PKG_CONFIG libmongoc-priv --modversion`
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.4.0; then
LIBMONGOC_INC=`$PKG_CONFIG libmongoc-1.0 --cflags`
LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-1.0 --libs`
LIBMONGOC_VER=`$PKG_CONFIG libmongoc-1.0 --modversion`
AC_MSG_RESULT(version $LIBMONGOC_VER found)

else
Expand Down Expand Up @@ -414,6 +415,7 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)

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


Expand Down
4 changes: 3 additions & 1 deletion config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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-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/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/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 All @@ -33,9 +33,11 @@ if (PHP_MONGODB != "no") {
AC_DEFINE("BSON_COMPILATION", 1);
AC_DEFINE("BSON_EXTRA_ALIGN", 0);
AC_DEFINE("BSON_HAVE_DECIMAL128", 0);
AC_DEFINE("BSON_EXPERIMENTAL_FEATURES", 0);
AC_DEFINE("MONGOC_COMPILATION", 1);
AC_DEFINE("MONGOC_NO_AUTOMATIC_GLOBALS", 1);
AC_DEFINE("MONGOC_TRACE", 1);
AC_DEFINE("MONGOC_EXPERIMENTAL_FEATURES", 0);

if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) &&
CHECK_LIB("libeay32.lib", "mongodb", PHP_MONGODB) &&
Expand Down
5 changes: 4 additions & 1 deletion php_phongo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
/* External libs */
#include "bson.h"
#include "mongoc.h"
#include "mongoc-trace.h"


/* PHP Core stuff */
Expand Down Expand Up @@ -2086,6 +2085,7 @@ 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 @@ -2096,6 +2096,7 @@ 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 @@ -2493,7 +2494,9 @@ 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: 2 additions & 0 deletions php_phongo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ 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: 14 additions & 0 deletions php_phongo_classes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ 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 @@ -104,7 +106,9 @@ 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 @@ -127,7 +131,9 @@ 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 @@ -152,7 +158,9 @@ 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 @@ -175,7 +183,9 @@ 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 @@ -225,7 +235,9 @@ 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 @@ -272,7 +284,9 @@ 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: 2 additions & 0 deletions php_phongo_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,14 @@ 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: 3 additions & 1 deletion src/BSON/Decimal128.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
#include <bson.h>
#include <mongoc.h>

#ifdef BSON_EXPERIMENTAL_FEATURES

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


#endif /* BSON_EXPERIMENTAL_FEATURES */

/*
* Local variables:
Expand Down
8 changes: 8 additions & 0 deletions src/bson.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ 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 @@ -159,6 +160,7 @@ 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 @@ -347,6 +349,7 @@ 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 @@ -370,6 +373,7 @@ 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 @@ -616,7 +620,9 @@ 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 @@ -970,11 +976,13 @@ 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 52 files
+421 −0 .evergreen/config.yml
+122 −0 .evergreen/unix.sh
+34 −0 .evergreen/windows.sh
+3 −0 .gitattributes
+2 −0 .gitignore
+0 −440 .mci.yml
+69 −38 CMakeLists.txt
+36 −3 NEWS
+2 −2 README.md
+1 −1 VERSION_CURRENT
+8 −1 build/autotools/PrintBuildConfiguration.m4
+10 −0 build/autotools/ReadCommandLineArguments.m4
+2 −0 build/autotools/SetupAutomake.m4
+191 −0 build/cmake/libbson-experimental.def
+0 −5 build/cmake/libbson.def
+2 −2 doc/bson_installing.page.in
+10 −2 doc/mallard2man.py
+10 −2 src/bson/Makefile.am
+12 −0 src/bson/bcon.c
+8 −0 src/bson/bcon.h
+2 −2 src/bson/bson-clock.c
+4 −4 src/bson/bson-compat.h
+9 −0 src/bson/bson-config.h.in
+0 −1 src/bson/bson-decimal128.c
+1 −3 src/bson/bson-decimal128.h
+12 −0 src/bson/bson-iter.c
+6 −0 src/bson/bson-iter.h
+15 −12 src/bson/bson-json.c
+1 −1 src/bson/bson-macros.h
+2 −1 src/bson/bson-oid.c
+3 −1 src/bson/bson-private.h
+49 −9 src/bson/bson-string.c
+2 −4 src/bson/bson-timegm.c
+11 −3 src/bson/bson-types.h
+4 −0 src/bson/bson-value.c
+14 −6 src/bson/bson.c
+6 −0 src/bson/bson.h
+4 −4 src/yajl/yajl_gen.c
+5 −0 src/yajl/yajl_lex.c
+4 −0 src/yajl/yajl_tree.c
+13 −4 tests/Makefile.am
+5 −2 tests/TestSuite.c
+4 −0 tests/test-bcon-basic.c
+4 −0 tests/test-bcon-extract.c
+10 −0 tests/test-bson.c
+17 −1 tests/test-iter.c
+75 −12 tests/test-json.c
+3 −1 tests/test-libbson.c
+38 −0 tests/test-oid.c
+18 −3 tests/test-string.c
+8 −13 tests/test-type.c
+29 −4 tests/test-value.c
2 changes: 1 addition & 1 deletion src/libmongoc
Open in desktop
Submodule libmongoc updated 201 files
48 changes: 24 additions & 24 deletions tests/bson/bson-binary-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,36 +54,36 @@ bool(true)
bool(true)
bool(true)
bool(true)
Test#0 { "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#0 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }"
Copy link
Contributor

Choose a reason for hiding this comment

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

Why are the binary tests changing?

Copy link
Member Author

Choose a reason for hiding this comment

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

See: CDRIVER-1340. I referred ot that in the full commit message for these changes.

bool(true)
Test#1 { "binary" : { "$type" : "01", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "01", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "01", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#1 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "01" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "01" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "01" } }"
bool(true)
Test#2 { "binary" : { "$type" : "02", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "02", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "02", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#2 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "02" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "02" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "02" } }"
bool(true)
Test#3 { "binary" : { "$type" : "03", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "03", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "03", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#3 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "03" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "03" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "03" } }"
bool(true)
Test#4 { "binary" : { "$type" : "04", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "04", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "04", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#4 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "04" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "04" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "04" } }"
bool(true)
Test#5 { "binary" : { "$type" : "05", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "05", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "05", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#5 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "05" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "05" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "05" } }"
bool(true)
Test#6 { "binary" : { "$type" : "80", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "80", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "80", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#6 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "80" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "80" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "80" } }"
bool(true)
Test#7 { "binary" : { "$type" : "85", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }
string(73) "{ "binary" : { "$type" : "85", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
string(73) "{ "binary" : { "$type" : "85", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
Test#7 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "85" } }
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "85" } }"
string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "85" } }"
bool(true)
===DONE===
1 change: 1 addition & 0 deletions tests/bson/bson-decimal128-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--TEST--
BSON\Decimal128
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
Expand Down
1 change: 1 addition & 0 deletions tests/bson/bson-decimal128-002.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--TEST--
BSON\Decimal128 NaN values
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
Expand Down
1 change: 1 addition & 0 deletions tests/bson/bson-decimal128-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--TEST--
BSON\Decimal128 Infinity values
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
Expand Down
1 change: 1 addition & 0 deletions tests/bson/bson-decimal128-004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--TEST--
BSON\Decimal128 debug handler
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
Expand Down
1 change: 1 addition & 0 deletions tests/bson/bson-decimal128-serialization-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
--TEST--
MongoDB\BSON\Decimal128 serialization
--SKIPIF--
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
--FILE--
<?php
Expand Down
Loading