Merge pull request #27 from stein189/v2.0.2

stein189 · web-flow · commit 92e5ba897942 · 2017-10-10T13:59:25.000+02:00
V2.0.2
diff --git a/src/RouteFactory.php b/src/RouteFactory.php
@@ -79,6 +79,7 @@ public function create($url, $method, $action)
 	private function parseUrl($url)
 	{
 		$newUrl = preg_replace($this->patterns, $this->replacements, $url);
+		$newUrl = trim($newUrl, '\/?');
 		$newUrl = trim($newUrl, '\/');
 
 		return $newUrl;
@@ -91,7 +92,7 @@ private function parseUrl($url)
 	 */
 	private function parseArguments($url)
 	{
-		preg_match_all('~{(n:|a:|an:|w:|\*:|\?:)?([a-zA-Z0-9]+)}~', $url, $matches);
+		preg_match_all('~{(n:|a:|an:|w:|\*:|\?:)?([a-zA-Z0-9_]+)}~', $url, $matches);
 
 		if (isset($matches[2]) && !empty($matches[2])) {
 			return $matches[2];

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ public function create($url, $method, $action)`
`79`	`79`	`private function parseUrl($url)`
`80`	`80`	`{`
`81`	`81`	`$newUrl = preg_replace($this->patterns, $this->replacements, $url);`
	`82`	`+ $newUrl = trim($newUrl, '\/?');`
`82`	`83`	`$newUrl = trim($newUrl, '\/');`
`83`	`84`
`84`	`85`	`return $newUrl;`
`@@ -91,7 +92,7 @@ private function parseUrl($url)`
`91`	`92`	`*/`
`92`	`93`	`private function parseArguments($url)`
`93`	`94`	`{`
`94`		`- preg_match_all('~{(n:\|a:\|an:\|w:\|\*:\|\?:)?([a-zA-Z0-9]+)}~', $url, $matches);`
	`95`	`+ preg_match_all('~{(n:\|a:\|an:\|w:\|\*:\|\?:)?([a-zA-Z0-9_]+)}~', $url, $matches);`
`95`	`96`
`96`	`97`	`if (isset($matches[2]) && !empty($matches[2])) {`
`97`	`98`	`return $matches[2];`