diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php index 49ed0cd65..83917422b 100644 --- a/src/AbstractValidator.php +++ b/src/AbstractValidator.php @@ -24,7 +24,7 @@ namespace Zend\Validator; use Traversable, - Zend\Stdlib\IteratorToArray, + Zend\Stdlib\ArrayUtils, Zend\Translator, Zend\Validator\Exception\InvalidArgumentException; @@ -82,7 +82,7 @@ public function __construct($options = null) { // The abstract constructor allows no scalar values if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } if (isset($this->_messageTemplates)) { diff --git a/src/CreditCard.php b/src/CreditCard.php index b75b4d046..3639d5c90 100644 --- a/src/CreditCard.php +++ b/src/CreditCard.php @@ -21,7 +21,7 @@ namespace Zend\Validator; use Traversable, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * @uses \Zend\Validator\AbstractValidator @@ -158,7 +158,7 @@ class CreditCard extends AbstractValidator public function __construct($options = array()) { if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } else if (!is_array($options)) { $options = func_get_args(); $temp['type'] = array_shift($options); diff --git a/src/Date.php b/src/Date.php index fb25f159b..5d3d5c530 100644 --- a/src/Date.php +++ b/src/Date.php @@ -28,7 +28,7 @@ Zend\Locale\Format, Zend\Locale\Locale, Zend\Registry, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * @category Zend @@ -83,7 +83,7 @@ class Date extends AbstractValidator public function __construct($options = array()) { if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } elseif (!is_array($options)) { $options = func_get_args(); $temp['format'] = array_shift($options); diff --git a/src/File/IsCompressed.php b/src/File/IsCompressed.php index b99eddbe1..d0aac1969 100644 --- a/src/File/IsCompressed.php +++ b/src/File/IsCompressed.php @@ -21,7 +21,7 @@ namespace Zend\Validator\File; use Traversable, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * Validator which checks if the file already exists in the directory @@ -94,7 +94,7 @@ public function __construct($options = array()) ); if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } if (empty($options)) { diff --git a/src/File/IsImage.php b/src/File/IsImage.php index 36ec48f95..2f8d1c598 100644 --- a/src/File/IsImage.php +++ b/src/File/IsImage.php @@ -21,7 +21,7 @@ namespace Zend\Validator\File; use Traversable, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * Validator which checks if the file already exists in the directory @@ -119,7 +119,7 @@ public function __construct($options = array()) ); if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } if (empty($options)) { diff --git a/src/File/MimeType.php b/src/File/MimeType.php index e9fe05cdb..7b18254b8 100644 --- a/src/File/MimeType.php +++ b/src/File/MimeType.php @@ -25,7 +25,7 @@ use Traversable, Zend\Loader, - Zend\Stdlib\IteratorToArray, + Zend\Stdlib\ArrayUtils, Zend\Validator\AbstractValidator, Zend\Validator\Exception; @@ -117,7 +117,7 @@ class MimeType extends AbstractValidator public function __construct($options = null) { if ($options instanceof Traversable) { - $options = IteratorToArray::convert($options); + $options = ArrayUtils::iteratorToArray($options); } elseif (is_string($options)) { $this->setMimeType($options); $options = array(); diff --git a/src/Iban.php b/src/Iban.php index 23d24448c..8c17c1ef7 100644 --- a/src/Iban.php +++ b/src/Iban.php @@ -23,7 +23,7 @@ use Traversable, Zend\Locale\Locale, Zend\Registry, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * Validates IBAN Numbers (International Bank Account Numbers) @@ -114,7 +114,7 @@ public function __construct($locale = null) { $options = array(); if ($locale instanceof Traversable) { - $locale = IteratorToArray::convert($locale); + $locale = ArrayUtils::iteratorToArray($locale); } if (is_array($locale)) { diff --git a/src/Identical.php b/src/Identical.php index fefa0f316..5b86cc08c 100644 --- a/src/Identical.php +++ b/src/Identical.php @@ -24,7 +24,7 @@ namespace Zend\Validator; use Traversable, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * @uses \Zend\Validator\AbstractValidator @@ -75,7 +75,7 @@ class Identical extends AbstractValidator public function __construct($token = null) { if ($token instanceof Traversable) { - $token = IteratorToArray::convert($token); + $token = ArrayUtils::iteratorToArray($token); } if (is_array($token) && array_key_exists('token', $token)) { diff --git a/src/Regex.php b/src/Regex.php index 64ea9efaf..29c6667fc 100644 --- a/src/Regex.php +++ b/src/Regex.php @@ -24,7 +24,7 @@ namespace Zend\Validator; use Traversable, - Zend\Stdlib\IteratorToArray; + Zend\Stdlib\ArrayUtils; /** * @uses \Zend\Validator\AbstractValidator @@ -79,7 +79,7 @@ public function __construct($pattern) } if ($pattern instanceof Traversable) { - $pattern = IteratorToArray::convert($pattern); + $pattern = ArrayUtils::iteratorToArray($pattern); } if (!is_array($pattern)) {