Merge pull request #30 from xtreamwayz/feature/add-query-params-and-fragment

Add query params, fragment and reuse route result

Conflicts:
	composer.lock

Author: weierophinney

composer.json

@@ -21,7 +21,8 @@
         "php": "^5.5 || ^7.0",
         "container-interop/container-interop": "^1.1",
         "psr/http-message": "^1.0",
-        "zendframework/zend-expressive-helpers": "^1.1 || ^2.0",
+        "zendframework/zend-expressive-helpers": "^3.0.0-dev",
+        "zendframework/zend-expressive-router": "^2.0.0-dev",
         "zendframework/zend-expressive-template": "^1.0.1",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-view": "^2.8.1"

composer.lock

@@ -28,12 +28,24 @@ public function __construct(BaseHelper $helper)
     /**
      * Proxies to `Zend\Expressive\Helper\UrlHelper::generate()`
      *
-     * @param string $route
-     * @param array $params
+     * @param string $routeName
+     * @param array  $routeParams
+     * @param array  $queryParams
+     * @param 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
+     *                              parameters will be used, defaults to true
+     *
      * @return string
      */
-    public function __invoke($route = null, $params = [])
-    {
-        return $this->helper->generate($route, $params);
+    public function __invoke(
+        $routeName = null,
+        array $routeParams = [],
+        array $queryParams = [],
+        $fragmentIdentifier = '',
+        array $options = []
+    ) {
+        return $this->helper->generate($routeName, $routeParams, $queryParams, $fragmentIdentifier, $options);
     }
 }

src/UrlHelper.php

@@ -9,7 +9,6 @@
 
 namespace ZendTest\Expressive\ZendView;
 
-use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Expressive\Helper\UrlHelper as BaseHelper;
 use Zend\Expressive\ZendView\UrlHelper;
@@ -28,8 +27,24 @@ public function createHelper()
 
     public function testInvocationProxiesToBaseHelper()
     {
-        $this->baseHelper->generate('resource', ['id' => 'sha1'])->willReturn('/resource/sha1');
+        $this->baseHelper->generate('resource', ['id' => 'sha1'], [], '', [])->willReturn('/resource/sha1');
         $helper = $this->createHelper();
         $this->assertEquals('/resource/sha1', $helper('resource', ['id' => 'sha1']));
     }
+
+    public function testUrlHelperAcceptsQueryParametersFragmentAndOptions()
+    {
+        $this->baseHelper->generate(
+            'resource',
+            ['id' => 'sha1'],
+            ['foo' => 'bar'],
+            'fragment',
+            ['reuse_result_params' => true]
+        )->willReturn('PATH');
+        $helper = $this->createHelper();
+        $this->assertEquals(
+            'PATH',
+            $helper('resource', ['id' => 'sha1'], ['foo' => 'bar'], 'fragment', ['reuse_result_params' => true])
+        );
+    }
 }