Merge pull request #78 from nguyenk/4.0

fixing map iterator json_encode()
thecodingmachine · Mar 30, 2016 · 12ed494 · 12ed494
2 parents 383122d + fab522b
commit 12ed494
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Mouf/Database/TDBM/MapIterator.php b/src/Mouf/Database/TDBM/MapIterator.php
@@ -7,7 +7,7 @@
 /**
  * An iterator that maps element of another iterator by calling a callback on it.
  */
-class MapIterator implements Iterator
+class MapIterator implements Iterator, \JsonSerializable
 {
     /**
      * @var Iterator
@@ -91,4 +91,9 @@ public function toArray()
     {
         return iterator_to_array($this);
     }
+
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
 }
diff --git a/tests/Mouf/Database/TDBM/MapIteratorTest.php b/tests/Mouf/Database/TDBM/MapIteratorTest.php
@@ -43,4 +43,14 @@ public function testConstructorException2()
             return $item;
         });
     }
+
+    public function testJsonSerialize()
+    {
+        $value = array(1, 2, 3);
+        $mapIterator = new MapIterator($value, function ($item) {
+            return $item;
+        });
+
+        $this->assertEquals($value, json_decode(json_encode($mapIterator), true));
+    }
 }