Merge remote-tracking branch 'origin/2.0'

Author: dbu

CHANGELOG.md

@@ -1,8 +1,16 @@
 Changelog
 =========
 
+2.1.0 (unreleased)
+------------------
+
 * **2017-10-23**: Dropped php hhvm support
 
+2.0.3
+-----
+
+Fixed edge case in error reporting in ChainRouter.
+
 2.0.0
 -----
 

src/ChainRouter.php

@@ -288,6 +288,10 @@ private function rebuildRequest($pathinfo)
     private function getErrorMessage($name, $router = null, $parameters = null)
     {
         if ($router instanceof VersatileGeneratorInterface) {
+            // the $parameters are not forced to be array, but versatile generator does typehint it
+            if (!is_array($parameters)) {
+                $parameters = [];
+            }
             $displayName = $router->getRouteDebugMessage($name, $parameters);
         } elseif (is_object($name)) {
             $displayName = method_exists($name, '__toString')