Merging develop to master in preparation for 2.7.0

Author: weierophinney

.gitattributes

@@ -1,3 +1,4 @@
+/doc export-ignore
 /test export-ignore
 /vendor export-ignore
 .coveralls.yml export-ignore

.gitignore

@@ -6,7 +6,9 @@
 .*.sw*
 .*.un~
 nbproject
+doc/html/
 tmp/
+zf-mkdoc-theme/
 
 clover.xml
 composer.lock

.travis.yml

@@ -10,18 +10,58 @@ branches:
 cache:
   directories:
     - $HOME/.composer/cache
+    - $HOME/.local
+    - zf-mkdoc-theme
+
+env:
+  global:
+    - EVENT_MANAGER_VERSION="^3.0"
+    - HYDRATOR_VERSION="^2.1"
+    - SERVICE_MANAGER_VERSION="^3.0.3"
+    - STDLIB_VERSION="^3.0"
+    - SITE_URL: https://zendframework.github.io/zend-mvc
+    - GH_USER_NAME: "Matthew Weier O'Phinney"
+    - GH_USER_EMAIL: [email protected]
+    - GH_REF: github.com/zendframework/zend-mvc.git
+    - secure: "naVln9sqGUKWRbe3qlbtcw9Ink0qXmP6iU8A0IAScpuYOeGkDF9ripkCWytjJb+sZFOpjbwwV5spoaWRied1A10P6f8GRMAPJ1xEa0Pm7JE5iCoijUdiC2FJlv0Xd79ir5xAKb4mvyAGxRDgCYXVGYnszGLQYyfaTJ9hVlRQw6N3hcWWUADXxV4Z7Akp5XN6mo52ZRwAXJNmJliyDC4INC1AE2Y8hMbD4SjIetsO7VYBBiOYJhd/9ir7ETlbvt7npEil7KKZP0Y8lanTU2coKESut4b0vE9Vxq6znoK6jrV3xULuZOU6xe3Di8roIAFaR/neeX/blfuvgYCP4lM/ed+CaSD56aFIGizyP0gLB7xrNooBttFh0JV69/8Iu5G7dbZ3nw6gc0cXDvnl9aHpsInAlGbJShlJR9JY1OqxhewgNVA9cWTs2IekdY5Zz/be+elXjYIWkM+3ig6Lw41uaE4AwKp+MdQeyhp4snUIJZeXpdRYsmPDbYI3xTPFDc3bbYgypasox+jLQB0QXY5HKUrlaKdZiY6s1rMHTRnFLLybUlxbPIM1J/rMHPjs0YRgABtVPUsXpNKkY08pkk0cfvxAKTMGP7SmN3P/cSUeWvNNInCUjCnYWSqcqcp25QoIy9BTF4gKjwoCRPfIgzj3jd0qOoRkYx2HuWZVA5+q8SM="
 
 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
+        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
+        - PATH="$HOME/.local/bin:$PATH"
+    - 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 +73,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
@@ -41,6 +82,10 @@ script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
+  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
+
+after_success:
+  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi

CHANGELOG.md

