Engine: fixed CompileException sourceLine on PHP7

matej21 · matej21 · commit 49c527c617d2 · 2016-02-02T00:24:17.000+01:00
diff --git a/src/Latte/Engine.php b/src/Latte/Engine.php
@@ -222,8 +222,8 @@ private function loadTemplate($name)
 				throw $e->setSource($code, $error['line'], $name . ' (compiled)');
 			}
 		} catch (\ParseError $e) {
-			$e = new CompileException('Error in template: ' . $e->getMessage(), 0, $e);
-			throw $e->setSource($code, $e->getLine(), $name . ' (compiled)');
+			$compileException = new CompileException('Error in template: ' . $e->getMessage(), 0, $e);
+			throw $compileException->setSource($code, $e->getLine(), $name . ' (compiled)');
 		}
 		return $code;
 	}
diff --git a/tests/Latte/Engine.parseError.phpt b/tests/Latte/Engine.parseError.phpt
@@ -16,12 +16,13 @@ Assert::exception(function () {
 	$latte->render('{php * }');
 }, 'Latte\CompileException', "Error in template: syntax error, unexpected '*'");
 
-Assert::exception(function () {
+$e = Assert::exception(function () {
 	$latte = new Latte\Engine;
 	$latte->setTempDirectory(TEMP_DIR);
 	$latte->setLoader(new Latte\Loaders\StringLoader);
 	$latte->render('{php * * }');
 }, 'Latte\CompileException', "Error in template: syntax error, unexpected '*'");
+Assert::same(13, $e->sourceLine);
 
 if (PHP_VERSION_ID < 50400) {
 	die(0); // otherwise PHP exits with code 255

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,8 @@ private function loadTemplate($name)`
`222`	`222`	`throw $e->setSource($code, $error['line'], $name . ' (compiled)');`
`223`	`223`	`}`
`224`	`224`	`} catch (\ParseError $e) {`
`225`		`- $e = new CompileException('Error in template: ' . $e->getMessage(), 0, $e);`
`226`		`- throw $e->setSource($code, $e->getLine(), $name . ' (compiled)');`
	`225`	`+ $compileException = new CompileException('Error in template: ' . $e->getMessage(), 0, $e);`
	`226`	`+ throw $compileException->setSource($code, $e->getLine(), $name . ' (compiled)');`
`227`	`227`	`}`
`228`	`228`	`return $code;`
`229`	`229`	`}`