Parameters with placeholder names

klapuch · Mar 25, 2017 · 661e0ad · 661e0ad
1 parent 8fe22c1
commit 661e0ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Core/HttpRoute.php b/Core/HttpRoute.php
@@ -30,13 +30,11 @@ public function action(): string {
 	}
 
 	public function parameters(): array {
-		$parameters = array_values(
-			array_diff(
-				explode(self::DELIMITER, $this->uri->path()),
-				explode(self::DELIMITER, $this->source)
-			)
+		$sources = explode(self::DELIMITER, $this->source);
+		$parameters = array_diff(explode(self::DELIMITER, $this->uri->path()), $sources);
+		return array_combine(
+			str_replace(['{', '}'], '', array_intersect_key($sources, $parameters)),
+			array_map('intval', array_filter($parameters, 'is_numeric')) + $parameters
 		);
-		return array_map('intval', array_filter($parameters, 'is_numeric'))
-			+ $parameters;
 	}
 }
diff --git a/Tests/Unit/HttpRoute.phpt b/Tests/Unit/HttpRoute.phpt
@@ -38,7 +38,7 @@ final class HttpRoute extends Tester\TestCase {
 
 	public function testExtractingMatchedParameters() {
 		Assert::same(
-			['foo', 'cool'],
+			['foo' => 'foo', 'adjective' => 'cool'],
 			(new Routing\HttpRoute(
 				'/books/{foo}/{adjective}',
 				'Foo/bar',
@@ -49,7 +49,7 @@ final class HttpRoute extends Tester\TestCase {
 
 	public function testTypeAwareParameters() {
 		Assert::same(
-			[1, 123456789, '1ab', 'ba1'],
+			['a' => 1, 'b' => 123456789, 'c' => '1ab', 'd' => 'ba1'],
 			(new Routing\HttpRoute(
 				'/books/{a}/{b}/{c}/{d}',
 				'Foo/bar',