Skip to content

Commit ff79f64

Browse files
jmikolajmikola
committed
PHPC-758: Disable Decimal128 for bundled libbson and libmongoc 1.4.0
1 parent d8f6ad2 commit ff79f64

19 files changed

+50
-3
lines changed

‎config.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ if test "$MONGODB" != "no"; then
206206
bson-atomic.c \
207207
bson-clock.c \
208208
bson-context.c \
209-
bson-decimal128.c \
210209
bson-error.c \
211210
bson-iter.c \
212211
bson-iso8601.c \
@@ -351,6 +350,8 @@ PHP_ARG_WITH(libbson, whether to use system libbson,
351350
else
352351
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
353352
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
353+
354+
AC_SUBST(BSON_EXPERIMENTAL_FEATURES, 0)
354355
fi
355356

356357
dnl libmongoc stuff {{{
@@ -414,6 +415,7 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
414415
AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
415416

416417
AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
418+
AC_SUBST(MONGOC_EXPERIMENTAL_FEATURES, 0)
417419
fi
418420

419421

‎config.w32

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if (PHP_MONGODB != "no") {
1515
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");
1616
ADD_SOURCES(configure_module_dirname + "/src/contrib/", "php-ssl.c", "mongodb");
1717
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");
18-
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");
18+
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");
1919
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");
2020
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto.c mongoc-scram.c", "mongodb");
2121
ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-stream-tls.c mongoc-ssl.c", "mongodb");
@@ -33,9 +33,11 @@ if (PHP_MONGODB != "no") {
3333
AC_DEFINE("BSON_COMPILATION", 1);
3434
AC_DEFINE("BSON_EXTRA_ALIGN", 0);
3535
AC_DEFINE("BSON_HAVE_DECIMAL128", 0);
36+
AC_DEFINE("BSON_EXPERIMENTAL_FEATURES", 0);
3637
AC_DEFINE("MONGOC_COMPILATION", 1);
3738
AC_DEFINE("MONGOC_NO_AUTOMATIC_GLOBALS", 1);
3839
AC_DEFINE("MONGOC_TRACE", 1);
40+
AC_DEFINE("MONGOC_EXPERIMENTAL_FEATURES", 0);
3941

4042
if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) &&
4143
CHECK_LIB("libeay32.lib", "mongodb", PHP_MONGODB) &&

‎php_phongo.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2086,6 +2086,7 @@ void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data,
20862086
intern->type = (uint8_t) type;
20872087
} /* }}} */
20882088

2089+
#ifdef BSON_EXPERIMENTAL_FEATURES
20892090
void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TSRMLS_DC) /* {{{ */
20902091
{
20912092
php_phongo_decimal128_t *intern;
@@ -2096,6 +2097,7 @@ void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TS
20962097
memcpy(&intern->decimal, decimal, sizeof(bson_decimal128_t));
20972098
intern->initialized = true;
20982099
} /* }}} */
2100+
#endif
20992101

21002102
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC) /* {{{ */
21012103
{
@@ -2493,7 +2495,9 @@ PHP_MINIT_FUNCTION(mongodb)
24932495
PHP_MINIT(Unserializable)(INIT_FUNC_ARGS_PASSTHRU);
24942496
PHP_MINIT(Persistable)(INIT_FUNC_ARGS_PASSTHRU);
24952497
PHP_MINIT(Binary)(INIT_FUNC_ARGS_PASSTHRU);
2498+
#ifdef BSON_EXPERIMENTAL_FEATURES
24962499
PHP_MINIT(Decimal128)(INIT_FUNC_ARGS_PASSTHRU);
2500+
#endif
24972501
PHP_MINIT(Javascript)(INIT_FUNC_ARGS_PASSTHRU);
24982502
PHP_MINIT(MaxKey)(INIT_FUNC_ARGS_PASSTHRU);
24992503
PHP_MINIT(MinKey)(INIT_FUNC_ARGS_PASSTHRU);

‎php_phongo.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, uint32_
167167
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC);
168168
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);
169169
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC);
170+
#ifdef BSON_EXPERIMENTAL_FEATURES
170171
void php_phongo_new_decimal128(zval *object, const bson_decimal128_t *decimal TSRMLS_DC);
172+
#endif
171173
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC);
172174

173175
zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC);

