RegexpException replaced with CompileException & RuntimeException

src/Latte/Compiler/TagLexer.php

@@ -11,7 +11,6 @@
 
 use Latte;
 use Latte\CompileException;
-use Latte\RegexpException;
 
 
 /**
@@ -185,7 +184,7 @@ private function tokenizeCode(): void
 		matchRE:
 		preg_match_all($re, $this->input, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL, $this->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
 		foreach ($matches as $m) {
@@ -330,7 +329,7 @@ private function tokenizeString(string $endRe): string
 		matchRE:
 		preg_match_all($re, $this->input, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL, $this->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
 		$buffer = '';

src/Latte/Compiler/TemplateLexer.php

@@ -11,7 +11,6 @@
 
 use Latte;
 use Latte\CompileException;
-use Latte\RegexpException;
 
 
 final class TemplateLexer
@@ -234,7 +233,7 @@ private function match(string $re): array
 	{
 		preg_match($re, $this->input, $matches, PREG_UNMATCHED_AS_NULL, $this->position->offset);
 		if (preg_last_error()) {
-			throw new RegexpException;
+			throw new CompileException(preg_last_error_msg());
 		}
 
 		$tokens = [];

src/Latte/Essential/Filters.php

@@ -120,7 +120,7 @@ public static function indent(FilterInfo $info, string $s, int $level = 1, strin
 		} elseif ($info->contentType === ContentType::Html) {
 			$s = preg_replace_callback('#<(textarea|pre).*?</\1#si', fn($m) => strtr($m[0], " \t\r\n", "\x1F\x1E\x1D\x1A"), $s);
 			if (preg_last_error()) {
-				throw new Latte\RegexpException;
+				throw new Latte\RuntimeException(preg_last_error_msg());
 			}
 
 			$s = preg_replace('#(?:^|[\r\n]+)(?=[^\r\n])#', '$0' . str_repeat($chars, $level), $s);
@@ -250,7 +250,7 @@ public static function replaceRe(string $subject, string $pattern, string $repla
 	{
 		$res = preg_replace($pattern, $replacement, $subject);
 		if (preg_last_error()) {
-			throw new Latte\RegexpException;
+			throw new Latte\RuntimeException(preg_last_error_msg());
 		}
 
 		return $res;
@@ -388,7 +388,7 @@ public static function trim(FilterInfo $info, string $s, string $charlist = " \t
 		$charlist = preg_quote($charlist, '#');
 		$s = preg_replace('#^[' . $charlist . ']+|[' . $charlist . ']+$#Du', '', (string) $s);
 		if (preg_last_error()) {
-			throw new Latte\RegexpException;
+			throw new Latte\RuntimeException(preg_last_error_msg());
 		}
 
 		return $s;

src/Latte/Runtime/Filters.php

@@ -177,7 +177,7 @@ public static function escapeJs(mixed $s): string
 
 		$json = json_encode($s, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE);
 		if ($error = json_last_error()) {
-			throw new Latte\RuntimeException(json_last_error_msg(), $error);
+			throw new Latte\RuntimeException(json_last_error_msg());
 		}
 
 		return str_replace([']]>', '<!', '</'], [']]\u003E', '\u003C!', '<\/'], $json);

src/Latte/exceptions.php

@@ -37,14 +37,10 @@ public function __construct(string $message, ?Compiler\Position $position = null
 
 
 /**
- * The exception that indicates error of the last Regexp execution.
+ * The exception occurred during template rendering.
  */
-class RegexpException extends \Exception implements Exception
+class RuntimeException extends \RuntimeException implements Exception
 {
-	public function __construct()
-	{
-		parent::__construct(preg_last_error_msg(), preg_last_error());
-	}
 }
 
 
@@ -62,8 +58,3 @@ public function __construct(string $message, ?Compiler\Position $position = null
 		$this->generateMessage();
 	}
 }
-
-
-class RuntimeException extends \RuntimeException implements Exception
-{
-}

tests/filters/trim.phpt

@@ -22,6 +22,6 @@ Assert::same('e', Filters::trim($info, "\u{158}e-", "\u{158}-")); // Ře-
 
 Assert::exception(
 	fn() => Filters::trim($info, "\xC2x\xA0"),
-	Latte\RegexpException::class,
+	Latte\RuntimeException::class,
 	null,
 );