Merge branch 'master' of github.com:/PhpGt/Routing

PhpGt · Nov 26, 2024 · f9acf4e · f9acf4e
2 parents 79ac35a + 9304e14
commit f9acf4e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/src/Assembly.php b/src/Assembly.php
@@ -2,6 +2,7 @@
 namespace Gt\Routing;
 
 use Countable;
+use Gt\Routing\Path\FileMatch\MagicFileMatch;
 use Iterator;
 
 /** @implements Iterator<int, string> */
@@ -36,7 +37,8 @@ public function remove(string $path):void {
 	public function containsDistinctFile():bool {
 		foreach($this->pathList as $path) {
 			$fileName = pathinfo($path, PATHINFO_FILENAME);
-			if($fileName[0] !== "_") {
+			if(!str_starts_with($fileName, "_")
+			|| !in_array($fileName, MagicFileMatch::MAGIC_FILENAME_ARRAY)) {
 				return true;
 			}
 		}

diff --git a/src/Path/FileMatch/FileMatch.php b/src/Path/FileMatch/FileMatch.php
@@ -73,13 +73,13 @@ protected function filterDynamicPathParts(
 		array $uriPathParts
 	):array {
 		$filePathParts = explode("/", $filePath);
-		$matchingSibling = in_array($uriPathParts, $this->siblingFilePathParts);
 
 		foreach($uriPathParts as $i => $uriPathPart) {
 			if(!isset($filePathParts[$i])) {
 				break;
 			}
 
+			$matchingSibling = in_array($uriPathParts, $this->siblingFilePathParts);
 			$filePathPart = $filePathParts[$i];
 
 // On the last iteration, don't convert if there's a sibling match.

diff --git a/test/phpunit/AssemblyTest.php b/test/phpunit/AssemblyTest.php
@@ -92,4 +92,18 @@ public function testContainsDistinctFile():void {
 
 		self::assertTrue($sut->containsDistinctFile());
 	}
+
+	public function testContainsDistinctFile_magicFilename():void {
+		$pathList = [
+			"/var/www/_header.html",
+			"/var/www/_new.html",
+			"/var/www/_footer.html",
+		];
+		$sut = new Assembly();
+		foreach($pathList as $path) {
+			$sut->add($path);
+		}
+
+		self::assertTrue($sut->containsDistinctFile());
+	}
 }
diff --git a/test/phpunit/Path/FileMatch/BasicFileMatchTest.php b/test/phpunit/Path/FileMatch/BasicFileMatchTest.php
@@ -90,4 +90,17 @@ public function testMatches_dynamicPath_siblingMatchesIndex():void {
 		self::assertTrue($sut->matches("/request/dynamic-example"));
 		self::assertFalse($sut->matches("/request/secrets"));
 	}
+
+	public function testMatches_nestedDynamicPath_siblingMatchesIndex():void {
+		$sut = new BasicFileMatch(
+			"page/request/@share-id/@request-id.html",
+			"page",
+			[
+				"page/request/@share-id/index.html",
+				"page/request/@share-id/secrets.html",
+			]
+		);
+		self::assertTrue($sut->matches("/request/share123/dynamic-example"));
+		self::assertFalse($sut->matches("/request/share123/secrets"));
+	}
 }