Skip to content

Commit

Permalink
Merge branch '5.4' into 6.2
Browse files Browse the repository at this point in the history
* 5.4:
  fix style of label containing new lines in PUML dump
  [TwigBridge] Allow floats in html5 input type number field
  [Translation] Handle the translation of empty strings
  [VarDumper] Fix error when reflected class has default Enum parameter in constructor
  [FrameworkBundle] Fix denyAccessUnlessGranted for mixed attributes
  [Validator] Fix translation of AtLeastOneOf constraint message
  [Validator] Sync IBAN formats with Swift IBAN registry
  [String] Use same alphabet for ByteString::fromRandom tests
  Fix phpdocs in components
  • Loading branch information
nicolas-grekas committed Feb 24, 2023
2 parents 1614a26 + 6996aff commit 90db1c6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion Loader/IcuResFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function load(mixed $resource, string $locale, string $domain = 'messages
*
* @param \ResourceBundle $rb The ResourceBundle that will be flattened
* @param array $messages Used internally for recursive calls
* @param string $path Current path being parsed, used internally for recursive calls
* @param string|null $path Current path being parsed, used internally for recursive calls
*/
protected function flatten(\ResourceBundle $rb, array &$messages = [], string $path = null): array
{
Expand Down
2 changes: 0 additions & 2 deletions MessageCatalogueInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ public function getDomains(): array;
* Gets the messages within a given domain.
*
* If $domain is null, it returns all messages.
*
* @param string $domain The domain name
*/
public function all(string $domain = null): array;

Expand Down

0 comments on commit 90db1c6

Please sign in to comment.