Merge pull request #14 from solleer/patch-7

TRPB · web-flow · commit 77504f498493 · 2018-11-24T11:23:49.000Z
Fix issue where the directories were not found correctly
diff --git a/ModuleJson.php b/ModuleJson.php
@@ -29,19 +29,20 @@ public function find(array $route) {
 				$matchedRoute = $config[$method][$routeName];
 
 				// This allows POST to inherit from GET if "inherit" : "GET" is set (or vice versa)
-				if (isset($matchedRoute['inherit']) && isset($config[$matchedRoute->inherit][$routeName])) {
+				if (isset($matchedRoute['inherit']) && isset($config[$matchedRoute['inherit']][$routeName])) {
 					$inheritMethod = $matchedRoute['inherit'];
-					$matchedRoute = array_merge($config[$inheritMethod[$routeName]], $matchedRoute);
+					$matchedRoute = array_merge($config[$inheritMethod][$routeName], $matchedRoute);
 				}
 			}
+			else return false;
 
 		return $this->getRoute($matchedRoute, $route);
 	}
 
 	private function getRouteDir($moduleName) {
 		$files = glob($this->moduleDir . '/*');
 		$match = preg_grep('/' . $this->moduleDir . '\/' . $moduleName . '/i', $files);
-		return $match[0] ?? false;
+		return array_values($match)[0] ?? false;
 	}
 
 	public function getConfig($route) {

Original file line number	Diff line number	Diff line change
`@@ -29,19 +29,20 @@ public function find(array $route) {`
`29`	`29`	`$matchedRoute = $config[$method][$routeName];`
`30`	`30`
`31`	`31`	`// This allows POST to inherit from GET if "inherit" : "GET" is set (or vice versa)`
`32`		`- if (isset($matchedRoute['inherit']) && isset($config[$matchedRoute->inherit][$routeName])) {`
	`32`	`+ if (isset($matchedRoute['inherit']) && isset($config[$matchedRoute['inherit']][$routeName])) {`
`33`	`33`	`$inheritMethod = $matchedRoute['inherit'];`
`34`		`- $matchedRoute = array_merge($config[$inheritMethod[$routeName]], $matchedRoute);`
	`34`	`+ $matchedRoute = array_merge($config[$inheritMethod][$routeName], $matchedRoute);`
`35`	`35`	`}`
`36`	`36`	`}`
	`37`	`+ else return false;`
`37`	`38`
`38`	`39`	`return $this->getRoute($matchedRoute, $route);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`private function getRouteDir($moduleName) {`
`42`	`43`	`$files = glob($this->moduleDir . '/*');`
`43`	`44`	`$match = preg_grep('/' . $this->moduleDir . '\/' . $moduleName . '/i', $files);`
`44`		`- return $match[0] ?? false;`
	`45`	`+ return array_values($match)[0] ?? false;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`public function getConfig($route) {`