Skip to content

Commit

Permalink
Navigation: "module" removed from AbstractPage and unit test
Browse files Browse the repository at this point in the history
unneeded "module" option removed from AbstractPage and from unit test
  • Loading branch information
froschdesign committed Mar 14, 2012
1 parent ffc97f8 commit 74a08ef
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
3 changes: 1 addition & 2 deletions library/Zend/Navigation/Page/AbstractPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ abstract class AbstractPage extends Container
* If 'type' is not given, the type of page to construct will be determined
* by the following rules:
* - If $options contains either of the keys 'action', 'controller',
* 'module', or 'route', a Zend_Navigation_Page_Mvc page will be created.
* or 'route', a Zend_Navigation_Page_Mvc page will be created.
* - If $options contains the key 'uri', a Zend_Navigation_Page_Uri page
* will be created.
*
Expand Down Expand Up @@ -233,7 +233,6 @@ public static function factory($options)

$hasUri = isset($options['uri']);
$hasMvc = isset($options['action']) || isset($options['controller'])
|| isset($options['module'])
|| isset($options['route']);

if ($hasMvc) {
Expand Down
4 changes: 0 additions & 4 deletions tests/Zend/Navigation/Page/PageFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ public function testDetectMvcPage()
'label' => 'MVC Page',
'controller' => 'index'
)),
AbstractPage::factory(array(
'label' => 'MVC Page',
'module' => 'index'
)),
AbstractPage::factory(array(
'label' => 'MVC Page',
'route' => 'home'
Expand Down

0 comments on commit 74a08ef

Please sign in to comment.