Skip to content

Commit

Permalink
Merge pull request #1840 from bolt/make-placeholders-bit-more-robust
Browse files Browse the repository at this point in the history
Make `placeholders()` accept `null` for robustness
  • Loading branch information
I-Valchev authored Sep 10, 2020
2 parents 414064c + ce8f73c commit b18648f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Twig/HtmlExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public function absoluteLink(string $link): string
return Html::makeAbsoluteLink($link);
}

public function placeholders(string $string, array $replacements = []): string
public function placeholders(?string $string = null, array $replacements = []): string
{
$baseReplacements = [
'year' => date('Y'),
Expand All @@ -115,6 +115,6 @@ public function placeholders(string $string, array $replacements = []): string

$replacements = array_merge($baseReplacements, $replacements);

return Str::placeholders($string, $replacements, true);
return Str::placeholders((string) $string, $replacements, true);
}
}

0 comments on commit b18648f

Please sign in to comment.