Merge branch 'feature/forwards-compat' into develop

Close #76

Author: weierophinney

.travis.yml

@@ -11,17 +11,48 @@ cache:
   directories:
     - $HOME/.composer/cache
 
+env:
+  global:
+    - EVENT_MANAGER_VERSION="^3.0"
+    - HYDRATOR_VERSION="^2.1"
+    - SERVICE_MANAGER_VERSION="^3.0.3"
+    - STDLIB_VERSION="^3.0"
+
 matrix:
   fast_finish: true
   include:
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
+    - php: 5.5
+      env:
+        - EVENT_MANAGER_VERSION="^2.6.2"
+        - HYDRATOR_VERSION="^1.1"
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - STDLIB_VERSION="^2.7.5"
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+    - php: 5.6
+      env:
+        - EVENT_MANAGER_VERSION="^2.6.2"
+        - HYDRATOR_VERSION="^1.1"
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - STDLIB_VERSION="^2.7.5"
     - php: 7
+    - php: 7
+      env:
+        - EVENT_MANAGER_VERSION="^2.6.2"
+        - HYDRATOR_VERSION="^1.1"
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - STDLIB_VERSION="^2.7.5"
     - php: hhvm 
+    - php: hhvm 
+      env:
+        - EVENT_MANAGER_VERSION="^2.6.2"
+        - HYDRATOR_VERSION="^1.1"
+        - SERVICE_MANAGER_VERSION="^2.7.5"
+        - STDLIB_VERSION="^2.7.5"
   allow_failures:
     - php: hhvm
 
@@ -33,6 +64,7 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
+  - composer require --no-update "zendframework/zend-eventmanager:$EVENT_MANAGER_VERSION" "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" "zendframework/zend-hydrator:$HYDRATOR_VERSION" "zendframework/zend-stdlib:$STDLIB_VERSION"
 
 install:
   - travis_retry composer install --no-interaction --ignore-platform-reqs

CHANGELOG.md

@@ -2,12 +2,12 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.0 - TBD
+## 2.7.0 - TBD
 
 ### Added
 
-- [#31](https://github.com/zendframework/zend-mvc/pull/31) adds three required
-  arguments to the `Zend\Mvc\Application` constructor: an EventManager
+- [#31](https://github.com/zendframework/zend-mvc/pull/31) adds three new
+  optional arguments to the `Zend\Mvc\Application` constructor: an EventManager
   instance, a Request instance, and a Response instance.
 - [#36](https://github.com/zendframework/zend-mvc/pull/36) adds more than a
   dozen service factories, primarily to separate conditional factories into
@@ -40,56 +40,38 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Deprecated
 
-- Nothing.
+- Two initializers registered by `Zend\Mvc\Service\ServiceManagerConfig` are now
+  deprecated, and will be removed starting in version 3.0:
+  - `ServiceManagerAwareInitializer`, which injects classes implementing
+    `Zend\ServiceManager\ServiceManagerAwareInterface` with the service manager
+    instance. Users should create factories for such classes that directly
+    inject their dependencies instead.
+  - `ServiceLocatorAwareInitializer`, which injects classes implementing
+    `Zend\ServiceManager\ServiceLocatorAwareInterface` with the service manager
+    instance. Users should create factories for such classes that directly
+    inject their dependencies instead.
 
 ### Removed
 
-- [#36](https://github.com/zendframework/zend-mvc/pull/36) removes
-  `Zend\Mvc\Service\ConfigFactory`, as the functionality is now incorporated
-  into `Zend\ModuleManager\Listener\ServiceListener`.
-- [#36](https://github.com/zendframework/zend-mvc/pull/36) removes
-  the `ServiceLocatorAware` intializer, as zend-servicemanager v3 no longer
-  defines the interface.
-- [#36](https://github.com/zendframework/zend-mvc/pull/36) removes
-  `Zend\Mvc\Service\ControllerLoaderFactory` and replaces it with
-  `Zend\Mvc\Service\ControllerManagerFactory`.
-- [#36](https://github.com/zendframework/zend-mvc/pull/36) removes
-  `Zend\Mvc\Service\DiFactory`, `Zend\Mvc\Service\DiAbstractServiceFactory`,
-  `Zend\Mvc\Service\DiStrictAbstractServiceFactory`,
-  `Zend\Mvc\Service\DiStrictAbstractServiceFactoryFactory`,
-  and `Zend\Mvc\Service\DiServiceInitializerFactory`, as zend-servicemanager v3
-  removes `Zend\Di` integration.
+- Nothing.
 
 ### Fixed
 
-- [#31](https://github.com/zendframework/zend-mvc/pull/31) updates the component
-  to use zend-eventmanager v3.
-- [#36](https://github.com/zendframework/zend-mvc/pull/36) updates the component
-  to use zend-servicemanager v3, and zend-modulemanager v3. This involves:
-  - Updating all factories implementing either `FactoryInterface` or
-    `AbstractFactoryInterface` to the new signatures of those interfaces.
-  - Updating all plugin managers to the updates to `AbstractPluginManager`.
-  - Updating how plugin manager factories work (they're now passed the container
-    instance in their constructor arguments, as well as any build options).
+- [#31](https://github.com/zendframework/zend-mvc/pull/31) and
+  [#76](https://github.com/zendframework/zend-mvc/pull/76) update the component
+  to be forwards-compatible with zend-eventmanager v3.
+- [#36](https://github.com/zendframework/zend-mvc/pull/36) and
+  [#76](https://github.com/zendframework/zend-mvc/pull/76) update the component
+  to be forwards-compatible with zend-servicemanager v3. Several changes were
+  introduced to support this effort:
   - Added a `RouteInvokableFactory`, which can act as either a
-   `FactoryInterface` or `AbstractFactoryInterface` for loading invokable route
-   classes, including by fully qualified class name. This is registered as an
-   abstract factory by default with the `RoutePluginManager`.
+    `FactoryInterface` or `AbstractFactoryInterface` for loading invokable route
+    classes, including by fully qualified class name. This is registered as an
+    abstract factory by default with the `RoutePluginManager`.
   - The `DispatchListener` now receives the controller manager instance at
     instantiation.
   - The `ViewManager` implementations were updated, and most functionality
-    within separated into discrete factories. (Previously these instances
-    injected services and aliases into the service manager instance, which is no
-    longer possible or desirable with the zend-servicemanager v3 changes.)
-  - `Application::init()` now pulls the configured service manager from the
-    `Zend\ModuleManager\Listener\ServiceListener` instance before retrieving and
-    bootstrapping the `Application` instance; this ensure it is fully
-    configured at that time.
-- [#38](https://github.com/zendframework/zend-mvc/pull/38) Ensure middleware
-  tests against abstract factories
-  - zend-servicemanager v3 modified the behavior of has() to not search abstract
-    factories by default. You can force it to do so by passing an optional
-    second argument, a boolean flag, with a value of boolean true.
+    within separated into discrete factories.
 
 ## 2.6.4 - TBD