Skip to content

Commit 46e462b

Browse files
Merge branch '3.4' into 4.3
* 3.4: Update links to documentation [Validator] Add the missing translations for the Arabic (ar) locale ensure to expect no validation for the right reasons [PhpUnitBridge] Add test case for @expectedDeprecation annotation Update year in license files [Console][FormatterHelper] Use helper strlen statically and remove duplicated code Fix BC issue in phpDoc Reflection library [Translator] Performance improvement in MessageCatalogue and catalogue operations.
2 parents 9fe102b + 577ec9b commit 46e462b

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2019 Fabien Potencier
1+
Copyright (c) 2004-2020 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

MessageCatalogue.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ public function add($messages, $domain = 'messages')
156156
if (!isset($this->messages[$domain])) {
157157
$this->messages[$domain] = $messages;
158158
} else {
159-
$this->messages[$domain] = array_replace($this->messages[$domain], $messages);
159+
foreach ($messages as $id => $message) {
160+
$this->messages[$domain][$id] = $message;
161+
}
160162
}
161163
}
162164

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Translation component provides tools to internationalize your application.
66
Resources
77
---------
88

9-
* [Documentation](https://symfony.com/doc/current/components/translation/index.html)
9+
* [Documentation](https://symfony.com/doc/current/components/translation.html)
1010
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
1111
* [Report issues](https://github.com/symfony/symfony/issues) and
1212
[send Pull Requests](https://github.com/symfony/symfony/pulls)

0 commit comments

Comments
 (0)