Assert: fixed NUL byte escaping in match()

Author: JanTvrdik

src/Framework/Assert.php

@@ -495,7 +495,8 @@ public static function isMatching($pattern, $actual, $strict = FALSE)
 			$utf8 = preg_match('#\x80-\x{10FFFF}]#u', $pattern) ? 'u' : '';
 			$suffix = ($strict ? '\z#sU' : '\s*$#sU') . $utf8;
 			$patterns = static::$patterns + [
-				'[.\\\\+*?[^$(){|\x00\#]' => '\$0', // preg quoting
+				'[.\\\\+*?[^$(){|\#]' => '\$0', // preg quoting
+				'\x00' => '\x00',
 				'[\t ]*\r?\n' => '[\t ]*\r?\n', // right trim
 			];
 			$pattern = '#^' . preg_replace_callback('#' . implode('|', array_keys($patterns)) . '#U' . $utf8, function ($m) use ($patterns) {
@@ -505,7 +506,7 @@ public static function isMatching($pattern, $actual, $strict = FALSE)
 						return $s;
 					}
 				}
-			}, rtrim($pattern)) . $suffix;
+			}, rtrim($pattern, " \t\n\r")) . $suffix;
 		}
 
 		$res = preg_match($pattern, $actual);

tests/Framework/Assert.match.phpt

@@ -14,6 +14,7 @@ $matches = [
 	["a\nb", "a\t \nb"],
 	["a\t\r\n\t ", 'a'],
 	['a', "a\t\r\n\t "],
+	["\x00", "\x00"],
 	['%%', '%'],
 	['%%a%%', '%a%'],
 	['%a%', 'a b'],