@@ -2,6 +2,87 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.7.0 - TBD
+
+### Added
+
+- [#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
+  discrete factories.
+- [#32](https://github.com/zendframework/zend-mvc/pull/32) adds
+  `Zend\Mvc\MiddlewareListener`, which allows dispatching PSR-7-based middleware
+  implementing the signature `function (ServerRequestInterface $request,
+  ResponseInterface $response)`. To dispatch such middleware, point the
+  `middleware` "default" for a given route to a service name or callable that
+  will resolve to the middleware:
+
+  ```php
+  [ 'router' => 'routes' => [
+      'path' => [
+          'type' => 'Literal',
+          'options' => [
+              'route' => '/path',
+              'defaults' => [
+                  'middleware' => 'ServiceNameForPathMiddleware',
+              ],
+          ],
+      ],
+  ]
+  ```
+
+  This new listener listens at the same priority as the `DispatchListener`, but,
+  due to being registered earlier, will invoke first; if the route match does
+  not resolve to middleware, it will fall through to the original
+  `DispatchListener`, allowing normal ZF2-style controller dispatch.
+- [#84](https://github.com/zendframework/zend-mvc/pull/84) publishes the
+  documentation to https://zendframework.github.io/zend-mvc/
+
+### Deprecated
+
+- 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
+
+- `Zend\Mvc\Controller\AbstractController` no longer directly implements
+  `Zend\ServiceManager\ServiceLocatorAwareInterface`, but still implements the
+  methods defined in that interface. This was done to provide
+  forwards-compatibility, as zend-servicemanager v3 no longer defines the
+  interface. All initializers that do `ServiceLocatorInterface` injection were
+  updated to also inject when just the methods are present.
+
+### Fixed
+
+- [#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),
+  [#76](https://github.com/zendframework/zend-mvc/pull/76),
+  [#80](https://github.com/zendframework/zend-mvc/pull/80),
+  [#81](https://github.com/zendframework/zend-mvc/pull/81), and
+  [#82](https://github.com/zendframework/zend-mvc/pull/82) 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`.
+  - The `DispatchListener` now receives the controller manager instance at
+    instantiation.
+  - The `ViewManager` implementations were updated, and most functionality
+    within separated into discrete factories.
+
 ## 2.6.4 - TBD
 
 ### Added

README.md

@@ -21,4 +21,4 @@ The MVC layer is built on top of the following components:
 
 
 - File issues at https://github.com/zendframework/zend-mvc/issues
-- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-mvc
+- Documentation is at https://zendframework.github.io/zend-mvc/

composer.json

@@ -14,31 +14,33 @@
     },
     "require": {
         "php": "^5.5 || ^7.0",
-        "zendframework/zend-eventmanager": "~2.5",
-        "zendframework/zend-servicemanager": "~2.5",
-        "zendframework/zend-hydrator": "~1.0",
-        "zendframework/zend-form": "~2.6",
-        "zendframework/zend-stdlib": "^2.7.5"
+        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-hydrator": "^1.1 || ^2.1",
+        "zendframework/zend-form": "^2.7",
+        "zendframework/zend-stdlib": "^2.7.5 || ^3.0",
+        "zendframework/zend-psr7bridge": "^0.2",
+        "container-interop/container-interop": "^1.1"
     },
     "require-dev": {
-        "zendframework/zend-authentication": "~2.5",
-        "zendframework/zend-cache": "~2.5",
-        "zendframework/zend-console": "~2.5",
-        "zendframework/zend-di": "~2.5",
-        "zendframework/zend-filter": "~2.5",
-        "zendframework/zend-http": "~2.5",
-        "zendframework/zend-i18n": "~2.5",
-        "zendframework/zend-inputfilter": "~2.5",
-        "zendframework/zend-json": "~2.5",
-        "zendframework/zend-log": "~2.5",
-        "zendframework/zend-modulemanager": "~2.6",
-        "zendframework/zend-session": "~2.5",
-        "zendframework/zend-serializer": "~2.5",
-        "zendframework/zend-text": "~2.5",
-        "zendframework/zend-uri": "~2.5",
-        "zendframework/zend-validator": "~2.5",
-        "zendframework/zend-version": "~2.5",
-        "zendframework/zend-view": "~2.5",
+        "zendframework/zend-authentication": "^2.5.3",
+        "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-console": "^2.6",
+        "zendframework/zend-di": "^2.6",
+        "zendframework/zend-filter": "^2.6.1",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-inputfilter": "^2.6",
+        "zendframework/zend-json": "^2.6.1",
+        "zendframework/zend-log": "^2.7.1",
+        "zendframework/zend-modulemanager": "^2.7.1",
+        "zendframework/zend-session": "^2.6.2",
+        "zendframework/zend-serializer": "^2.6.1",
+        "zendframework/zend-text": "^2.6",
+        "zendframework/zend-uri": "^2.5",
+        "zendframework/zend-validator": "^2.6",
+        "zendframework/zend-version": "^2.5",
+        "zendframework/zend-view": "^2.6.3",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
@@ -62,8 +64,6 @@
         "zendframework/zend-version": "Zend\\Version component",
         "zendframework/zend-view": "Zend\\View component"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "extra": {
         "branch-alias": {
             "dev-master": "2.6-dev",