Cleanup

Author: danog

src/types/iterator.rs

@@ -186,7 +186,6 @@ impl<'a> FromZvalMut<'a> for &'a mut ZendIterator {
 #[cfg(feature = "embed")]
 mod tests {
     use crate::embed::Embed;
-    use crate::types::iterator::IterKey;
 
     #[test]
     fn test_generator() {
@@ -212,22 +211,27 @@ mod tests {
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(0));
+                assert_eq!(key.long(), Some(0));
                 assert!(value.is_long());
                 assert_eq!(value.long().unwrap(), 1);
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(1));
+                assert_eq!(key.long(), Some(1));
                 assert!(value.is_long());
                 assert_eq!(value.long().unwrap(), 2);
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(2));
+                assert_eq!(key.long(), Some(2));
                 assert!(value.is_long());
                 assert_eq!(value.long().unwrap(), 3);
 
+                let (key, value) = iter.next().unwrap();
+
+                assert!(key.is_object());
+                assert!(value.is_object());
+
                 let next = iter.next();
 
                 assert!(next.is_none());
@@ -260,23 +264,28 @@ mod tests {
                 let (key, value) = iter.next().unwrap();
 
                 assert!(!key.is_long());
-                assert_eq!(key, IterKey::String("key".to_string()));
+                assert_eq!(key.str(), Some("key"));
                 assert!(value.is_string());
-                assert_eq!(value.string().unwrap(), "foo");
+                assert_eq!(value.str(), Some("foo"));
 
                 let (key, value) = iter.next().unwrap();
 
                 assert!(key.is_long());
-                assert_eq!(key, IterKey::Long(10));
+                assert_eq!(key.long(), Some(10));
                 assert!(value.is_string());
                 assert_eq!(value.string().unwrap(), "bar");
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(2));
+                assert_eq!(key.long(), Some(2));
                 assert!(value.is_string());
                 assert_eq!(value.string().unwrap(), "baz");
 
+                let (key, value) = iter.next().unwrap();
+
+                assert!(key.is_object());
+                assert!(value.is_object());
+
                 let next = iter.next();
 
                 assert!(next.is_none());
@@ -288,22 +297,27 @@ mod tests {
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::String("key".to_string()));
+                assert_eq!(key.str(), Some("key"));
                 assert!(value.is_string());
                 assert_eq!(value.string().unwrap(), "foo");
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(10));
+                assert_eq!(key.long(), Some(10));
                 assert!(value.is_string());
                 assert_eq!(value.string().unwrap(), "bar");
 
                 let (key, value) = iter.next().unwrap();
 
-                assert_eq!(key, IterKey::Long(2));
+                assert_eq!(key.long(), Some(2));
                 assert!(value.is_string());
                 assert_eq!(value.string().unwrap(), "baz");
 
+                let (key, value) = iter.next().unwrap();
+
+                assert!(key.is_object());
+                assert!(value.is_object());
+
                 let next = iter.next();
 
                 assert!(next.is_none());

src/types/iterator.test.php

@@ -4,13 +4,13 @@ function create_generator() {
     yield 1;
     yield 2;
     yield 3;
-    yield new class {};
+    yield new class {} => new class {};
 }
 
 class TestIterator implements \Iterator {
     private $count = 0;
 
-    public function current()
+    public function current(): mixed
     {
         return match ($this->count) {
             0 => 'foo',
@@ -21,12 +21,12 @@ public function current()
         };
     }
 
-    public function next()
+    public function next(): void
     {
         $this->count++;
     }
 
-    public function key()
+    public function key(): mixed
     {
         return match ($this->count) {
             0 => 'key',
@@ -37,12 +37,12 @@ public function key()
         };
     }
 
-    public function valid()
+    public function valid(): bool
     {
-        return $this->count < 3;
+        return $this->count < 4;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->count = 0;
     }