Convert int64 that overflow 32bit long to strings

This fixes PHPC-197 along with running the `serverStatus` command

Author: bjori

php_compat_53.h

@@ -46,3 +46,29 @@
 #else
 #  define ARG_UNUSED
 #endif
+
+#if SIZEOF_LONG == 4
+# define ADD_INDEX_INT64(zval, index, value) \
+	if (value > LONG_MAX || value < LONG_MIN) { \
+		char *tmp; \
+		int tmp_len; \
+		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
+		tmp_len = spprintf(&tmp, 0, "%lld", value); \
+		add_index_stringl(zval, index, tmp, tmp_len, 0); \
+	} else { \
+		add_index_long(zval, index, val); \
+	}
+# define ADD_ASSOC_INT64(zval, key, value) \
+	if (value > LONG_MAX || value < LONG_MIN) { \
+		char *tmp; \
+		int tmp_len; \
+		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
+		tmp_len = spprintf(&tmp, 0, "%lld", value); \
+		add_assoc_stringl(zval, key, tmp, tmp_len, 0); \
+	} else { \
+		add_assoc_long(zval, key, value); \
+	}
+#else
+# define ADD_INDEX_INT64(zval, index, value) add_index_long(zval, index, value)
+# define ADD_ASSOC_INT64(zval, key, value) add_assoc_long(zval, key, value);
+#endif

src/MongoDB/WriteResult.c

@@ -226,14 +226,7 @@ PHP_METHOD(WriteResult, getUpsertedIds)
 			} else if (BSON_ITER_HOLDS_INT64(&outer)) {
 				int64_t val = bson_iter_int64(&outer);
 
-#if SIZEOF_LONG == 4
-				if (val > INT_MAX) {
-					add_index_long(return_value, index, (double)val);
-				} else
-#endif
-				{
-					add_index_long(return_value, index, val);
-				}
+				ADD_INDEX_INT64(return_value, index, val);
 			}
 		}
 	}

src/bson.c

@@ -381,19 +381,8 @@ bool php_phongo_bson_visit_int64(const bson_iter_t *iter ARG_UNUSED, const char
 {
 	zval *retval = ((php_phongo_bson_state *)data)->zchild;
 
-#if SIZEOF_LONG == 4
-	if (v_int64 > LONG_MAX || v_int64 < LONG_MIN) {
-		char *tmp;
-		int tmp_len;
-
-		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", v_int64);
-		tmp_len = spprintf(&tmp, 0, "%lld", v_int64);
-		add_assoc_stringl(retval, key, tmp, tmp_len, 0);
-		return false;
-	}
-#endif
 
-	add_assoc_long(retval, key, v_int64);
+	ADD_ASSOC_INT64(retval, key, v_int64);
 
 	return false;
 }