Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fixed #3051 #3052

Closed
wants to merge 1 commit into from

2 participants

@Blinden
  • Added router and routeMatch to toArray method
  • Modified testToArrayMethod
@Blinden Blinden Fixed #3051
* Added router and routeMatch to toArray method
* Modified testToArrayMethod
ced94f9
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3052'
Close #3052
Fix #3051
d8534f2
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3052' into develop
Forward port #3052
9f129fc
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-navigation
@weierophinney weierophinney Merge branch 'hotfix/3052' 65deb5a
@weierophinney weierophinney referenced this pull request from a commit in zendframework/zend-navigation
@weierophinney weierophinney Merge branch 'hotfix/3052' into develop 2f2787b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 23, 2012
  1. @Blinden

    Fixed #3051

    Blinden authored
    * Added router and routeMatch to toArray method
    * Modified testToArrayMethod
This page is out of date. Refresh to see the latest.
View
2  library/Zend/Navigation/Page/Mvc.php
@@ -440,6 +440,8 @@ public function toArray()
'controller' => $this->getController(),
'params' => $this->getParams(),
'route' => $this->getRoute(),
+ 'router' => $this->getRouter(),
+ 'route_match' => $this->getRouteMatch(),
)
);
}
View
4 tests/ZendTest/Navigation/Page/MvcTest.php
@@ -418,7 +418,9 @@ public function testToArrayMethod()
'active' => true,
'visible' => false,
'foo' => 'bar',
- 'meaning' => 42
+ 'meaning' => 42,
+ 'router' => $this->router,
+ 'route_match' => $this->routeMatch,
);
$page = new Page\Mvc($options);
Something went wrong with that request. Please try again.