Fix getIterator and arginfo

Author: rtheunissen

.gitignore

@@ -15,6 +15,7 @@
 .deps
 .idea
 .libs
+.phpunit.result.cache
 /include
 acinclude.m4
 aclocal.m4
@@ -47,4 +48,4 @@ modules
 run-tests.php
 test
 vendor
-~.tgz
+~.tgz

src/php/arginfo.h

@@ -83,17 +83,31 @@ ZEND_ARG_VARIADIC_INFO(0, v) \
 ZEND_END_ARG_INFO()
 
 #if PHP_VERSION_ID >= 80000
-#define DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
+#define DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
     static const zend_internal_arg_info arginfo_##name[] = { \
         { (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_INIT_CLASS_CONST(PHP_DS_NS_NAME#class_name, allow_null, 0), pass_by_ref},
 #elif PHP_VERSION_ID >= 70200
+#define DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
+    static const zend_internal_arg_info arginfo_##name[] = { \
+        { (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(PHP_DS_NS_NAME#class_name, allow_null), pass_by_ref, 0 },
+#else
+#define DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
+    static const zend_internal_arg_info arginfo_##name[] = { \
+        { (const char*)(zend_uintptr_t)(required_num_args), PHP_DS_NS_NAME#class_name, IS_OBJECT, pass_by_ref, allow_null, 0 },
+#endif
+
+#if PHP_VERSION_ID >= 80000
+#define DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
+    static const zend_internal_arg_info arginfo_##name[] = { \
+        { (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_INIT_CLASS_CONST(class_name, allow_null, 0), pass_by_ref},
+#elif PHP_VERSION_ID >= 70200
 #define DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
 	static const zend_internal_arg_info arginfo_##name[] = { \
-		{ (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(PHP_DS_NS_NAME#class_name, allow_null), pass_by_ref, 0 },
+		{ (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(class_name, allow_null), pass_by_ref, 0 },
 #else
 #define DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, pass_by_ref, required_num_args, class_name, allow_null) \
 	static const zend_internal_arg_info arginfo_##name[] = { \
-		{ (const char*)(zend_uintptr_t)(required_num_args), PHP_DS_NS_NAME#class_name, IS_OBJECT, pass_by_ref, allow_null, 0 },
+		{ (const char*)(zend_uintptr_t)(required_num_args), class_name, IS_OBJECT, pass_by_ref, allow_null, 0 },
 #endif
 
 #if PHP_VERSION_ID >= 80000
@@ -116,12 +130,12 @@ ZEND_END_ARG_INFO()
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_CALLABLE_RETURN_DS(name, c, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 1, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 1, col, 0) \
     ZEND_ARG_TYPE_INFO(0, c, IS_CALLABLE, 0) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_ZVAL_RETURN_DS(name, z, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 0, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 0, col, 0) \
     ZEND_ARG_INFO(0, z) \
     ZEND_END_ARG_INFO()
 
@@ -131,23 +145,23 @@ ZEND_END_ARG_INFO()
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_ZVAL_RETURN_DS(name, z, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 1, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 1, col, 0) \
     ZEND_ARG_INFO(0, z) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_CALLABLE_RETURN_DS(name, c, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 0, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 0, col, 0) \
     ZEND_ARG_TYPE_INFO(0, c, IS_CALLABLE, 1) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_LONG_OPTIONAL_LONG_RETURN_DS(name, i1, i2, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 1, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 1, col, 0) \
     ZEND_ARG_TYPE_INFO(0, i1, IS_LONG, 0) \
     ZEND_ARG_TYPE_INFO(0, i2, IS_LONG, 1) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_LONG_RETURN_DS(name, i, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 1, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 1, col, 0) \
     ZEND_ARG_TYPE_INFO(0, i, IS_LONG, 0) \
     ZEND_END_ARG_INFO()
 
@@ -160,11 +174,11 @@ ZEND_END_ARG_INFO()
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_NONE_RETURN_DS(name, class_name) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 0, class_name, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 0, class_name, 0) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_NONE_RETURN_OBJ(name, class_name) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 0, class_name, 1) \
+    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 0, #class_name, 1) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_NONE_RETURN_BOOL(name) \
@@ -181,7 +195,7 @@ ZEND_END_ARG_INFO()
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_DS_RETURN_DS(name, obj, cls, col) \
-    DS_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, 1, col, 0) \
+    DS_BEGIN_ARG_WITH_RETURN_DS_INFO_EX(name, 0, 1, col, 0) \
     ZEND_ARG_OBJ_INFO(0, obj, Ds\\cls, 0) \
     ZEND_END_ARG_INFO()
 

src/php/classes/php_deque_ce.c

@@ -265,7 +265,8 @@ METHOD(jsonSerialize)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    // zend_object_iterator *iterator = php_ds_deque_get_iterator(php_ds_deque_ce, ZEND_THIS, 0);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_deque()

src/php/classes/php_map_ce.c

@@ -282,7 +282,7 @@ METHOD(xor)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_map()

src/php/classes/php_priority_queue_ce.c

@@ -87,7 +87,7 @@ METHOD(jsonSerialize)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_priority_queue()

src/php/classes/php_queue_ce.c

@@ -91,7 +91,7 @@ METHOD(jsonSerialize)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_queue()

src/php/classes/php_set_ce.c

@@ -223,7 +223,7 @@ METHOD(jsonSerialize)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_set()

src/php/classes/php_stack_ce.c

@@ -92,7 +92,7 @@ METHOD(jsonSerialize)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_stack()

src/php/classes/php_vector_ce.c

@@ -259,7 +259,7 @@ METHOD(unshift)
 
 METHOD(getIterator) {
     PARSE_NONE;
-    zend_create_internal_iterator_zval(return_value, ZEND_THIS);
+    ZVAL_COPY(return_value, ZEND_THIS);
 }
 
 void php_ds_register_vector()