diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-02-03 13:44:03 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-02-04 11:17:33 +0000 |
| commit | 7def76c7d817a9ec81e9ae4a03a850514b1a2e1c (patch) | |
| tree | 3fcf7e8236356daac44f7c17b8c0c5bc736a0926 /vendor/symfony/translation/MessageCatalogue.php | |
| parent | adfb3656b8dac8505590490f4f8aaf4bea27881b (diff) | |
| download | webtrees-7def76c7d817a9ec81e9ae4a03a850514b1a2e1c.tar.gz webtrees-7def76c7d817a9ec81e9ae4a03a850514b1a2e1c.tar.bz2 webtrees-7def76c7d817a9ec81e9ae4a03a850514b1a2e1c.zip | |
Working on upgrade wizard and testing
Diffstat (limited to 'vendor/symfony/translation/MessageCatalogue.php')
| -rw-r--r-- | vendor/symfony/translation/MessageCatalogue.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/vendor/symfony/translation/MessageCatalogue.php b/vendor/symfony/translation/MessageCatalogue.php index 7a7657c0a4..19afb903f7 100644 --- a/vendor/symfony/translation/MessageCatalogue.php +++ b/vendor/symfony/translation/MessageCatalogue.php @@ -19,9 +19,9 @@ use Symfony\Component\Translation\Exception\LogicException; */ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterface { - private $messages = array(); - private $metadata = array(); - private $resources = array(); + private $messages = []; + private $metadata = []; + private $resources = []; private $locale; private $fallbackCatalogue; private $parent; @@ -30,7 +30,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf * @param string $locale The locale * @param array $messages An array of messages classified by domain */ - public function __construct(?string $locale, array $messages = array()) + public function __construct(?string $locale, array $messages = []) { $this->locale = $locale; $this->messages = $messages; @@ -49,7 +49,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf */ public function getDomains() { - $domains = array(); + $domains = []; $suffixLength = \strlen(self::INTL_DOMAIN_SUFFIX); foreach ($this->messages as $domain => $messages) { @@ -68,18 +68,18 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf public function all($domain = null) { if (null !== $domain) { - return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? array()) + ($this->messages[$domain] ?? array()); + return ($this->messages[$domain.self::INTL_DOMAIN_SUFFIX] ?? []) + ($this->messages[$domain] ?? []); } - $allMessages = array(); + $allMessages = []; $suffixLength = \strlen(self::INTL_DOMAIN_SUFFIX); foreach ($this->messages as $domain => $messages) { if (\strlen($domain) > $suffixLength && false !== $i = strpos($domain, self::INTL_DOMAIN_SUFFIX, -$suffixLength)) { $domain = substr($domain, 0, $i); - $allMessages[$domain] = $messages + ($allMessages[$domain] ?? array()); + $allMessages[$domain] = $messages + ($allMessages[$domain] ?? []); } else { - $allMessages[$domain] = ($allMessages[$domain] ?? array()) + $messages; + $allMessages[$domain] = ($allMessages[$domain] ?? []) + $messages; } } @@ -91,7 +91,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf */ public function set($id, $translation, $domain = 'messages') { - $this->add(array($id => $translation), $domain); + $this->add([$id => $translation], $domain); } /** @@ -277,7 +277,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf public function deleteMetadata($key = '', $domain = 'messages') { if ('' == $domain) { - $this->metadata = array(); + $this->metadata = []; } elseif ('' == $key) { unset($this->metadata[$domain]); } else { |
