PHPC-130: Update the get_current_key handler to support pre-5.5

Author: bjori

php_compat_53.h

@@ -10,3 +10,25 @@
 # define object_properties_init(_std, _class_type) \
 		zend_hash_copy(_std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 #endif
+
+#if PHP_VERSION_ID >= 50500
+#define ITERATOR_GET_CURRENT_KEY(it, z) \
+		(it).funcs->get_current_key(&(it), z TSRMLS_CC);
+#else
+#define ITERATOR_GET_CURRENT_KEY(it, z) \
+{ \
+	char *str_key; \
+	uint str_key_len; \
+	ulong int_key; \
+	switch ((it).funcs->get_current_key(&(it), &str_key, &str_key_len, &int_key TSRMLS_CC)) { \
+		case HASH_KEY_IS_LONG: \
+			ZVAL_LONG(z, int_key); \
+			break; \
+		case HASH_KEY_IS_STRING: \
+			ZVAL_STRINGL(z, str_key, str_key_len-1, 0); \
+			break; \
+		default: \
+			RETURN_NULL(); \
+	} \
+} 
+#endif

src/MongoDB/Cursor.c

@@ -246,7 +246,7 @@ PHP_METHOD(Cursor, key)
 	}
 
 	if (intern->it->iterator.funcs->get_current_key) {
-		intern->it->iterator.funcs->get_current_key(&intern->it->iterator, return_value TSRMLS_CC);
+		ITERATOR_GET_CURRENT_KEY(intern->it->iterator, return_value);
 	} else {
 		RETURN_LONG(intern->it->current);
 	}