Merge branch 'master' of git://github.com/zendframework/zf2 into cache_options

Author: marc-mabe

src/Page/AbstractPage.php

@@ -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.
      *
@@ -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) {

test/Page/PageFactoryTest.php

@@ -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'