Merge branch 'hotfix/config-dep'

Close #40
zendframework · May 16, 2016 · 2a59ab9 · 2a59ab9
2 parents f7ea8cf + e50a3f1
commit 2a59ab9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,16 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.2 - TBD
+## 2.7.2 - 2016-05-16
 
 ### Added
 
 - [#38](https://github.com/zendframework/zend-modulemanager/pull/38) prepares
   and publishes the documentation to https://zendframework.github.io/zend-modulemanager/
+- [#40](https://github.com/zendframework/zend-modulemanager/pull/40) adds a
+  requirement on zend-config. Since the default use case centers around config
+  merging and requires the component, it should be required by
+  zend-modulemanager.
 
 ### Deprecated
 

diff --git a/composer.json b/composer.json
@@ -14,11 +14,11 @@
     },
     "require": {
         "php": "^5.5 || ^7.0",
+        "zendframework/zend-config": "^2.6",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "^2.6",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-di": "^2.6",
         "zendframework/zend-loader": "^2.5",