From 5fe1b27fcef1b8c828ef38fd7323c914699d7bbe Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 8 Dec 2015 15:22:42 -0600
Subject: [PATCH 1/2] Updated to zend-expressive-helpers 1.2.0

- Updated version constraint in `composer.json`
- Added dependencies and pre_routing middleware-pipeline entries for
  `Zend\Expressive\Helper\UrlHelperMiddleware` to ensure the middleware
  is registered by default, ensuring the `UrlHelper` will be updated
  with the `RouteResult`.
---
 composer.json                                  | 2 +-
 config/autoload/middleware-pipeline.global.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 691648f..ef16c3c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
         "php": "^5.5 || ^7.0",
         "roave/security-advisories": "dev-master",
         "zendframework/zend-expressive": "~1.0.0@rc || ^1.0",
-        "zendframework/zend-expressive-helpers": "^1.1",
+        "zendframework/zend-expressive-helpers": "^1.2",
         "zendframework/zend-stdlib": "~2.7"
     },
     "require-dev": {
diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index becf92a..ef89935 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -5,6 +5,7 @@
     'dependencies' => [
         'factories' => [
             Helper\ServerUrlMiddleware::class => Helper\ServerUrlMiddlewareFactory::class,
+            Helper\UrlHelperMiddleware::class => Helper\UrlHelperMiddlewareFactory::class,
         ]
     ],
     // This can be used to seed pre- and/or post-routing middleware
@@ -20,6 +21,7 @@
             //    'error' => true,
             //],
             [ 'middleware' => Helper\ServerUrlMiddleware::class ],
+            [ 'middleware' => Helper\UrlHelperMiddleware::class ],
         ],
 
         // An array of middleware to register after registration of the

From 64ae11ee4819eb16e537c18b7699077b81c69119 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 8 Dec 2015 15:25:47 -0600
Subject: [PATCH 2/2] Added CHANGELOG for RC4

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d84d5b8..20b1de4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.0rc4 - TBD
+
+Fourth release candidate.
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Updates to zendframework/zend-expressive-helpers `^1.2`.
+- Adds configuration for auto-registering the new `Zend\Expressive\Helper\UrlHelperMiddleware`
+  as pipeline middleware; this fixes an issue when using the zend-view renderer
+  with the `url()` helper whereby the `UrlHelper` was being registered as a
+  route result observer too late to receive the `RouteResult`.
+
 ## 1.0.0rc3 - 2015-12-07
 
 Third release candidate.