Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into hotfix/view-listener-from-null
Browse files Browse the repository at this point in the history
  • Loading branch information
Jurian Sluiman committed Mar 9, 2012
41 parents c31bf4c + 918649e + ecbe771 + b4124fc + f4e1da0 + a8c70a8 + 50d3c5d + 79180fa + f6f9386 + 8ed6590 + d79a4a4 + 3958052 + eae6146 + 1cc7a46 + 1d9542f + a22d6e2 + 3496b67 + 9398e77 + 687d980 + 900dc7d + 21f6363 + 0eeb6ff + 8c442a3 + adf1f8e + c2ceb18 + 9b17a1c + d5dab4a + 346a62a + 9808633 + bdeec54 + 1a2506a + f5f3d02 + b623064 + 4338bf4 + bdababf + 4054000 + 4449c16 + d3d8b33 + 8427cf8 + 8d162ec + 87dc1a4 commit 35fcae3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Container.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
RecursiveIterator,
RecursiveIteratorIterator,
Traversable,
Zend\Stdlib\IteratorToArray;
Zend\Stdlib\ArrayUtils;

/**
* Zend_Navigation_Container
Expand Down
10 changes: 5 additions & 5 deletions src/Page/AbstractPage.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
Zend\Acl\Resource as AclResource,
Zend\Navigation\Container,
Zend\Navigation\Exception,
Zend\Stdlib\IteratorToArray;
Zend\Stdlib\ArrayUtils;

/**
* Base class for Zend\Navigation\Page pages
Expand Down Expand Up @@ -190,7 +190,7 @@ abstract class AbstractPage extends Container
public static function factory($options)
{
if ($options instanceof Traversable) {
$options = IteratorToArray::convert($options);
$options = ArrayUtils::iteratorToArray($options);
}

if (!is_array($options)) {
Expand Down Expand Up @@ -257,7 +257,7 @@ public static function factory($options)
public function __construct($options = null)
{
if ($options instanceof Traversable) {
$options = IteratorToArray::convert($options);
$options = ArrayUtils::iteratorToArray($options);
}
if (is_array($options)) {
$this->setOptions($options);
Expand Down Expand Up @@ -497,7 +497,7 @@ public function setRel($relations = null)

if (null !== $relations) {
if ($relations instanceof Traversable) {
$relations = IteratorToArray::convert($relations);
$relations = ArrayUtils::iteratorToArray($relations);
}

if (!is_array($relations)) {
Expand Down Expand Up @@ -561,7 +561,7 @@ public function setRev($relations = null)

if (null !== $relations) {
if ($relations instanceof Traversable) {
$relations = IteratorToArray::convert($relations);
$relations = ArrayUtils::iteratorToArray($relations);
}

if (!is_array($relations)) {
Expand Down

0 comments on commit 35fcae3

Please sign in to comment.