Handle nullable value in params passed to Strings::sprintAssocDefault…

…() (#316)
letsdrink · Jul 12, 2023 · 34cd2cf · 34cd2cf
1 parent 9dd5556
commit 34cd2cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/Ouzo/Goodies/Utilities/Strings.php b/src/Ouzo/Goodies/Utilities/Strings.php
@@ -478,7 +478,7 @@ public static function sprintAssocDefault(?string $string, ?array $params, ?stri
  }
  if (!is_null($params)) {
  foreach ($params as $key => $value) {
- $string = preg_replace("/%{($key)}/", $value, $string);
+ $string = preg_replace("/%{($key)}/", $value ?: $default, $string);
  }
  }
  if (!is_null($default)) {

diff --git a/test/src/Ouzo/Goodies/Utilities/StringsTest.php b/test/src/Ouzo/Goodies/Utilities/StringsTest.php
@@ -507,6 +507,8 @@ public static function sprintAssocDefault(): array
  return [
  ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', ['what' => 'madness', 'place' => 'Sparta'], '', 'This is madness! This is Sparta! No, this is invalid placeholder!'],
  ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', ['what' => 'madness', 'place' => 'Sparta'], 'tomato', 'This is madness! This is Sparta! No, this is invalid tomato placeholder!'],
+ ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', ['what' => 'madness', 'place' => null], 'tomato', 'This is madness! This is tomato! No, this is invalid tomato placeholder!'],
+ ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', ['what' => 'madness', 'place' => ''], 'tomato', 'This is madness! This is tomato! No, this is invalid tomato placeholder!'],
  [null, ['what' => 'madness', 'place' => 'Sparta'], 'tomato', null],
  ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', null, 'tomato', 'This is tomato! This is tomato! No, this is invalid tomato placeholder!'],
  ['This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!', null, null, 'This is %{what}! This is %{place}! No, this is invalid %{invalid_placeholder} placeholder!'],