Fixed issues with PHP 7 and the new ReadConcern

derickr · derickr · commit c0d4f60a1d22 · 2015-12-18T16:15:40.000Z
diff --git a/php_phongo.c b/php_phongo.c
@@ -253,7 +253,7 @@ void phongo_readconcern_init(zval *return_value, const mongoc_read_concern_t *re
 
 	object_init_ex(return_value, php_phongo_readconcern_ce);
 
-	intern = (php_phongo_readconcern_t *)zend_object_store_get_object(return_value TSRMLS_CC);
+	intern = Z_READCONCERN_OBJ_P(return_value);
 	intern->read_concern = mongoc_read_concern_copy(read_concern);
 }
 /* }}} */
@@ -1246,7 +1246,7 @@ const mongoc_write_concern_t* phongo_write_concern_from_zval(zval *zwrite_concer
 const mongoc_read_concern_t* phongo_read_concern_from_zval(zval *zread_concern TSRMLS_DC) /* {{{ */
 {
 	if (zread_concern) {
-		php_phongo_readconcern_t *intern = (php_phongo_readconcern_t *)zend_object_store_get_object(zread_concern TSRMLS_CC);
+		php_phongo_readconcern_t *intern = Z_READCONCERN_OBJ_P(zread_concern);
 
 		if (intern) {
 			return intern->read_concern;
@@ -1357,9 +1357,9 @@ void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *
 	array_init_size(retval, 1);
 
 	if (level) {
-		add_assoc_string_ex(retval, ZEND_STRS("level"), (char *)level, 1);
+		ADD_ASSOC_STRING(retval, "level", (char *)level);
 	} else {
-		add_assoc_null_ex(retval, ZEND_STRS("level"));
+		ADD_ASSOC_NULL_EX(retval, "level");
 	}
 } /* }}} */
 
diff --git a/php_phongo_classes.h b/php_phongo_classes.h
@@ -27,6 +27,7 @@
 # define Z_CURSORID_OBJ_P(zv)          php_cursorid_fetch_object(Z_OBJ_P(zv));
 # define Z_MANAGER_OBJ_P(zv)           php_manager_fetch_object(Z_OBJ_P(zv));
 # define Z_QUERY_OBJ_P(zv)             php_query_fetch_object(Z_OBJ_P(zv));
+# define Z_READCONCERN_OBJ_P(zv)       php_readconcern_fetch_object(Z_OBJ_P(zv));
 # define Z_READPREFERENCE_OBJ_P(zv)    php_readpreference_fetch_object(Z_OBJ_P(zv));
 # define Z_SERVER_OBJ_P(zv)            php_server_fetch_object(Z_OBJ_P(zv));
 # define Z_BULKWRITE_OBJ_P(zv)         php_bulkwrite_fetch_object(Z_OBJ_P(zv));
@@ -51,6 +52,7 @@
 # define Z_OBJ_CURSORID(zo)            php_cursorid_fetch_object(zo);
 # define Z_OBJ_MANAGER(zo)             php_manager_fetch_object(zo);
 # define Z_OBJ_QUERY(zo)               php_query_fetch_object(zo);
+# define Z_OBJ_READCONCERN(zo)         php_readconcern_fetch_object(zo);
 # define Z_OBJ_READPREFERENCE(zo)      php_readpreference_fetch_object(zo);
 # define Z_OBJ_SERVER(zo)              php_server_fetch_object(zo);
 # define Z_OBJ_BULKWRITE(zo)           php_bulkwrite_fetch_object(zo);
@@ -79,6 +81,7 @@
 # define Z_CURSORID_OBJ_P(zv)          (php_phongo_cursorid_t *)zend_object_store_get_object(zv TSRMLS_CC);
 # define Z_MANAGER_OBJ_P(zv)           (php_phongo_manager_t *)zend_object_store_get_object(zv TSRMLS_CC);
 # define Z_QUERY_OBJ_P(zv)             (php_phongo_query_t *)zend_object_store_get_object(zv TSRMLS_CC);
+# define Z_READCONCERN_OBJ_P(zv)       (php_phongo_readconcern_t *)zend_object_store_get_object(zv TSRMLS_CC);
 # define Z_READPREFERENCE_OBJ_P(zv)    (php_phongo_readpreference_t *)zend_object_store_get_object(zv TSRMLS_CC);
 # define Z_SERVER_OBJ_P(zv)            (php_phongo_server_t *)zend_object_store_get_object(zv TSRMLS_CC);
 # define Z_BULKWRITE_OBJ_P(zv)         (php_phongo_bulkwrite_t *)zend_object_store_get_object(zv TSRMLS_CC);
@@ -103,6 +106,7 @@
 # define Z_OBJ_CURSORID(zo)            (php_phongo_cursorid_t *)zo;
 # define Z_OBJ_MANAGER(zo)             (php_phongo_manager_t *)zo;
 # define Z_OBJ_QUERY(zo)               (php_phongo_query_t *)zo;
+# define Z_OBJ_READCONCERN(zo)         (php_phongo_readconcern_t *)zo;
 # define Z_OBJ_READPREFERENCE(zo)      (php_phongo_readpreference_t *)zo;
 # define Z_OBJ_SERVER(zo)              (php_phongo_server_t *)zo;
 # define Z_OBJ_BULKWRITE(zo)           (php_phongo_bulkwrite_t *)zo;
diff --git a/php_phongo_structs-5.h b/php_phongo_structs-5.h
@@ -64,6 +64,7 @@ typedef struct {
 	uint32_t                 skip;
 	uint32_t                 limit;
 	uint32_t                 batch_size;
+	mongoc_read_concern_t   *read_concern;
 } php_phongo_query_t;
 
 typedef struct {
diff --git a/php_phongo_structs-7.h b/php_phongo_structs-7.h
@@ -63,6 +63,7 @@ typedef struct {
 	uint32_t                 skip;
 	uint32_t                 limit;
 	uint32_t                 batch_size;
+	mongoc_read_concern_t   *read_concern;
 	zend_object              std;
 } php_phongo_query_t;
 
@@ -178,6 +179,9 @@ static inline php_phongo_manager_t* php_manager_fetch_object(zend_object *obj) {
 static inline php_phongo_query_t* php_query_fetch_object(zend_object *obj) {
     return (php_phongo_query_t *)((char *)obj - XtOffsetOf(php_phongo_query_t, std));
 }
+static inline php_phongo_readconcern_t* php_readconcern_fetch_object(zend_object *obj) {
+    return (php_phongo_readconcern_t *)((char *)obj - XtOffsetOf(php_phongo_readconcern_t, std));
+}
 static inline php_phongo_readpreference_t* php_readpreference_fetch_object(zend_object *obj) {
     return (php_phongo_readpreference_t *)((char *)obj - XtOffsetOf(php_phongo_readpreference_t, std));
 }
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -164,7 +164,8 @@ PHP_METHOD(Manager, executeBulkWrite)
 PHP_METHOD(Manager, getReadConcern)
 {
 	php_phongo_manager_t *intern;
-	(void)return_value_ptr;
+	DECLARE_RETURN_VALUE_USED
+	SUPPRESS_UNUSED_WARNING(return_value_ptr)
 
 	intern = Z_MANAGER_OBJ_P(getThis());
 
diff --git a/src/MongoDB/Query.c b/src/MongoDB/Query.c
@@ -83,7 +83,11 @@ PHP_METHOD(Query, __construct)
 			zval *zread_concern = php_array_fetchc(zoptions, "readConcern");
 
 			if (Z_TYPE_P(zread_concern) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zread_concern), php_phongo_readconcern_ce TSRMLS_CC)) {
+#if PHP_VERSION_ID >= 70000
+				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", ZSTR_VAL(php_phongo_readconcern_ce->name), zend_get_type_by_const(Z_TYPE_P(zread_concern)));
+#else
 				phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", php_phongo_readconcern_ce->name, zend_get_type_by_const(Z_TYPE_P(zread_concern)));
+#endif
 				bson_clear(&intern->query);
 				return;
 			}
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -54,14 +54,14 @@ PHP_METHOD(ReadConcern, __construct)
 	php_phongo_readconcern_t *intern;
 	zend_error_handling       error_handling;
 	char                     *level = NULL;
-	int                       level_len = 0;
+	phongo_zpp_char_len       level_len = 0;
 
 
-	(void)return_value; (void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
 
 
 	zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
-	intern = (php_phongo_readconcern_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_READCONCERN_OBJ_P(getThis());
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!", &level, &level_len) == FAILURE) {
 		zend_restore_error_handling(&error_handling TSRMLS_CC);
@@ -84,9 +84,9 @@ PHP_METHOD(ReadConcern, getLevel)
 {
 	php_phongo_readconcern_t *intern;
 	const char *level;
-	(void)return_value_ptr; (void)return_value_used;
+	SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
 
-	intern = (php_phongo_readconcern_t *)zend_object_store_get_object(getThis() TSRMLS_CC);
+	intern = Z_READCONCERN_OBJ_P(getThis());
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
@@ -95,7 +95,7 @@ PHP_METHOD(ReadConcern, getLevel)
 	level = mongoc_read_concern_get_level(intern->read_concern);
 
 	if (level) {
-		RETURN_STRING(level, 1);
+		PHONGO_RETURN_STRING(level);
 	}
 
 	RETURN_NULL();
@@ -124,37 +124,52 @@ static zend_function_entry php_phongo_readconcern_me[] = {
 
 
 /* {{{ php_phongo_readconcern_t object handlers */
-static void php_phongo_readconcern_free_object(void *object TSRMLS_DC) /* {{{ */
+static void php_phongo_readconcern_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
 {
-	php_phongo_readconcern_t *intern = (php_phongo_readconcern_t*)object;
+	php_phongo_readconcern_t *intern = Z_OBJ_READCONCERN(object);
 
 	zend_object_std_dtor(&intern->std TSRMLS_CC);
 
 	if (intern->read_concern) {
 		mongoc_read_concern_destroy(intern->read_concern);
 	}
+
+#if PHP_VERSION_ID < 70000
 	efree(intern);
+#endif
 } /* }}} */
 
-zend_object_value php_phongo_readconcern_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
+phongo_create_object_retval php_phongo_readconcern_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
 {
-	zend_object_value retval;
 	php_phongo_readconcern_t *intern = NULL;
 
-	intern = (php_phongo_readconcern_t *)ecalloc(1, sizeof *intern);
+	intern = PHONGO_ALLOC_OBJECT_T(php_phongo_readconcern_t, class_type);
 
 	zend_object_std_init(&intern->std, class_type TSRMLS_CC);
 	object_properties_init(&intern->std, class_type);
 
-	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_readconcern_free_object, NULL TSRMLS_CC);
-	retval.handlers = &php_phongo_handler_readconcern;
+#if PHP_VERSION_ID >= 70000
+	intern->std.handlers = &php_phongo_handler_readconcern;
 
-	return retval;
+	return &intern->std;
+#else
+	{
+		zend_object_value retval;
+		retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_readconcern_free_object, NULL TSRMLS_CC);
+		retval.handlers = &php_phongo_handler_readconcern;
+
+		return retval;
+	}
+#endif
 } /* }}} */
 
 HashTable *php_phongo_readconcern_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
 {
+#if PHP_VERSION_ID >= 70000
+	zval retval;
+#else
 	zval retval = zval_used_for_init;
+#endif
 	const mongoc_read_concern_t *read_concern = phongo_read_concern_from_zval(object TSRMLS_CC);
 
 
@@ -178,6 +193,10 @@ PHP_MINIT_FUNCTION(ReadConcern)
 
 	memcpy(&php_phongo_handler_readconcern, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
 	php_phongo_handler_readconcern.get_debug_info = php_phongo_readconcern_get_debug_info;
+#if PHP_VERSION_ID >= 70000
+	php_phongo_handler_readconcern.free_obj = php_phongo_readconcern_free_object;
+	php_phongo_handler_readconcern.offset = XtOffsetOf(php_phongo_readconcern_t, std);
+#endif
 
 	zend_declare_class_constant_stringl(php_phongo_readconcern_ce, ZEND_STRL("LOCAL"), ZEND_STRL(MONGOC_READ_CONCERN_LEVEL_LOCAL) TSRMLS_CC);
 	zend_declare_class_constant_stringl(php_phongo_readconcern_ce, ZEND_STRL("MAJORITY"), ZEND_STRL(MONGOC_READ_CONCERN_LEVEL_MAJORITY) TSRMLS_CC);
diff --git a/src/contrib/php_array_api.h b/src/contrib/php_array_api.h
@@ -515,8 +515,13 @@ void php_array_unsetl_safe(zval *zarr, const char *key, int key_len) {
 }
 #define php_array_unsetn(zarr, idx) \
 	zend_symtable_index_del(Z_ARRVAL_P(zarr), idx)
-#define php_array_unsetc(zarr, litstr) \
+#ifdef ZEND_ENGINE_3
+# define php_array_unsetc(zarr, litstr) \
+	zend_symtable_str_del(Z_ARRVAL_P(zarr), litstr, PAA_LENGTH_ADJ(sizeof(litstr) - 1))
+#else
+# define php_array_unsetc(zarr, litstr) \
 	zend_symtable_del(Z_ARRVAL_P(zarr), litstr, PAA_LENGTH_ADJ(sizeof(litstr) - 1))
+#endif
 static inline void php_array_unsetz(zval *zarr, zval *key) {
 	switch (Z_TYPE_P(key)) {
 		case IS_NULL:
diff --git a/tests/query/query-ctor_error-001.phpt b/tests/query/query-ctor_error-001.phpt
@@ -25,11 +25,11 @@ foreach ($tests as $test) {
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readConcern" option to be MongoDB\Driver\ReadConcern, integer given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Expected "readConcern" option to be MongoDB\Driver\ReadConcern, double given
+Expected "readConcern" option to be MongoDB\Driver\ReadConcern, %r(double|float)%r given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "readConcern" option to be MongoDB\Driver\ReadConcern, string given
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ PHP_METHOD(Manager, executeBulkWrite)`
`164`	`164`	`PHP_METHOD(Manager, getReadConcern)`
`165`	`165`	`{`
`166`	`166`	`php_phongo_manager_t *intern;`
`167`		`- (void)return_value_ptr;`
	`167`	`+ DECLARE_RETURN_VALUE_USED`
	`168`	`+ SUPPRESS_UNUSED_WARNING(return_value_ptr)`
`168`	`169`
`169`	`170`	`intern = Z_MANAGER_OBJ_P(getThis());`
`170`	`171`