Merge remote-tracking branch 'upstream/develop' into develop

Author: gabbydgab

.docheader

@@ -0,0 +1,5 @@
+/**
+ * @see       https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
+ * @copyright Copyright (c) %regexp:(20\d{2}-)?20\d{2}% Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
+ */

.travis.yml

@@ -14,15 +14,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
-      env:
-        - DEPS=lowest
-    - php: 5.5
-      env:
-        - DEPS=locked
-    - php: 5.5
-      env:
-        - DEPS=latest
     - php: 5.6
       env:
         - DEPS=lowest
@@ -42,6 +33,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
@@ -66,6 +66,7 @@ install:
 script:
   - composer test
   - if [[ $CHECK_CS == 'true' ]]; then composer cs ; fi
+  - if [[ $CHECK_CS == 'true' ]]; then composer license-check ; fi
 
 notifications:
   email: true

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.2.0 - TBD
+## 1.3.0 - TBD
 
 ### Added
 
@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.1.1 - TBD
+## 1.2.2 - TBD
 
 ### Added
 
@@ -38,6 +38,85 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 1.2.1 - 2017-01-12
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#33](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/33)
+  fixes the signature of the `UrlHelper` to make the default value of
+  `$fragmentIdentifer` a `null` instead of `''`; this fixes an issue whereby
+  missing fragments led to exceptions thrown by zend-expressive-helpers.
+
+## 1.2.0 - 2017-01-11
+
+### Added
+
+- [#30](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/30)
+  adds support for zend-expressive-router 2.0.
+
+- [#30](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/30)
+  adds support for zend-expressive-helpers 2.2 and 3.0.
+
+- [#30](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/30)
+  adds new arguments to the `url()` helper:
+
+  ```php
+  echo $this->url(
+      $routeName,   // (optional) string route for which to generate URI; uses matched when absent
+      $routeParams, // (optional) array route parameter substitutions; uses matched when absent
+      $queryParams, // (optional) array query string arguments to include
+      $fragment,    // (optional) string URI fragment to include
+      $options,     // (optional) array of router options. The key `router` can
+                    //     contain options to pass to the router; the key
+                    //     `reuse_result_params` can be used to disable re-use of
+                    //     matched routing parameters.
+  );
+  ```
+
+  If using zend-expressive-router versions prior to 2.0 and/or
+  zend-expressive-helpers versions prior to 3.0, arguments after `$routeParams`
+  will be ignored.
+
+### Changed
+
+- [#26](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/26)
+  updated the zend-view dependency to 2.8.1+.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#26](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/26)
+  removes the dependencies for the zend-i18n and zend-filter packages, as they
+  are no longer required by the minimum version of zend-view supported.
+
+  If you depended on features of these, you may need to re-add them to your
+  application:
+
+  ```bash
+  $ composer require zendframework/zend-filter zendframework/zend-i18n
+  ```
+
+- This release removes support for PHP 5.5.
+
+### Fixed
+
+- Nothing.
+
 ## 1.1.0 - 2016-03-23
 
 ### Added

README.md

@@ -31,21 +31,6 @@ To use view helpers, the `ZendViewRendererFactory`:
 - a `view_helpers` sub-key; which
 - follows standard zend-servicemanager configuration.
 
-To use the `UrlHelper` provided in this package, ensure that you register its
-factory in that configuration:
-
-```php
-use Zend\Expressive\ZendView\UrlHelperFactory;
-
-return [
-    'view_helpers' => [
-        'factories' => [
-            'url' => UrlHelperFactory::class,
-        ],
-    ],
-];
-```
-
 ## Documentation
 
 See the [zend-expressive](https://github.com/zendframework/zend-expressive/blob/master/doc/book)

composer.json

@@ -13,24 +13,24 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev",
-            "dev-develop": "1.2-dev"
+            "dev-master": "1.2-dev",
+            "dev-develop": "1.3-dev"
         }
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "container-interop/container-interop": "^1.1",
         "psr/http-message": "^1.0",
-        "zendframework/zend-expressive-helpers": "^1.1 || ^2.0",
-        "zendframework/zend-expressive-template": "^1.0.1",
-        "zendframework/zend-filter": "^2.6.1",
-        "zendframework/zend-i18n": "^2.6",
+        "zendframework/zend-expressive-helpers": "^1.1 || ^2.2 || ^3.0",
+        "zendframework/zend-expressive-router": "^1.3.2 || ^2.0",
+        "zendframework/zend-expressive-template": "^1.0.4",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-view": "^2.6.5"
+        "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.7",
-        "squizlabs/php_codesniffer": "^2.3"
+        "phpunit/phpunit": "^5.7",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "malukenho/docheader": "^0.1.5"
     },
     "autoload": {
       "psr-4": {
@@ -44,11 +44,13 @@
     },
     "scripts": {
         "check": [
+            "@license-check",
             "@cs",
             "@test"
         ],
         "cs": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit"
+        "license-check": "docheader check src/ test/",
+        "test": "phpunit --colors=always"
     }
 }