Strings::sprintAssoc should treat null and empty string the same

letsdrink · Jun 27, 2023 · 1905be1 · 1905be1
1 parent 03d9715
commit 1905be1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Ouzo/Goodies/Utilities/Strings.php b/src/Ouzo/Goodies/Utilities/Strings.php
@@ -449,7 +449,8 @@ public static function sprintAssoc(string|array|null $string, ?array $params): a
  return $string;
  }
  foreach ($params as $key => $value) {
- if (!is_null($key) && !is_null($value)) {
+ if (!is_null($key)) {
+ $value ??= Strings::EMPTY;
  $string = preg_replace("/%{($key)}/", $value, $string);
  }
  }

diff --git a/test/src/Ouzo/Goodies/Utilities/StringsTest.php b/test/src/Ouzo/Goodies/Utilities/StringsTest.php
@@ -486,7 +486,8 @@ public static function sprintAssoc(): array
  ['This is %{what}! %{what}? This is %{place}! And %{invalid_placeholder}!', ['what' => 'madness', 'place' => 'Sparta'], 'This is madness! madness? This is Sparta! And %{invalid_placeholder}!'],
  [null, ['what' => 'madness', 'place' => 'Sparta'], null],
  ['This is %{what}! %{what}? This is %{place}!', null, 'This is %{what}! %{what}? This is %{place}!'],
- ['This is %{what}! %{what}? This is %{place}!', ['what' => 'madness', 'place' => null, null => 'Sparta'], 'This is madness! madness? This is %{place}!'],
+ ['This is %{what}! %{what}? This is %{place}!', ['what' => 'madness', 'place' => '', null => 'Sparta'], 'This is madness! madness? This is !'],
+ ['This is %{what}! %{what}? This is %{place}!', ['what' => 'madness', 'place' => null, null => 'Sparta'], 'This is madness! madness? This is !'],
  ];
  }