Merging develop to master in preparation for 2.9.0 release

Author: weierophinney

.travis.yml

@@ -15,7 +15,9 @@ cache:
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - LEGACY_DEPS="phpunit/phpunit"
     - LATEST_DEPS="zendframework/zend-mvc-plugin-flashmessenger zendframework/zend-mvc-i18n zendframework/zend-mvc-console"
     - SITE_URL=https://zendframework.github.io/zend-view
     - GH_USER_NAME="Matthew Weier O'Phinney"
@@ -25,16 +27,6 @@ env:
 
 matrix:
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - CS_CHECK=true
-        - DEPS=locked
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
@@ -56,6 +48,15 @@ matrix:
     - php: 7
       env:
         - DEPS=latest
+    - php: 7.1
+      env:
+        - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
+    - php: 7.1
+      env:
+        - DEPS=latest
     - php: hhvm 
       env:
         - DEPS=lowest
@@ -77,11 +78,12 @@ before_install:
   - composer self-update
 
 install:
-  - travis_retry composer install $COMPOSER_ARGS
+  - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
+  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer require --dev --no-update $COMPOSER_ARGS $LATEST_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - composer show --installed
 
 script:

CHANGELOG.md

@@ -2,6 +2,66 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.9.0 - TBD
+
+### Added
+
+- [#89](https://github.com/zendframework/zend-view/pull/89) updates the
+  `HeadScript` and `InlineScript` view helpers to whitelist the `id` attribute
+  as an optional attribute.
+
+- [#96](https://github.com/zendframework/zend-view/pull/96) updates the
+  `HeadScript`, `HeadLink`, and `InlineScript` view helpers to whitelist the
+  `crossorigin` and `integrity` attributes as optional attributes.
+
+- [#64](https://github.com/zendframework/zend-view/pull/64) adds a new `Asset`
+  view helper. This helper uses the following configuration to map a named asset
+  to the actual file to serve:
+
+  ```php
+  'view_helper_config' => [
+      'asset' => [
+          'resource_map' => [
+              'css/style.css' => 'css/style-3a97ff4ee3.css',
+              'js/vendor.js' => 'js/vendor-a507086eba.js',
+          ],
+      ],
+  ],
+  ```
+
+  This can also be automated via tools such as gulp-rev and grunt-rev by using
+  the `rev-manifest.json` each creates directly within your configuration:
+
+  ```php
+  'view_helper_config' => [
+      'asset' => [
+          'resource_map' => json_decode(file_get_contents('path/to/rev-manifest.json'), true),
+      ],
+  ],
+  ```
+
+  The benefit of this approach is that it allows your view scripts to reference
+  a static asset name, while integrating with your JS and CSS build tools.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#114](https://github.com/zendframework/zend-view/pull/114) removes support
+  for PHP 5.5.
+
+### Fixed
+
+- [#110](https://github.com/zendframework/zend-view/pull/110) provides a fix
+  for the navigation helpers to ensure that usage of either the `default` or
+  `navigation` containers (documentation specified `default`, but usage only
+  allowed `navigation` previously). When `default` is specified, the
+  `Zend\Navigation\Navigation` service will be used for the container; if
+  `navigation` is used, that service will be pulled instead (which is usually an
+  alias for the `Zend\Navigation\Navigation` service anyways).
+
 ## 2.8.2 - 2017-03-20
 
 ### Added

composer.json

@@ -13,14 +13,16 @@
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-loader": "^2.5",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^5.7.15 || ^6.0.8",
         "zendframework/zend-authentication": "^2.5",
         "zendframework/zend-cache": "^2.6.1",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-escaper": "^2.5",
@@ -39,9 +41,7 @@
         "zendframework/zend-serializer": "^2.6.1",
         "zendframework/zend-session": "^2.6.2",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-uri": "^2.5",
-        "phpunit/phpunit": "^4.6",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "zendframework/zend-uri": "^2.5"
     },
     "suggest": {
         "zendframework/zend-authentication": "Zend\\Authentication component",
@@ -60,6 +60,9 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
+    "config": {
+        "sort-packages": "true"
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "2.8-dev",