Fix arginfo, test suite xml

Author: rtheunissen

phpunit.xml

@@ -1,10 +1,9 @@
 <phpunit
-    cacheTokens             = "false"
     backupGlobals           = "false"
     backupStaticAttributes  = "false"
     >
     <testsuites>
-        <testsuite>
+        <testsuite name="all">
             <directory>vendor/php-ds/tests/tests</directory>
         </testsuite>
     </testsuites>

src/php/arginfo.h

@@ -7,19 +7,19 @@ ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_ZVAL(name, z) \
 ZEND_BEGIN_ARG_INFO_EX(arginfo_##name, 0, 0, 0) \
-ZEND_ARG_TYPE_INFO(0, z, 0, 1) \
+ZEND_ARG_INFO(0, z) \
 ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_ZVAL_OPTIONAL_ZVAL(name, z1, z2) \
 ZEND_BEGIN_ARG_INFO_EX(arginfo_##name, 0, 0, 0) \
-ZEND_ARG_TYPE_INFO(0, z1, 0, 1) \
-ZEND_ARG_TYPE_INFO(0, z2, 0, 1) \
+ZEND_ARG_INFO(0, z1) \
+ZEND_ARG_INFO(0, z2) \
 ZEND_END_ARG_INFO()
 
 #define ARGINFO_CALLABLE_OPTIONAL_ZVAL(name, c, z) \
 ZEND_BEGIN_ARG_INFO_EX(arginfo_##name, 0, 0, 1) \
 ZEND_ARG_TYPE_INFO(0, c, IS_CALLABLE, 0) \
-ZEND_ARG_TYPE_INFO(0, z, 0, 1) \
+ZEND_ARG_INFO(0, z) \
 ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_STRING(name, s) \
@@ -73,7 +73,7 @@ ZEND_END_ARG_INFO()
 #define ARGINFO_ZVAL_OPTIONAL_ZVAL(name, z1, z2) \
 ZEND_BEGIN_ARG_INFO_EX(arginfo_##name, 0, 0, 1) \
 ZEND_ARG_INFO(0, z1) \
-ZEND_ARG_TYPE_INFO(0, z2, 0, 1) \
+ZEND_ARG_INFO(0, z2) \
 ZEND_END_ARG_INFO()
 
 #define ARGINFO_LONG_VARIADIC_ZVAL(name, i, v) \
@@ -122,7 +122,7 @@ 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) \
-    ZEND_ARG_TYPE_INFO(0, z, 0, 1) \
+    ZEND_ARG_INFO(0, z) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_STRING_RETURN_STRING(name, s) \
@@ -132,7 +132,7 @@ 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) \
-    ZEND_ARG_TYPE_INFO(0, z, 0, 0) \
+    ZEND_ARG_INFO(0, z) \
     ZEND_END_ARG_INFO()
 
 #define ARGINFO_OPTIONAL_CALLABLE_RETURN_DS(name, c, col) \

src/php/iterators/php_priority_queue_iterator.c

@@ -6,7 +6,10 @@
 
 static void php_ds_priority_queue_iterator_dtor(zend_object_iterator *iter)
 {
+    php_ds_priority_queue_iterator *iterator = (php_ds_priority_queue_iterator *) iter;
 
+    DTOR_AND_UNDEF(&iterator->intern.data);
+    OBJ_RELEASE(iterator->object);
 }
 
 static int php_ds_priority_queue_iterator_valid(zend_object_iterator *iter)
@@ -72,14 +75,15 @@ zend_object_iterator *php_ds_priority_queue_get_iterator(zend_class_entry *ce, z
 
     iterator->intern.funcs = &iterator_funcs;
     iterator->queue        = Z_DS_PRIORITY_QUEUE_P(object);
+    iterator->object       = Z_OBJ_P(object);
     iterator->position     = 0;
 
     // Add a reference to the object so that it doesn't get collected when
     // the iterated object is implict, eg. foreach ($obj->getInstance() as $value){ ... }
 #if PHP_VERSION_ID >= 70300
-    GC_ADDREF(Z_OBJ_P(object));
+    GC_ADDREF(iterator->object);
 #else
-    ++GC_REFCOUNT(Z_OBJ_P(object));
+    ++GC_REFCOUNT(iterator->object);
 #endif
 
     return (zend_object_iterator *) iterator;

src/php/iterators/php_priority_queue_iterator.h

@@ -6,8 +6,9 @@
 
 typedef struct _php_ds_priority_queue_iterator {
     zend_object_iterator    intern;
-    zend_long               position;
+    zend_object            *object;
     ds_priority_queue_t    *queue;
+    zend_long               position;
 } php_ds_priority_queue_iterator;
 
 zend_object_iterator *php_ds_priority_queue_get_iterator(zend_class_entry *ce, zval *object, int by_ref);