Merge pull request #206 from Slamdunk/hotfix/debug-export-arrayiterator

Debug::export ArrayIterator dumps the internal storage variable
doctrine · Jan 25, 2013 · db84fc1 · db84fc1
2 parents f44d98d + bd64f3a
commit db84fc1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/Doctrine/Common/Util/Debug.php b/lib/Doctrine/Common/Util/Debug.php
@@ -104,7 +104,7 @@ public static function export($var, $maxDepth)
                         $return->__PROXY_INITIALIZED__ = $var->__isInitialized();
                     }
 
-                    if ($var instanceof \ArrayObject) {
+                    if ($var instanceof \ArrayObject || $var instanceof \ArrayIterator) {
                         $return->__STORAGE__ = self::export($var->getArrayCopy(), $maxDepth - 1);
                     }
 

diff --git a/tests/Doctrine/Tests/Common/Util/DebugTest.php b/tests/Doctrine/Tests/Common/Util/DebugTest.php
@@ -25,11 +25,16 @@ public function testExportDateTime()
         $this->assertEquals( "DateTime", $var->__CLASS__ );
     }
 
-    public function testExportArrayObject()
+    public function testExportArrayTraversable()
     {
         $obj = new \ArrayObject(array('foobar'));
 
         $var = Debug::export($obj, 2);
         $this->assertContains('foobar', $var->__STORAGE__);
+
+        $it = new \ArrayIterator(array('foobar'));
+
+        $var = Debug::export($it, 5);
+        $this->assertContains('foobar', $var->__STORAGE__);
     }
 }