Merge branch 'master' into hotfix/json-renderer-merge-unnamed-children

zendframework · Mar 9, 2012 · 105863b · 105863b
commit 105863b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Barcode.php b/src/Barcode.php
@@ -27,7 +27,7 @@
     Zend,
     Zend\Loader\Broker,
     Zend\Loader\ShortNameLocator,
-    Zend\Stdlib\IteratorToArray;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * Class for generate Barcode
@@ -130,7 +130,7 @@ public static function factory($barcode,
          * barcode name and separate config object.
          */
         if ($barcode instanceof Traversable) {
-            $barcode = IteratorToArray::convert($barcode);
+            $barcode = ArrayUtils::iteratorToArray($barcode);
             if (isset($barcode['rendererParams'])) {
                 $rendererConfig = $barcode['rendererParams'];
             }
@@ -181,7 +181,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
          * barcode name and separate configuration.
          */
         if ($barcode instanceof Traversable) {
-            $barcode = IteratorToArray::convert($barcode);
+            $barcode = ArrayUtils::iteratorToArray($barcode);
             if (isset($barcode['barcodeParams']) && is_array($barcode['barcodeParams'])) {
                 $barcodeConfig = $barcode['barcodeParams'];
             }
@@ -192,7 +192,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
             }
         }
         if ($barcodeConfig instanceof Traversable) {
-            $barcodeConfig = IteratorToArray::convert($barcodeConfig);
+            $barcodeConfig = ArrayUtils::iteratorToArray($barcodeConfig);
         }
 
         /*
@@ -234,7 +234,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
          * barcode name and separate config object.
          */
         if ($renderer instanceof Traversable) {
-            $renderer = IteratorToArray::convert($renderer);
+            $renderer = ArrayUtils::iteratorToArray($renderer);
             if (isset($renderer['rendererParams'])) {
                 $rendererConfig = $renderer['rendererParams'];
             }
@@ -243,7 +243,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
             }
         }
         if ($rendererConfig instanceof Traversable) {
-            $rendererConfig = IteratorToArray::convert($rendererConfig);
+            $rendererConfig = ArrayUtils::iteratorToArray($rendererConfig);
         }
 
         /*

diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php
@@ -28,7 +28,7 @@
     Zend\Barcode,
     Zend\Barcode\Object\Exception,
     Zend\Validator\Barcode as BarcodeValidator,
-    Zend\Stdlib\IteratorToArray;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * Class for generate Barcode
@@ -225,7 +225,7 @@ public function __construct($options = null)
         $this->getDefaultOptions();
         $this->font = Barcode\Barcode::getBarcodeFont();
         if ($options instanceof Traversable) {
-            $options = IteratorToArray::convert($options);
+            $options = ArrayUtils::iteratorToArray($options);
         }
         if (is_array($options)) {
             $this->setOptions($options);

diff --git a/src/Renderer/AbstractRenderer.php b/src/Renderer/AbstractRenderer.php
@@ -29,7 +29,7 @@
     Zend\Barcode\Exception as BarcodeException,
     Zend\Barcode\Object,
     Zend\Barcode\Renderer,
-    Zend\Stdlib\IteratorToArray;
+    Zend\Stdlib\ArrayUtils;
 
 /**
  * Class for rendering the barcode
@@ -108,7 +108,7 @@ abstract class AbstractRenderer implements Renderer
     public function __construct($options = null)
     {
         if ($options instanceof Traversable) {
-            $options = IteratorToArray::convert($options);
+            $options = ArrayUtils::iteratorToArray($options);
         }
         if (is_array($options)) {
             $this->setOptions($options);