Merge 85a1ddf into b838a5d

zendframework · Nov 14, 2019 · bf8f988 · bf8f988
2 parents b838a5d + 85a1ddf
commit bf8f988
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/src/Helper/Url.php b/src/Helper/Url.php
@@ -103,7 +103,33 @@ public function __invoke($name = null, $params = [], $options = [], $reuseMatche
 
         $options['name'] = $name;
 
-        return $this->router->assemble($params, $options);
+        try {
+            return $this->router->assemble($params, $options);
+        } catch (\Zend\Router\Exception\InvalidArgumentException $e) {
+            throw new Exception\InvalidArgumentException(
+                sprintf(
+                    'Couldnt create URL for route "%s", params "%s" and options "%s": %s',
+                    $name,
+                    json_encode($params),
+                    json_encode($options),
+                    $e->getMessage()
+                ),
+                $e->getCode(),
+                $e
+            );
+        } catch (\Zend\Router\Exception\RuntimeException $e) {
+            throw new Exception\RuntimeException(
+                sprintf(
+                    'Couldnt create URL for route "%s", params "%s" and options "%s": %s',
+                    $name,
+                    json_encode($params),
+                    json_encode($options),
+                    $e->getMessage()
+                ),
+                $e->getCode(),
+                $e
+            );
+        }
     }
 
     /**

diff --git a/src/HelperPluginManager.php b/src/HelperPluginManager.php
@@ -153,7 +153,7 @@ class HelperPluginManager extends AbstractPluginManager
         Helper\Asset::class               => Helper\Service\AssetFactory::class,
         Helper\FlashMessenger::class      => Helper\Service\FlashMessengerFactory::class,
         Helper\Identity::class            => Helper\Service\IdentityFactory::class,
-        Helper\BasePath::class            => InvokableFactory::class,
+        Helper\BasePath::class            => InvokableFactory::class, // overridden in ViewHelperManagerFactory
         Helper\Cycle::class               => InvokableFactory::class,
         Helper\DeclareVars::class         => InvokableFactory::class,
         Helper\Doctype::class             => InvokableFactory::class, // overridden in ViewHelperManagerFactory
@@ -184,7 +184,7 @@ class HelperPluginManager extends AbstractPluginManager
         Helper\RenderChildModel::class    => InvokableFactory::class,
         Helper\RenderToPlaceholder::class => InvokableFactory::class,
         Helper\ServerUrl::class           => InvokableFactory::class,
-        Helper\Url::class                 => InvokableFactory::class,
+        Helper\Url::class                 => InvokableFactory::class, // overridden in ViewHelperManagerFactory
         Helper\ViewModel::class           => InvokableFactory::class,
 
         // v2 canonical FQCNs