Merge pull request #414

Author: jmikola

phongo_compat.h

@@ -113,10 +113,10 @@
 # define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
 # define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
 # define PHONGO_STREAM_ID(stream) stream->res ? stream->res->handle : -1
-# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), _value);
-# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), _value, _len);
+# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), (char *)(_value));
+# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), (char *)(_value), _len);
+# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, (char *)(_value), _value_len);
 # define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRL(_key), _value);
-# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, _value, _value_len);
 # define ADD_ASSOC_ZVAL_EX(_zv, _key, _value) add_assoc_zval_ex(_zv, ZEND_STRL(_key), _value);
 # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
 # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key));
@@ -145,9 +145,9 @@
 # define DECLARE_RETURN_VALUE_USED
 # define EXCEPTION_P(_ex, _zp) _zp = _ex
 # define PHONGO_STREAM_ID(stream) stream->rsrc_id
-# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), _value, 1);
-# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), _value, _len, 1);
-# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len+1, _value, _value_len, 1);
+# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), (char *)(_value), 1);
+# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), (char *)(_value), _len, 1);
+# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len+1, (char *)(_value), _value_len, 1);
 # define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRS(_key), _value);
 # define ADD_ASSOC_ZVAL_EX(_zv, _key, _value) add_assoc_zval_ex(_zv, ZEND_STRS(_key), _value);
 # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);

php_phongo.c

@@ -930,7 +930,7 @@ void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *
 	array_init_size(retval, 1);
 
 	if (level) {
-		ADD_ASSOC_STRING(retval, "level", (char *)level);
+		ADD_ASSOC_STRING(retval, "level", level);
 	}
 } /* }}} */
 
@@ -998,9 +998,9 @@ void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t
 	array_init_size(retval, 4);
 
 	if (wtag) {
-		ADD_ASSOC_STRING(retval, "w", (char *)wtag);
+		ADD_ASSOC_STRING(retval, "w", wtag);
 	} else if (mongoc_write_concern_get_wmajority(write_concern)) {
-		ADD_ASSOC_STRING(retval, "w", (char *)PHONGO_WRITE_CONCERN_W_MAJORITY);
+		ADD_ASSOC_STRING(retval, "w", PHONGO_WRITE_CONCERN_W_MAJORITY);
 	} else if (w != MONGOC_WRITE_CONCERN_W_DEFAULT) {
 		ADD_ASSOC_LONG_EX(retval, "w", w);
 	}
@@ -1453,7 +1453,7 @@ static char *php_phongo_manager_make_client_hash(const char *uri_string, zval *o
 	zval                  args;
 
 	array_init_size(&args, 3);
-	ADD_ASSOC_STRING(&args, "uri", (char *) uri_string);
+	ADD_ASSOC_STRING(&args, "uri", uri_string);
 
 	if (options) {
 		ADD_ASSOC_ZVAL_EX(&args, "options", options);
@@ -1484,7 +1484,7 @@ static char *php_phongo_manager_make_client_hash(const char *uri_string, zval *o
 
 	MAKE_STD_ZVAL(args);
 	array_init_size(args, 3);
-	ADD_ASSOC_STRING(args, "uri", (char *) uri_string);
+	ADD_ASSOC_STRING(args, "uri", uri_string);
 
 	if (options) {
 		ADD_ASSOC_ZVAL_EX(args, "options", options);

src/MongoDB/Manager.c

@@ -461,7 +461,7 @@ HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_D
 
 	array_init_size(&retval, 2);
 
-	ADD_ASSOC_STRING(&retval, "uri", (char *)mongoc_uri_get_string(mongoc_client_get_uri(intern->client)));
+	ADD_ASSOC_STRING(&retval, "uri", mongoc_uri_get_string(mongoc_client_get_uri(intern->client)));
 
 	sds = mongoc_client_get_server_descriptions(intern->client, &n);
 

src/bson.c

@@ -221,7 +221,7 @@ bool php_phongo_bson_visit_utf8(const bson_iter_t *iter ARG_UNUSED, const char *
 	zval *retval = ((php_phongo_bson_state *)data)->zchild;
 #endif
 
-	ADD_ASSOC_STRING_EX(retval, key, strlen(key), (char *)v_utf8, v_utf8_len);
+	ADD_ASSOC_STRING_EX(retval, key, strlen(key), v_utf8, v_utf8_len);
 
 	return false;
 }
@@ -241,7 +241,7 @@ bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, const char
 		zend_class_entry *found_ce = zend_fetch_class(zs_classname, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
 		zend_string_free(zs_classname);
 #else
-		zend_class_entry *found_ce = zend_fetch_class((char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
+		zend_class_entry *found_ce = zend_fetch_class((const char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
 #endif
 
 		if (found_ce && PHONGO_IS_CLASS_INSTANTIATABLE(found_ce) && instanceof_function(found_ce, php_phongo_persistable_ce TSRMLS_CC)) {