regexp: \z replaced with D modifier

nette · Jul 11, 2019 · 45fedc4 · 45fedc4
1 parent aea6e81
commit 45fedc4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
@@ -64,7 +64,7 @@ private static function _dump(&$var, int $level = 0)
 			return '"' . strtr($var, $table) . '"';
 
 		} elseif (is_string($var)) {
-			return "'" . preg_replace('#\'|\\\\(?=[\'\\\\]|\z)#', '\\\\$0', $var) . "'";
+			return "'" . preg_replace('#\'|\\\\(?=[\'\\\\]|$)#D', '\\\\$0', $var) . "'";
 
 		} elseif (is_array($var)) {
 			$space = str_repeat("\t", $level);
@@ -229,13 +229,13 @@ public static function unformatDocComment(string $comment): string
 
 	public static function isIdentifier($value): bool
 	{
-		return is_string($value) && preg_match('#^' . self::PHP_IDENT . '\z#', $value);
+		return is_string($value) && preg_match('#^' . self::PHP_IDENT . '$#D', $value);
 	}
 
 
 	public static function isNamespaceIdentifier($value, bool $allowLeadingSlash = false): bool
 	{
-		$re = '#^' . ($allowLeadingSlash ? '\\\\?' : '') . self::PHP_IDENT . '(\\\\' . self::PHP_IDENT . ')*\z#';
+		$re = '#^' . ($allowLeadingSlash ? '\\\\?' : '') . self::PHP_IDENT . '(\\\\' . self::PHP_IDENT . ')*$#D';
 		return is_string($value) && preg_match($re, $value);
 	}