Merge branch 'master' of https://github.com/zendframework/zf2 into zu…

…cchi/router-tweaks
zendframework · Mar 9, 2012 · 5ffaadf · 5ffaadf
14 parents cd6d5f2 + a512601 + 926e71f + 1f29b3e + a75171a + 9a8e72f + 814716e + 88d9371 + 678232d + a0560e8 + 4ff045c + ac805a6 + 41f360c + 42a6b22
commit 5ffaadf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/PatternFactory.php b/src/PatternFactory.php
@@ -22,7 +22,7 @@
 
 use Traversable,
     Zend\Loader\Broker,
-    Zend\Stdlib\IteratorToArray;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * @category   Zend
@@ -50,7 +50,7 @@ class PatternFactory
     public static function factory($patternName, $options = array())
     {
         if ($options instanceof Traversable) {
-            $options = IteratorToArray::convert($options);
+            $options = ArrayUtils::iteratorToArray($options);
         }
         if (is_array($options)) {
             $options = new Pattern\PatternOptions($options);

diff --git a/src/StorageFactory.php b/src/StorageFactory.php
@@ -23,7 +23,7 @@
 
 use Traversable,
     Zend\Loader\Broker,
-    Zend\Stdlib\IteratorToArray;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * @category   Zend
@@ -59,7 +59,7 @@ class StorageFactory
     public static function factory($cfg)
     {
         if ($cfg instanceof Traversable) {
-            $cfg = IteratorToArray::convert($cfg);
+            $cfg = ArrayUtils::iteratorToArray($cfg);
         }
 
         if (!is_array($cfg)) {