fix: VOL-4642 remove reliance on copy/pasted Laminas 2 code in query routing

config/backend-routes/correspondence.php

@@ -11,7 +11,7 @@
         'options' => [
             'route' => 'correspondence[/]',
         ],
-        'may_terminate' => true,
+        'may_terminate' => false,
         'child_routes' => [
             'single' => RouteConfig::getSingleConfig(
                 [
@@ -33,4 +33,4 @@
             'GET' => QueryConfig::getConfig(Query\Correspondence\Correspondences::class),
         ],
     ]
-];
+];

config/module.config.php

@@ -13,7 +13,7 @@
                 'may_terminate' => false,
                 'child_routes' => [
                     'backend' => [
-                        'type' => \Dvsa\Olcs\Transfer\Util\Hostname::class,
+                        'type' => \Laminas\Router\Http\Hostname::class,
                         'options' => [
                             'route' => 'olcs-backend'
                         ],

src/Router/Query.php

@@ -2,31 +2,18 @@
 
 namespace Dvsa\Olcs\Transfer\Router;
 
-use Dvsa\Olcs\Transfer\Router\LaminasRouterHttpQueryV2 as LaminasQuery;
-use Laminas\Stdlib\RequestInterface as Request;
-use Laminas\Router\Http\RouteMatch;
+use Laminas\Router\Http\Method;
 
-class Query extends LaminasQuery
+class Query extends Method
 {
-    /**
-     * match(): defined by RouteInterface interface.
-     *
-     * @see    \Laminas\Router\RouteInterface::match()
-     * @param  Request $request
-     * @return RouteMatch|null
-     */
-    public function match(Request $request)
+    public function assemble(array $params = [], array $options = [])
     {
-        if (!method_exists($request, 'getMethod')) {
-            return null;
-        }
-
-        $requestVerb = strtoupper($request->getMethod());
+        $mergedParams = array_merge($this->defaults, $params);
 
-        if ($requestVerb === 'GET') {
-            return new RouteMatch($this->defaults);
+        if (count($mergedParams)) {
+            $options['uri']->setQuery($mergedParams);
         }
 
-        return null;
+        return parent::assemble($params, $options);
     }
 }

src/Router/QueryConfig.php

@@ -2,6 +2,8 @@
 
 namespace Dvsa\Olcs\Transfer\Router;
 
+use Laminas\Http\Request;
+
 /**
  * Query Config
  *
@@ -14,6 +16,7 @@ public static function getConfig($dto)
         return [
             'type' => \Dvsa\Olcs\Transfer\Router\Query::class,
             'options' => [
+                'verb' => Request::METHOD_GET,
                 'defaults' => [
                     'dto' => $dto
                 ]