Merge pull request #78 from nextcloud/fix/routing/multiple-register-routes

provokateurin · web-flow · commit 3b7b6ff9659a · 2024-01-18T15:53:21.000+01:00
diff --git a/src/Route.php b/src/Route.php
@@ -29,8 +29,8 @@ public static function parseRoutes(string $path): array {
 			}
 			return include($path);
 		} elseif (str_contains($content, "registerRoutes")) {
-			preg_match("/registerRoutes\(.*?\\\$this,.*?(\[[^;]*)\);/s", $content, $matches);
-			return self::includeRoutes("<?php\nreturn " . $matches[1] . ";");
+			preg_match_all("/registerRoutes\(.*?\\\$this,.*?(\[[^;]*)\);/s", $content, $matches);
+			return array_merge(...array_map(fn (string $match) => self::includeRoutes("<?php\nreturn " . $match . ";"), $matches[1]));
 		} else {
 			Logger::panic("Routes", "Unknown routes.php format");
 		}

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public static function parseRoutes(string $path): array {`
`29`	`29`	`}`
`30`	`30`	`return include($path);`
`31`	`31`	`} elseif (str_contains($content, "registerRoutes")) {`
`32`		`- preg_match("/registerRoutes\(.?\\\$this,.?(\[[^;]*)\);/s", $content, $matches);`
`33`		`- return self::includeRoutes("<?php\nreturn " . $matches[1] . ";");`
	`32`	`+ preg_match_all("/registerRoutes\(.?\\\$this,.?(\[[^;]*)\);/s", $content, $matches);`
	`33`	`+ return array_merge(...array_map(fn (string $match) => self::includeRoutes("<?php\nreturn " . $match . ";"), $matches[1]));`
`34`	`34`	`} else {`
`35`	`35`	`Logger::panic("Routes", "Unknown routes.php format");`
`36`	`36`	`}`