Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed #3051 #3052

Closed
wants to merge 1 commit into from

2 participants

Bart van der Linden Matthew Weier O'Phinney
Bart van der Linden
  • Added router and routeMatch to toArray method
  • Modified testToArrayMethod
Bart van der Linden Blinden Fixed #3051
* Added router and routeMatch to toArray method
* Modified testToArrayMethod
ced94f9
Deleted user Unknown referenced this pull request from a commit
Matthew Weier O'Phinney weierophinney Merge branch 'hotfix/3052'
Close #3052
Fix #3051
d8534f2
Deleted user Unknown referenced this pull request from a commit
Matthew Weier O'Phinney weierophinney Merge branch 'hotfix/3052' into develop
Forward port #3052
9f129fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 23, 2012
  1. Bart van der Linden

    Fixed #3051

    Blinden authored
    * Added router and routeMatch to toArray method
    * Modified testToArrayMethod
This page is out of date. Refresh to see the latest.
2  library/Zend/Navigation/Page/Mvc.php
View
@@ -440,6 +440,8 @@ public function toArray()
'controller' => $this->getController(),
'params' => $this->getParams(),
'route' => $this->getRoute(),
+ 'router' => $this->getRouter(),
+ 'route_match' => $this->getRouteMatch(),
)
);
}
4 tests/ZendTest/Navigation/Page/MvcTest.php
View
@@ -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.