‎php_phongo_classes.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ static inline php_phongo_writeresult_t* php_writeresult_fetch_object(zend_object
6565
static inline php_phongo_binary_t* php_binary_fetch_object(zend_object *obj) {
6666
return (php_phongo_binary_t *)((char *)obj - XtOffsetOf(php_phongo_binary_t, std));
6767
}
68+
#ifdef BSON_EXPERIMENTAL_FEATURES
6869
static inline php_phongo_decimal128_t* php_decimal128_fetch_object(zend_object *obj) {
6970
return (php_phongo_decimal128_t *)((char *)obj - XtOffsetOf(php_phongo_decimal128_t, std));
7071
}
72+
#endif
7173
static inline php_phongo_javascript_t* php_javascript_fetch_object(zend_object *obj) {
7274
return (php_phongo_javascript_t *)((char *)obj - XtOffsetOf(php_phongo_javascript_t, std));
7375
}
@@ -104,7 +106,9 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
104106
# define Z_WRITEERROR_OBJ_P(zv) (php_writeerror_fetch_object(Z_OBJ_P(zv)))
105107
# define Z_WRITERESULT_OBJ_P(zv) (php_writeresult_fetch_object(Z_OBJ_P(zv)))
106108
# define Z_BINARY_OBJ_P(zv) (php_binary_fetch_object(Z_OBJ_P(zv)))
109+
#ifdef BSON_EXPERIMENTAL_FEATURES
107110
# define Z_DECIMAL128_OBJ_P(zv) (php_decimal128_fetch_object(Z_OBJ_P(zv)))
111+
#endif
108112
# define Z_JAVASCRIPT_OBJ_P(zv) (php_javascript_fetch_object(Z_OBJ_P(zv)))
109113
# define Z_MAXKEY_OBJ_P(zv) (php_maxkey_fetch_object(Z_OBJ_P(zv)))
110114
# define Z_MINKEY_OBJ_P(zv) (php_minkey_fetch_object(Z_OBJ_P(zv)))
@@ -127,7 +131,9 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
127131
# define Z_OBJ_WRITEERROR(zo) (php_writeerror_fetch_object(zo))
128132
# define Z_OBJ_WRITERESULT(zo) (php_writeresult_fetch_object(zo))
129133
# define Z_OBJ_BINARY(zo) (php_binary_fetch_object(zo))
134+
#ifdef BSON_EXPERIMENTAL_FEATURES
130135
# define Z_OBJ_DECIMAL128(zo) (php_decimal128_fetch_object(zo))
136+
#endif
131137
# define Z_OBJ_JAVASCRIPT(zo) (php_javascript_fetch_object(zo))
132138
# define Z_OBJ_MAXKEY(zo) (php_maxkey_fetch_object(zo))
133139
# define Z_OBJ_MINKEY(zo) (php_minkey_fetch_object(zo))
@@ -152,7 +158,9 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
152158
# define Z_WRITEERROR_OBJ_P(zv) ((php_phongo_writeerror_t *)zend_object_store_get_object(zv TSRMLS_CC))
153159
# define Z_WRITERESULT_OBJ_P(zv) ((php_phongo_writeresult_t *)zend_object_store_get_object(zv TSRMLS_CC))
154160
# define Z_BINARY_OBJ_P(zv) ((php_phongo_binary_t *)zend_object_store_get_object(zv TSRMLS_CC))
161+
#ifdef BSON_EXPERIMENTAL_FEATURES
155162
# define Z_DECIMAL128_OBJ_P(zv) ((php_phongo_decimal128_t *)zend_object_store_get_object(zv TSRMLS_CC))
163+
#endif
156164
# define Z_JAVASCRIPT_OBJ_P(zv) ((php_phongo_javascript_t *)zend_object_store_get_object(zv TSRMLS_CC))
157165
# define Z_MAXKEY_OBJ_P(zv) ((php_phongo_maxkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
158166
# define Z_MINKEY_OBJ_P(zv) ((php_phongo_minkey_t *)zend_object_store_get_object(zv TSRMLS_CC))
@@ -175,7 +183,9 @@ static inline php_phongo_utcdatetime_t* php_utcdatetime_fetch_object(zend_object
175183
# define Z_OBJ_WRITEERROR(zo) ((php_phongo_writeerror_t *)zo)
176184
# define Z_OBJ_WRITERESULT(zo) ((php_phongo_writeresult_t *)zo)
177185
# define Z_OBJ_BINARY(zo) ((php_phongo_binary_t *)zo)
186+
#ifdef BSON_EXPERIMENTAL_FEATURES
178187
# define Z_OBJ_DECIMAL128(zo) ((php_phongo_decimal128_t *)zo)
188+
#endif
179189
# define Z_OBJ_JAVASCRIPT(zo) ((php_phongo_javascript_t *)zo)
180190
# define Z_OBJ_MAXKEY(zo) ((php_phongo_maxkey_t *)zo)
181191
# define Z_OBJ_MINKEY(zo) ((php_phongo_minkey_t *)zo)
@@ -225,7 +235,9 @@ extern PHONGO_API zend_class_entry *php_phongo_persistable_ce;
225235
extern PHONGO_API zend_class_entry *php_phongo_unserializable_ce;
226236
extern PHONGO_API zend_class_entry *php_phongo_serializable_ce;
227237
extern PHONGO_API zend_class_entry *php_phongo_binary_ce;
238+
#ifdef BSON_EXPERIMENTAL_FEATURES
228239
extern PHONGO_API zend_class_entry *php_phongo_decimal128_ce;
240+
#endif
229241
extern PHONGO_API zend_class_entry *php_phongo_javascript_ce;
230242
extern PHONGO_API zend_class_entry *php_phongo_maxkey_ce;
231243
extern PHONGO_API zend_class_entry *php_phongo_minkey_ce;
@@ -272,7 +284,9 @@ PHP_MINIT_FUNCTION(Unserializable);
272284
PHP_MINIT_FUNCTION(Serializable);
273285
PHP_MINIT_FUNCTION(Persistable);
274286
PHP_MINIT_FUNCTION(Binary);
287+
#ifdef BSON_EXPERIMENTAL_FEATURES
275288
PHP_MINIT_FUNCTION(Decimal128);
289+
#endif
276290
PHP_MINIT_FUNCTION(Javascript);
277291
PHP_MINIT_FUNCTION(MaxKey);
278292
PHP_MINIT_FUNCTION(MinKey);

‎php_phongo_structs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,14 @@ typedef struct {
159159
PHONGO_ZEND_OBJECT_POST
160160
} php_phongo_binary_t;
161161

162+
#ifdef BSON_EXPERIMENTAL_FEATURES
162163
typedef struct {
163164
PHONGO_ZEND_OBJECT_PRE
164165
bool initialized;
165166
bson_decimal128_t decimal;
166167
PHONGO_ZEND_OBJECT_POST
167168
} php_phongo_decimal128_t;
169+
#endif
168170

169171
typedef struct {
170172
PHONGO_ZEND_OBJECT_PRE

‎src/BSON/Decimal128.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#include <bson.h>
2929
#include <mongoc.h>
3030

31+
#ifdef BSON_EXPERIMENTAL_FEATURES
32+
3133
/* PHP Core stuff */
3234
#include <php.h>
3335
#include <php_ini.h>
@@ -283,7 +285,7 @@ PHP_MINIT_FUNCTION(Decimal128)
283285
}
284286
/* }}} */
285287

286-
288+
#endif /* BSON_EXPERIMENTAL_FEATURES */
287289

288290
/*
289291
* Local variables:

‎src/bson.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ uint8_t php_phongo_binary_get_type(zval *object TSRMLS_DC)
151151
return intern->type;
152152
}
153153

154+
#ifdef BSON_EXPERIMENTAL_FEATURES
154155
static bson_decimal128_t *php_phongo_decimal128_get_decimal128(zval *object TSRMLS_DC)
155156
{
156157
php_phongo_decimal128_t *intern;
@@ -159,6 +160,7 @@ static bson_decimal128_t *php_phongo_decimal128_get_decimal128(zval *object TSRM
159160

160161
return &intern->decimal;
161162
}
163+
#endif
162164

163165
char *php_phongo_regex_get_pattern(zval *object TSRMLS_DC)
164166
{
@@ -347,6 +349,7 @@ bool php_phongo_bson_visit_date_time(const bson_iter_t *iter ARG_UNUSED, const c
347349
}
348350
/* }}} */
349351

352+
#ifdef BSON_EXPERIMENTAL_FEATURES
350353
bool php_phongo_bson_visit_decimal128(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_decimal128_t *decimal, void *data) /* {{{ */
351354
{
352355
#if PHP_VERSION_ID >= 70000
@@ -370,6 +373,7 @@ bool php_phongo_bson_visit_decimal128(const bson_iter_t *iter ARG_UNUSED, const
370373
return false;
371374
}
372375
/* }}} */
376+
#endif
373377

374378
bool php_phongo_bson_visit_null(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
375379
{
@@ -616,7 +620,9 @@ static const bson_visitor_t php_bson_visitors = {
616620
php_phongo_bson_visit_maxkey,
617621
php_phongo_bson_visit_minkey,
618622
php_phongo_bson_visit_unsupported_type,
623+
#ifdef BSON_EXPERIMENTAL_FEATURES
619624
php_phongo_bson_visit_decimal128,
625+
#endif
620626
{ NULL }
621627
};
622628

@@ -970,11 +976,13 @@ void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key
970976
bson_append_binary(bson, key, key_len, php_phongo_binary_get_type(object TSRMLS_CC), data, data_len);
971977
return;
972978
}
979+
#ifdef BSON_EXPERIMENTAL_FEATURES
973980
if (instanceof_function(Z_OBJCE_P(object), php_phongo_decimal128_ce TSRMLS_CC)) {
974981
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Decimal128");
975982
bson_append_decimal128(bson, key, key_len, php_phongo_decimal128_get_decimal128(object TSRMLS_CC));
976983
return;
977984
}
985+
#endif
978986
if (instanceof_function(Z_OBJCE_P(object), php_phongo_regex_ce TSRMLS_CC)) {
979987
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Regex");
980988
bson_append_regex(bson, key, key_len, php_phongo_regex_get_pattern(object TSRMLS_CC), php_phongo_regex_get_flags(object TSRMLS_CC));

‎tests/bson/bson-decimal128-001.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
22
BSON\Decimal128
33
--SKIPIF--
4+
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
45
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
56
--FILE--
67
<?php

‎tests/bson/bson-decimal128-002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--TEST--
22
BSON\Decimal128 NaN values
33
--SKIPIF--
4+
<?php if (!class_exists('MongoDB\BSON\Decimal128')) { die('skip MongoDB\BSON\Decimal128 is not available'); } ?>
45
<?php require __DIR__ . '/../utils/basic-skipif.inc'?>
56
--FILE--
67
<?php

0 commit comments

Comments
 (0)