Fixup

Author: danog

guide/src/types/iterable.md

@@ -19,8 +19,8 @@ that implements the `Traversable` interface. This means that any value that can
 # use ext_php_rs::types::Iterable;
 #[php_function]
 pub fn test_iterable(mut iterable: Iterable) {
-    for (k, v) in iterable.iter().expect("cannot get iterable") {
-        println!("k: {} v: {}", k, v.string().unwrap());
+    for (k, v) in iterable.iter().expect("cannot rewind iterator") {
+        println!("k: {:?} v: {}", k, v.string().unwrap());
     }
 }
 # fn main() {}
@@ -35,6 +35,7 @@ $generator = function() {
     yield 'hello' => 'world';
     yield 'rust' => 'php';
     yield 'okk';
+    yield new class {} => new class {};
 };
 
 $array = [

guide/src/types/iterator.md

@@ -22,8 +22,8 @@ If you want a more universal `iterable` type that also supports arrays, see [Ite
 # use ext_php_rs::types::ZendIterator;
 #[php_function]
 pub fn test_iterator(iterator: &mut ZendIterator) {
-    for (k, v) in iterator.iter().expect("cannot get iterator") {
-        println!("k: {} v: {}", k, v.string().unwrap());
+    for (k, v) in iterator.iter().expect("cannot rewind iterator") {
+        println!("k: {:?} v: {}", k, v.string().unwrap());
     }
 }
 # fn main() {}
@@ -38,6 +38,7 @@ $generator = function() {
     yield 'hello' => 'world';
     yield 'rust' => 'php';
     yield 'okk';
+    yield new class {} => new class {};
 };
 
 test_iterator($generator());

src/flags.rs

@@ -395,7 +395,7 @@ impl Display for DataType {
 mod tests {
     use super::DataType;
     use crate::ffi::{
-        IS_ARRAY, IS_ARRAY_EX, IS_CALLABLE, IS_CONSTANT_AST, IS_CONSTANT_AST_EX, IS_DOUBLE,
+        IS_ARRAY, IS_ARRAY_EX, IS_CONSTANT_AST, IS_CONSTANT_AST_EX, IS_DOUBLE,
         IS_FALSE, IS_INDIRECT, IS_INTERNED_STRING_EX, IS_LONG, IS_NULL, IS_OBJECT, IS_OBJECT_EX,
         IS_PTR, IS_REFERENCE, IS_REFERENCE_EX, IS_RESOURCE, IS_RESOURCE_EX, IS_STRING,
         IS_STRING_EX, IS_TRUE, IS_UNDEF, IS_VOID,

src/types/array.rs

@@ -523,7 +523,7 @@ impl ZendHashTable {
     ///
     /// let mut ht = ZendHashTable::new();
     ///
-    /// for (key, val) in ht {
+    /// for (key, val) in ht.iter() {
     /// //   ^ Index if inserted at an index.
     /// //        ^ Optional string key, if inserted like a hashtable.
     /// //             ^ Inserted value.
@@ -648,7 +648,7 @@ impl<'a> IntoIterator for &'a ZendHashTable {
     ///
     /// let mut ht = ZendHashTable::new();
     ///
-    /// for (key, val) in ht {
+    /// for (key, val) in ht.iter() {
     /// //   ^ Index if inserted at an index.
     /// //        ^ Optional string key, if inserted like a hashtable.
     /// //             ^ Inserted value.

src/types/iterator.test.php

@@ -4,6 +4,7 @@ function create_generator() {
     yield 1;
     yield 2;
     yield 3;
+    yield new class {};
 }
 
 class TestIterator implements \Iterator {
@@ -15,6 +16,7 @@ public function current()
             0 => 'foo',
             1 => 'bar',
             2 => 'baz',
+            3 => new class {},
             default => null,
         };
     }
@@ -30,6 +32,7 @@ public function key()
             0 => 'key',
             1 => 10,
             2 => 2,
+            3 => new class {},
             default => null,
         };
     }