Merge branch 'hotfix/cs-fixes'

zendframework · Jan 25, 2018 · e8aa08d · e8aa08d
2 parents c2f2fc4 + 2467d3d
commit e8aa08d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/RouteMatcher/DefaultRouteMatcher.php b/src/RouteMatcher/DefaultRouteMatcher.php
@@ -442,7 +442,13 @@ protected function parseDefinition($def)
                     'alternatives'  => $options,
                     'hasValue'      => false,
                 ];
-            } elseif (preg_match('/\G\[ *?\.\.\.(?P<name>[a-zA-Z][a-zA-Z0-9\_\-\:]*?) *?\](?: +|$)/s', $def, $m, 0, $pos)) {
+            } elseif (preg_match(
+                '/\G\[ *?\.\.\.(?P<name>[a-zA-Z][a-zA-Z0-9\_\-\:]*?) *?\](?: +|$)/s',
+                $def,
+                $m,
+                0,
+                $pos
+            )) {
                 if ($catchAllCount > 0) {
                     throw new Exception\InvalidArgumentException(
                         'Cannot define more than one catchAll parameter'
@@ -462,7 +468,7 @@ protected function parseDefinition($def)
                 );
             }
 
-            if (!empty($item['positional']) && $catchAllCount > 0) {
+            if (! empty($item['positional']) && $catchAllCount > 0) {
                 throw new Exception\InvalidArgumentException(
                     'Positional parameters must come before catchAlls'
                 );