Bridge: compatibility with Latte 2.10

nette · Jan 22, 2021 · 6f7e1c3 · 6f7e1c3
1 parent 7794de6
commit 6f7e1c3
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Bridges/Nette/Bridge.php b/src/Bridges/Nette/Bridge.php
@@ -49,8 +49,11 @@ public static function renderLatteError(?\Throwable $e): ?array
 			];
 
 		} elseif ($e && strpos($file = $e->getFile(), '.latte--')) {
-			$lines = file($file);
-			if (preg_match('#// source: (\S+\.latte)#', $lines[1], $m) && @is_file($m[1])) { // @ - may trigger error
+			$lines = file($file, FILE_IGNORE_NEW_LINES);
+			if (
+				preg_match('#/(?:/|\*\*) source: (\S+\.latte)#', $lines[1] ?: $lines[4], $m)
+				&& @is_file($m[1]) // @ - may trigger error
+			) {
 				$templateFile = $m[1];
 				$templateLine = $e->getLine() && preg_match('#/\* line (\d+) \*/#', $lines[$e->getLine() - 1], $m) ? (int) $m[1] : 0;
 				return [
@@ -71,7 +74,7 @@ public static function renderLatteUnknownMacro(?\Throwable $e): ?array
 		if (
 			$e instanceof Latte\CompileException
 			&& @is_file($e->sourceName) // @ - may trigger error
-			&& (preg_match('#Unknown macro (\{\w+)\}, did you mean (\{\w+)\}\?#A', $e->getMessage(), $m)
+			&& (preg_match('#Unknown (?:macro|tag) (\{\w+)\}, did you mean (\{\w+)\}\?#A', $e->getMessage(), $m)
 				|| preg_match('#Unknown attribute (n:\w+), did you mean (n:\w+)\?#A', $e->getMessage(), $m))
 		) {
 			return [