Merge pull request #6 from PhpGt/5-dynamic-get

feature: dynamic path without a get parameter returns deepest dynamic match

Author: Greg Bowler

example/01-test.php

@@ -31,7 +31,7 @@
 // Request 1: A page request, as if it is sent from a web browser.
 $pageRequest = new Request(
 	"GET",
-	new Uri("/shop/furniture/chair"),
+	new Uri("/shop/phone/oneplus"),
 	new RequestHeaders([
 // An example accept header from Firefox when requesting a normal link:
 		"Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"

example/project/simple-site/page/explorer/topic/@id.html

@@ -0,0 +1,4 @@
+<?php
+function go(\Gt\Routing\Path\DynamicPath $path) {
+	echo "The topic is: " . $path->get("id"), PHP_EOL;
+}

example/project/simple-site/page/explorer/topic/@id.php

@@ -14,7 +14,7 @@ public function __construct(
 		$this->assemblyList = $assemblyList;
 	}
 
-	public function get(string $key):?string {
+	public function get(string $key = null):?string {
 		$requestPathParts = explode("/", $this->requestPath);
 
 		foreach($this->assemblyList as $assembly) {
@@ -25,6 +25,11 @@ public function get(string $key):?string {
 					if($f[0] !== "@") {
 						continue;
 					}
+
+					if(is_null($key)) {
+						return $requestPathParts[count($filePathParts) - 1] ?? null;
+					}
+
 					if("@$key" !== $f) {
 						continue;
 					}

src/Path/DynamicPath.php

@@ -0,0 +1,61 @@
+<?php
+namespace Gt\Routing\Test\Path;
+
+use Gt\Routing\Assembly;
+use Gt\Routing\Path\DynamicPath;
+use PHPUnit\Framework\TestCase;
+
+class DynamicPathTest extends TestCase {
+	public function testGet_noAssembly():void {
+		$sut = new DynamicPath("/");
+		self::assertNull($sut->get("something"));
+	}
+
+	public function testGet_withAssembly_noMatch():void {
+		$assembly = self::createMock(Assembly::class);
+		$assembly->method("current")
+			->willReturnOnConsecutiveCalls(
+				"page/@dynamic/something.html",
+				"page/@dynamic/something-else.html"
+			);
+		$assembly->method("valid")
+			->willReturn(
+				true,
+				true,
+				false
+			);
+		$sut = new DynamicPath("/", $assembly);
+		self::assertNull($sut->get("dynamic"));
+	}
+
+	public function testGet_byKey():void {
+		$assembly = self::createMock(Assembly::class);
+		$assembly->method("current")
+			->willReturnOnConsecutiveCalls(
+				"page/shop/_common.php",
+				"page/shop/@category/@itemName.php",
+				"page/shop/_common.php",
+				"page/shop/@category/@itemName.php",
+			);
+		$assembly->method("valid")
+			->willReturn(true);
+		$sut = new DynamicPath("/shop/OnePlus/6T", $assembly);
+		self::assertEquals("OnePlus", $sut->get("category"));
+		self::assertEquals("6T", $sut->get("itemName"));
+	}
+
+	public function testGet_noKey_shouldReturnDeepest():void {
+		$assembly = self::createMock(Assembly::class);
+		$assembly->method("current")
+			->willReturnOnConsecutiveCalls(
+				"page/shop/_common.php",
+				"page/shop/@category/@itemName.php",
+				"page/shop/_common.php",
+				"page/shop/@category/@itemName.php",
+			);
+		$assembly->method("valid")
+			->willReturn(true);
+		$sut = new DynamicPath("/shop/OnePlus/6T", $assembly);
+		self::assertEquals("6T", $sut->get());
+	}
+}