Strings::replace: default replacement is empty string [Closes #241]

nette · Dec 3, 2020 · eab9924 · eab9924
1 parent d0427c1
commit eab9924
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Utils/Strings.php b/src/Utils/Strings.php
@@ -514,15 +514,15 @@ public static function matchAll(string $subject, string $pattern, int $flags = 0
 	 * @param  string|array  $pattern
 	 * @param  string|callable  $replacement
 	 */
-	public static function replace(string $subject, $pattern, $replacement = null, int $limit = -1): string
+	public static function replace(string $subject, $pattern, $replacement = '', int $limit = -1): string
 	{
 		if (is_object($replacement) || is_array($replacement)) {
 			if (!is_callable($replacement, false, $textual)) {
 				throw new Nette\InvalidStateException("Callback '$textual' is not callable.");
 			}
 			return self::pcre('preg_replace_callback', [$pattern, $replacement, $subject, $limit]);
 
-		} elseif ($replacement === null && is_array($pattern)) {
+		} elseif (is_array($pattern) && is_string(key($pattern))) {
 			$replacement = array_values($pattern);
 			$pattern = array_keys($pattern);
 		}

diff --git a/tests/Utils/Strings.replace().phpt b/tests/Utils/Strings.replace().phpt
@@ -32,3 +32,4 @@ Assert::same('#@ @@@#d!', Strings::replace('hello world!', [
 	'#([e-l])+#' => '#',
 	'#[o-w]#' => '@',
 ]));
+Assert::same(' !', Strings::replace('hello world!', '#\w#'));