PHPC-404: Additional hash API changes

Since ADD_ASSOC_STRINGL() always duplicates, use a static buffer in UTCDateTime's debug handler when converting milliseconds to a string on 32-bit platforms.

Author: jmikola

php_phongo.c

@@ -1398,13 +1398,13 @@ void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t
 	} else if (mongoc_write_concern_get_wmajority(write_concern)) {
 		ADD_ASSOC_STRING(retval, "w", (char *)PHONGO_WRITE_CONCERN_W_MAJORITY);
 	} else if (w != MONGOC_WRITE_CONCERN_W_DEFAULT) {
-		ADD_ASSOC_LONG_EX(retval, ZEND_STRS("w"), w);
+		ADD_ASSOC_LONG_EX(retval, "w", w);
 	} else {
-		ADD_ASSOC_NULL_EX(retval, ZEND_STRS("w"));
+		ADD_ASSOC_NULL_EX(retval, "w");
 	}
 
-	ADD_ASSOC_BOOL_EX(retval, ZEND_STRS("wmajority"), mongoc_write_concern_get_wmajority(write_concern));
-	ADD_ASSOC_LONG_EX(retval, ZEND_STRS("wtimeout"), mongoc_write_concern_get_wtimeout(write_concern));
+	ADD_ASSOC_BOOL_EX(retval, "wmajority", mongoc_write_concern_get_wmajority(write_concern));
+	ADD_ASSOC_LONG_EX(retval, "wtimeout", mongoc_write_concern_get_wtimeout(write_concern));
 
 	if (write_concern->journal != MONGOC_WRITE_CONCERN_JOURNAL_DEFAULT) {
 		ADD_ASSOC_BOOL_EX(retval, "journal", mongoc_write_concern_get_journal(write_concern));

src/BSON/Javascript.c

@@ -153,7 +153,7 @@ HashTable *php_phongo_javascript_get_debug_info(zval *object, int *is_temp TSRML
 
 	array_init(&retval);
 
-	add_assoc_stringl_ex(&retval, ZEND_STRS("javascript"), intern->javascript, intern->javascript_len, 1);
+	ADD_ASSOC_STRINGL(&retval, "javascript", intern->javascript, intern->javascript_len);
 
 	if (intern->document) {
 		php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
@@ -164,7 +164,7 @@ HashTable *php_phongo_javascript_get_debug_info(zval *object, int *is_temp TSRML
 			Z_ADDREF_P(state.zchild);
 			add_assoc_zval_ex(&retval, ZEND_STRS("scope"), state.zchild);
 		} else {
-			add_assoc_null_ex(&retval, ZEND_STRS("scope"));
+			ADD_ASSOC_NULL_EX(&retval, "scope");
 		}
 
 		zval_ptr_dtor(&state.zchild);

src/BSON/Regex.c

@@ -219,8 +219,8 @@ HashTable *php_phongo_regex_get_debug_info(zval *object, int *is_temp TSRMLS_DC)
 
 	array_init(&retval);
 
-	add_assoc_stringl_ex(&retval, ZEND_STRS("pattern"), intern->pattern, intern->pattern_len, 1);
-	add_assoc_stringl_ex(&retval, ZEND_STRS("flags"), intern->flags, intern->flags_len, 1);
+	ADD_ASSOC_STRINGL(&retval, "pattern", intern->pattern, intern->pattern_len);
+	ADD_ASSOC_STRINGL(&retval, "flags", intern->flags, intern->flags_len);
 
 	return Z_ARRVAL(retval);
 } /* }}} */

src/BSON/Timestamp.c

@@ -162,8 +162,8 @@ HashTable *php_phongo_timestamp_get_debug_info(zval *object, int *is_temp TSRMLS
 
 	array_init(&retval);
 
-	add_assoc_long_ex(&retval, ZEND_STRS("increment"), intern->increment);
-	add_assoc_long_ex(&retval, ZEND_STRS("timestamp"), intern->timestamp);
+	ADD_ASSOC_LONG_EX(&retval, "increment", intern->increment);
+	ADD_ASSOC_LONG_EX(&retval, "timestamp", intern->timestamp);
 
 	return Z_ARRVAL(retval);
 } /* }}} */

src/BSON/UTCDateTime.c

@@ -195,14 +195,14 @@ HashTable *php_phongo_utcdatetime_get_debug_info(zval *object, int *is_temp TSRM
 
 #if SIZEOF_LONG == 4
 	{
-		char *tmp;
+		char tmp[24];
 		int tmp_len;
 
-		tmp_len = spprintf(&tmp, 0, "%" PRId64, intern->milliseconds);
-		add_assoc_stringl_ex(&retval, ZEND_STRS("milliseconds"), tmp, tmp_len, 0);
+		tmp_len = snprintf(tmp, sizeof(tmp), "%" PRId64, intern->milliseconds);
+		ADD_ASSOC_STRINGL(&retval, "milliseconds", tmp, tmp_len);
 	}
 #else
-	add_assoc_long_ex(&retval, ZEND_STRS("milliseconds"), intern->milliseconds);
+	ADD_ASSOC_LONG_EX(&retval, "milliseconds", intern->milliseconds);
 #endif
 
 	return Z_ARRVAL(retval);

src/MongoDB/Cursor.c

@@ -280,7 +280,7 @@ HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC
 		ADD_ASSOC_ZVAL_EX(&retval, "cursor", zcursor);
 #endif
 	} else {
-		add_assoc_null_ex(&retval, ZEND_STRS("cursor"));
+		ADD_ASSOC_NULL_EX(&retval, "cursor");
 	}
 
 	ADD_ASSOC_LONG_EX(&retval, "server_id", intern->server_id);

src/MongoDB/WriteResult.c

@@ -517,7 +517,7 @@ HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRM
 		ADD_ASSOC_ZVAL_EX(&retval, "writeConcernError", state.zchild);
 #endif
 	} else {
-		ADD_ASSOC_NULL_EX(&retval, ZEND_STRS("writeConcernError"));
+		ADD_ASSOC_NULL_EX(&retval, "writeConcernError");
 	}
 
 	if (intern->write_concern) {