Merging develop to master in preparation for 2.8.0

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.8.0 - TBD
+
+### Added
+
+- [#33](https://github.com/zendframework/zend-navigation/pull/33) adds support
+  for zend-mvc v3.0. Specifically, the `Mvc` page type now allows usage of
+  either `Zend\Mvc\Router` or `Zend\Router` for URI generation.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.7.2 - 2016-06-11
 
 ### Added

composer.json

@@ -22,7 +22,8 @@
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-log": "^2.7.1",
-        "zendframework/zend-mvc": "^2.7",
+        "zendframework/zend-mvc": "^2.7.9 || ^3.0",
+        "zendframework/zend-router": "^3.0",
         "zendframework/zend-permissions-acl": "^2.6",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-uri": "^2.5",
@@ -31,11 +32,11 @@
         "phpunit/phpunit": "^4.5"
     },
     "suggest": {
-        "zendframework/zend-config": "Zend\\Config component",
-        "zendframework/zend-mvc": "Zend\\Mvc component, to provide dynamic routing capabilities for navigation pages",
-        "zendframework/zend-permissions-acl": "Zend\\Permissions\\Acl component, to allow restricting access to navigation pages",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, to use the navigation factories",
-        "zendframework/zend-view": "Zend\\View component, to use the navigation view helpers"
+        "zendframework/zend-config": "^2.6, to provide page configuration (optional, as arrays and Traversables are also allowed)",
+        "zendframework/zend-permissions-acl": "^2.6, to provide ACL-based access restrictions to pages",
+        "zendframework/zend-router": "^3.0, to use router-based URI generation with Mvc pages",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories",
+        "zendframework/zend-view": "^2.6.5, to use the navigation view helpers"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,