Merge branch 'hotfix/di-exceptions' into release-2.7

Close #159
Fixes #125

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.7.10 - 2016-06-13
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#159](https://github.com/zendframework/zend-mvc/pull/159) removes the
+  dependency on zend-servicemanager-di.
+
+### Fixed
+
+- [#159](https://github.com/zendframework/zend-mvc/pull/159) fixes issues with
+  regards to conflicts between zend-servicemanager v2 and
+  zend-servicemanager-di by re-instating code removed from various
+  servicemanager/DI-related factories in 2.7.9. Two factories,
+  `Zend\Mvc\Service\DiAbstractServiceFactoryFactory` and
+  `Zend\Mvc\Service\DiServiceInitializerFactory`, now raise exceptions if they
+  detect they are running under zend-servicemanager v3, and prompt the developer
+  to install zend-servicemanager-di.
+
 ## 2.7.9 - 2016-06-11
 
 ### Added

composer.json

@@ -16,7 +16,6 @@
         "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-servicemanager-di": "^1.0.1",
         "zendframework/zend-hydrator": "^1.1 || ^2.1",
         "zendframework/zend-form": "^2.7",
         "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
@@ -42,7 +41,7 @@
         "zendframework/zend-validator": "^2.6",
         "zendframework/zend-version": "^2.5",
         "zendframework/zend-view": "^2.6.3",
-        "fabpot/php-cs-fixer": "1.7.*",
+        "friendsofphp/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "^4.5",
         "sebastian/version": "^1.0.4"
     },
@@ -59,6 +58,7 @@
         "zendframework/zend-log": "Zend\\Log component",
         "zendframework/zend-modulemanager": "Zend\\ModuleManager component",
         "zendframework/zend-serializer": "Zend\\Serializer component",
+        "zendframework/zend-servicemanager-di": "^1.0.1, if using zend-servicemanager v3 and requiring the zend-di integration",
         "zendframework/zend-session": "Zend\\Session component for FlashMessenger, PRG, and FPRG plugins",
         "zendframework/zend-text": "Zend\\Text component",
         "zendframework/zend-uri": "Zend\\Uri component",