Merge branch 'hotfix/4421'

Close zendframework/zendframework#4421

src/AbstractContainer.php

@@ -16,7 +16,7 @@
 use Zend\Stdlib\ErrorHandler;
 
 /**
- * Zend_Navigation_Container
+ * Zend\Navigation\Container
  *
  * AbstractContainer class for Zend\Navigation\Page classes.
  */

src/Navigation.php

@@ -12,7 +12,7 @@
 use Traversable;
 
 /**
- * A simple container class for {@link Zend_Navigation_Page} pages
+ * A simple container class for {@link Zend\Navigation\Page} pages
  */
 class Navigation extends AbstractContainer
 {

src/Page/AbstractPage.php

@@ -146,19 +146,19 @@ abstract class AbstractPage extends AbstractContainer
     // Initialization:
 
     /**
-     * Factory for Zend_Navigation_Page classes
+     * Factory for Zend\Navigation\Page classes
      *
      * A specific type to construct can be specified by specifying the key
      * 'type' in $options. If type is 'uri' or 'mvc', the type will be resolved
-     * to Zend_Navigation_Page_Uri or Zend_Navigation_Page_Mvc. Any other value
+     * to Zend\Navigation\Page\Uri or Zend\Navigation\Page\Mvc. Any other value
      * for 'type' will be considered the full name of the class to construct.
-     * A valid custom page class must extend Zend_Navigation_Page.
+     * A valid custom page class must extend Zend\Navigation\Page\AbstractPage.
      *
      * 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',
-     *   or 'route', a Zend_Navigation_Page_Mvc page will be created.
-     * - If $options contains the key 'uri', a Zend_Navigation_Page_Uri page
+     *   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.
      *
      * @param  array|Traversable $options  options used for creating page