Merge pull request #591 from ApiGen/4.1

ThemeConfigPathResolver: fixed for vendor [closes #590]
ApiGen · Apr 9, 2015 · dbbc495 · dbbc495
2 parents 414fd83 + e9aff53
commit dbbc495
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/Theme/ThemeConfigPathResolver.php b/src/Theme/ThemeConfigPathResolver.php
@@ -36,12 +36,19 @@ public function __construct($rootDir)
 	 */
 	public function resolve($path)
 	{
-		$absolutePath = $this->rootDir . '/' . ltrim($path, DIRECTORY_SEPARATOR);
-		if (file_exists($absolutePath)) {
-			return $absolutePath;
+		$allowedPaths = [
+			$this->rootDir,
+			$this->rootDir . '/../../..'
+		];
+
+		foreach ($allowedPaths as $allowedPath) {
+			$absolutePath = $allowedPath . '/' . ltrim($path, DIRECTORY_SEPARATOR);
+			if (file_exists($absolutePath)) {
+				return $absolutePath;
+			}
 		}
 
-		throw new ConfigurationException('Config "' . $path . "' was not found in '" . $absolutePath . "'");
+		throw new ConfigurationException(sprintf('Config "%s" was not found.', $path));
 	}
 
 }