Merge branch 'hotfix/fragment-default' into develop

Forward port #33

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -20,7 +20,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 1.2.1 - TBD
+## 1.2.1 - 2017-01-12
 
 ### Added
 
@@ -36,7 +36,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#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
 

src/UrlHelper.php

@@ -28,10 +28,10 @@ public function __construct(BaseHelper $helper)
     /**
      * Proxies to `Zend\Expressive\Helper\UrlHelper::generate()`
      *
-     * @param string $routeName
+     * @param null|string $routeName
      * @param array  $routeParams
      * @param array  $queryParams
-     * @param string $fragmentIdentifier
+     * @param null|string $fragmentIdentifier
      * @param array  $options Can have the following keys:
      *     - router (array): contains options to be passed to the router
      *     - reuse_result_params (bool): indicates if the current RouteResult
@@ -42,7 +42,7 @@ public function __invoke(
         $routeName = null,
         array $routeParams = [],
         array $queryParams = [],
-        $fragmentIdentifier = '',
+        $fragmentIdentifier = null,
         array $options = []
     ) {
         return $this->helper->generate($routeName, $routeParams, $queryParams, $fragmentIdentifier, $options);

test/UrlHelperTest.php

@@ -25,7 +25,7 @@ public function createHelper()
 
     public function testInvocationProxiesToBaseHelper()
     {
-        $this->baseHelper->generate('resource', ['id' => 'sha1'], [], '', [])->willReturn('/resource/sha1');
+        $this->baseHelper->generate('resource', ['id' => 'sha1'], [], null, [])->willReturn('/resource/sha1');
         $helper = $this->createHelper();
         $this->assertEquals('/resource/sha1', $helper('resource', ['id' => 'sha1']));
     }
@@ -45,4 +45,23 @@ public function testUrlHelperAcceptsQueryParametersFragmentAndOptions()
             $helper('resource', ['id' => 'sha1'], ['foo' => 'bar'], 'fragment', ['reuse_result_params' => true])
         );
     }
+
+    /**
+     * In particular, the fragment identifier needs to be null.
+     */
+    public function testUrlHelperPassesExpectedDefaultsToBaseHelper()
+    {
+        $this->baseHelper->generate(
+            null,
+            [],
+            [],
+            null,
+            []
+        )->willReturn('PATH');
+        $helper = $this->createHelper();
+        $this->assertEquals(
+            'PATH',
+            $helper()
+        );
+    }
 }