diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-02-06 16:50:32 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-02-07 08:26:22 +0000 |
| commit | bfaab54a7bdb208f1667959aa083f02dea8e38a1 (patch) | |
| tree | fff77d01a66f3a2332d9da63c72359304976ac6a /vendor/symfony | |
| parent | 24f2a3af38709f9bf0a739b30264240d20ba34e8 (diff) | |
| download | webtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.tar.gz webtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.tar.bz2 webtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.zip | |
Upgrade vendor dependencies
Diffstat (limited to 'vendor/symfony')
37 files changed, 86 insertions, 66 deletions
diff --git a/vendor/symfony/cache/Adapter/ChainAdapter.php b/vendor/symfony/cache/Adapter/ChainAdapter.php index b84d9f0370..39d9afd0e0 100644 --- a/vendor/symfony/cache/Adapter/ChainAdapter.php +++ b/vendor/symfony/cache/Adapter/ChainAdapter.php @@ -152,7 +152,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa $missing = []; $misses = []; $nextAdapterIndex = $adapterIndex + 1; - $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null; + $nextAdapter = $this->adapters[$nextAdapterIndex] ?? null; foreach ($items as $k => $item) { if (!$nextAdapter || $item->isHit()) { diff --git a/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php b/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php index 174419199c..6dccbf0860 100644 --- a/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php +++ b/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php @@ -136,7 +136,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune { foreach ($ids as $id) { $file = $this->getFile($id); - if (!file_exists($file) || !$h = @fopen($file, 'rb')) { + if (!file_exists($file) || !$h = @fopen($file, 'r')) { continue; } diff --git a/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php b/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php index 6e7bb18212..ed20bd2308 100644 --- a/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php +++ b/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php @@ -280,7 +280,7 @@ EOLUA; foreach ($this->getHosts() as $host) { $info = $host->info('Memory'); - $info = isset($info['Memory']) ? $info['Memory'] : $info; + $info = $info['Memory'] ?? $info; return $this->redisEvictionPolicy = $info['maxmemory_policy']; } diff --git a/vendor/symfony/cache/CacheItem.php b/vendor/symfony/cache/CacheItem.php index 3de8ddc81c..fe688c5f0c 100644 --- a/vendor/symfony/cache/CacheItem.php +++ b/vendor/symfony/cache/CacheItem.php @@ -43,6 +43,8 @@ final class CacheItem implements ItemInterface /** * {@inheritdoc} + * + * @return mixed */ public function get() { diff --git a/vendor/symfony/cache/LICENSE b/vendor/symfony/cache/LICENSE index a7ec708018..3796612f43 100644 --- a/vendor/symfony/cache/LICENSE +++ b/vendor/symfony/cache/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2016-2020 Fabien Potencier +Copyright (c) 2016-2021 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/symfony/cache/Psr16Cache.php b/vendor/symfony/cache/Psr16Cache.php index ba8b5b37f9..fae7eb75a4 100644 --- a/vendor/symfony/cache/Psr16Cache.php +++ b/vendor/symfony/cache/Psr16Cache.php @@ -66,6 +66,8 @@ class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterf /** * {@inheritdoc} + * + * @return mixed */ public function get($key, $default = null) { diff --git a/vendor/symfony/cache/README.md b/vendor/symfony/cache/README.md index c4ab7520f4..8fc7564415 100644 --- a/vendor/symfony/cache/README.md +++ b/vendor/symfony/cache/README.md @@ -1,12 +1,13 @@ Symfony PSR-6 implementation for caching ======================================== -This component provides an extended [PSR-6](http://www.php-fig.org/psr/psr-6/) -implementation for adding cache to your applications. It is designed to have a -low overhead so that caching is fastest. It ships with a few caching adapters -for the most widespread and suited to caching backends. It also provides a -`doctrine/cache` proxy adapter to cover more advanced caching needs and a proxy -adapter for greater interoperability between PSR-6 implementations. +The Cache component provides an extended +[PSR-6](http://www.php-fig.org/psr/psr-6/) implementation for adding cache to +your applications. It is designed to have a low overhead so that caching is +fastest. It ships with a few caching adapters for the most widespread and +suited to caching backends. It also provides a `doctrine/cache` proxy adapter +to cover more advanced caching needs and a proxy adapter for greater +interoperability between PSR-6 implementations. Resources --------- diff --git a/vendor/symfony/cache/Simple/ChainCache.php b/vendor/symfony/cache/Simple/ChainCache.php index f2bb444915..bae9507260 100644 --- a/vendor/symfony/cache/Simple/ChainCache.php +++ b/vendor/symfony/cache/Simple/ChainCache.php @@ -96,7 +96,7 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI { $missing = []; $nextCacheIndex = $cacheIndex + 1; - $nextCache = isset($this->caches[$nextCacheIndex]) ? $this->caches[$nextCacheIndex] : null; + $nextCache = $this->caches[$nextCacheIndex] ?? null; foreach ($values as $k => $value) { if ($miss !== $value) { diff --git a/vendor/symfony/cache/Traits/ApcuTrait.php b/vendor/symfony/cache/Traits/ApcuTrait.php index 7161adbddd..9a02148c14 100644 --- a/vendor/symfony/cache/Traits/ApcuTrait.php +++ b/vendor/symfony/cache/Traits/ApcuTrait.php @@ -81,7 +81,7 @@ trait ApcuTrait */ protected function doClear($namespace) { - return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== \PHP_SAPI || filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) + return isset($namespace[0]) && class_exists(\APCuIterator::class, false) && ('cli' !== \PHP_SAPI || filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY)) : apcu_clear_cache(); } diff --git a/vendor/symfony/cache/Traits/FilesystemCommonTrait.php b/vendor/symfony/cache/Traits/FilesystemCommonTrait.php index 5509e21028..fe61f08c16 100644 --- a/vendor/symfony/cache/Traits/FilesystemCommonTrait.php +++ b/vendor/symfony/cache/Traits/FilesystemCommonTrait.php @@ -93,9 +93,20 @@ trait FilesystemCommonTrait set_error_handler(__CLASS__.'::throwError'); try { if (null === $this->tmp) { - $this->tmp = $this->directory.uniqid('', true); + $this->tmp = $this->directory.bin2hex(random_bytes(6)); } - file_put_contents($this->tmp, $data); + try { + $h = fopen($this->tmp, 'x'); + } catch (\ErrorException $e) { + if (false === strpos($e->getMessage(), 'File exists')) { + throw $e; + } + + $this->tmp = $this->directory.bin2hex(random_bytes(6)); + $h = fopen($this->tmp, 'x'); + } + fwrite($h, $data); + fclose($h); if (null !== $expiresAt) { touch($this->tmp, $expiresAt); diff --git a/vendor/symfony/cache/Traits/FilesystemTrait.php b/vendor/symfony/cache/Traits/FilesystemTrait.php index aea8cd58f7..72118eaae5 100644 --- a/vendor/symfony/cache/Traits/FilesystemTrait.php +++ b/vendor/symfony/cache/Traits/FilesystemTrait.php @@ -34,7 +34,7 @@ trait FilesystemTrait $pruned = true; foreach ($this->scanHashDir($this->directory) as $file) { - if (!$h = @fopen($file, 'rb')) { + if (!$h = @fopen($file, 'r')) { continue; } @@ -59,7 +59,7 @@ trait FilesystemTrait foreach ($ids as $id) { $file = $this->getFile($id); - if (!file_exists($file) || !$h = @fopen($file, 'rb')) { + if (!file_exists($file) || !$h = @fopen($file, 'r')) { continue; } if (($expiresAt = (int) fgets($h)) && $now >= $expiresAt) { @@ -111,7 +111,7 @@ trait FilesystemTrait private function getFileKey(string $file): string { - if (!$h = @fopen($file, 'rb')) { + if (!$h = @fopen($file, 'r')) { return ''; } diff --git a/vendor/symfony/cache/Traits/MemcachedTrait.php b/vendor/symfony/cache/Traits/MemcachedTrait.php index 34b8aa73a5..7b61e73a44 100644 --- a/vendor/symfony/cache/Traits/MemcachedTrait.php +++ b/vendor/symfony/cache/Traits/MemcachedTrait.php @@ -151,7 +151,7 @@ trait MemcachedTrait $params['path'] = substr($params['path'], 0, -\strlen($m[0])); } $params += [ - 'host' => isset($params['host']) ? $params['host'] : $params['path'], + 'host' => $params['host'] ?? $params['path'], 'port' => isset($params['host']) ? 11211 : null, 'weight' => 0, ]; diff --git a/vendor/symfony/cache/Traits/PdoTrait.php b/vendor/symfony/cache/Traits/PdoTrait.php index 9aae74661d..e115acfb89 100644 --- a/vendor/symfony/cache/Traits/PdoTrait.php +++ b/vendor/symfony/cache/Traits/PdoTrait.php @@ -62,14 +62,14 @@ trait PdoTrait throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, \is_object($connOrDsn) ? \get_class($connOrDsn) : \gettype($connOrDsn))); } - $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table; - $this->idCol = isset($options['db_id_col']) ? $options['db_id_col'] : $this->idCol; - $this->dataCol = isset($options['db_data_col']) ? $options['db_data_col'] : $this->dataCol; - $this->lifetimeCol = isset($options['db_lifetime_col']) ? $options['db_lifetime_col'] : $this->lifetimeCol; - $this->timeCol = isset($options['db_time_col']) ? $options['db_time_col'] : $this->timeCol; - $this->username = isset($options['db_username']) ? $options['db_username'] : $this->username; - $this->password = isset($options['db_password']) ? $options['db_password'] : $this->password; - $this->connectionOptions = isset($options['db_connection_options']) ? $options['db_connection_options'] : $this->connectionOptions; + $this->table = $options['db_table'] ?? $this->table; + $this->idCol = $options['db_id_col'] ?? $this->idCol; + $this->dataCol = $options['db_data_col'] ?? $this->dataCol; + $this->lifetimeCol = $options['db_lifetime_col'] ?? $this->lifetimeCol; + $this->timeCol = $options['db_time_col'] ?? $this->timeCol; + $this->username = $options['db_username'] ?? $this->username; + $this->password = $options['db_password'] ?? $this->password; + $this->connectionOptions = $options['db_connection_options'] ?? $this->connectionOptions; $this->namespace = $namespace; $this->marshaller = $marshaller ?? new DefaultMarshaller(); diff --git a/vendor/symfony/cache/Traits/PhpFilesTrait.php b/vendor/symfony/cache/Traits/PhpFilesTrait.php index 6e117aa4f8..6df6888bad 100644 --- a/vendor/symfony/cache/Traits/PhpFilesTrait.php +++ b/vendor/symfony/cache/Traits/PhpFilesTrait.php @@ -288,7 +288,7 @@ trait PhpFilesTrait private function getFileKey(string $file): string { - if (!$h = @fopen($file, 'rb')) { + if (!$h = @fopen($file, 'r')) { return ''; } diff --git a/vendor/symfony/cache/Traits/RedisTrait.php b/vendor/symfony/cache/Traits/RedisTrait.php index 5986c075bb..d48dd24b57 100644 --- a/vendor/symfony/cache/Traits/RedisTrait.php +++ b/vendor/symfony/cache/Traits/RedisTrait.php @@ -356,7 +356,7 @@ trait RedisTrait } $info = $host->info('Server'); - $info = isset($info['Server']) ? $info['Server'] : $info; + $info = $info['Server'] ?? $info; if (!version_compare($info['redis_version'], '2.8', '>=')) { // As documented in Redis documentation (http://redis.io/commands/keys) using KEYS diff --git a/vendor/symfony/cache/composer.json b/vendor/symfony/cache/composer.json index 44bcd6c997..b812a8eb8c 100644 --- a/vendor/symfony/cache/composer.json +++ b/vendor/symfony/cache/composer.json @@ -1,7 +1,7 @@ { "name": "symfony/cache", "type": "library", - "description": "Symfony Cache component with PSR-6, PSR-16, and tags", + "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation", "keywords": ["caching", "psr6"], "homepage": "https://symfony.com", "license": "MIT", @@ -31,19 +31,19 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6", - "doctrine/dbal": "^2.5|^3.0", + "doctrine/dbal": "^2.6|^3.0", "predis/predis": "^1.1", "psr/simple-cache": "^1.0", "symfony/config": "^4.2|^5.0", "symfony/dependency-injection": "^3.4|^4.1|^5.0", "symfony/filesystem": "^4.4|^5.0", - "symfony/http-kernel": "^4.4|^5.0", + "symfony/http-kernel": "^4.4", "symfony/var-dumper": "^4.4|^5.0" }, "conflict": { - "doctrine/dbal": "<2.5", + "doctrine/dbal": "<2.6", "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<4.4", + "symfony/http-kernel": "<4.4|>=5.0", "symfony/var-dumper": "<4.4" }, "autoload": { diff --git a/vendor/symfony/expression-language/LICENSE b/vendor/symfony/expression-language/LICENSE index 9e936ec044..9ff2d0d630 100644 --- a/vendor/symfony/expression-language/LICENSE +++ b/vendor/symfony/expression-language/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2020 Fabien Potencier +Copyright (c) 2004-2021 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/symfony/expression-language/Node/BinaryNode.php b/vendor/symfony/expression-language/Node/BinaryNode.php index 191970ca1e..3820f880e7 100644 --- a/vendor/symfony/expression-language/Node/BinaryNode.php +++ b/vendor/symfony/expression-language/Node/BinaryNode.php @@ -20,13 +20,13 @@ use Symfony\Component\ExpressionLanguage\Compiler; */ class BinaryNode extends Node { - private static $operators = [ + private const OPERATORS = [ '~' => '.', 'and' => '&&', 'or' => '||', ]; - private static $functions = [ + private const FUNCTIONS = [ '**' => 'pow', '..' => 'range', 'in' => 'in_array', @@ -57,9 +57,9 @@ class BinaryNode extends Node return; } - if (isset(self::$functions[$operator])) { + if (isset(self::FUNCTIONS[$operator])) { $compiler - ->raw(sprintf('%s(', self::$functions[$operator])) + ->raw(sprintf('%s(', self::FUNCTIONS[$operator])) ->compile($this->nodes['left']) ->raw(', ') ->compile($this->nodes['right']) @@ -69,8 +69,8 @@ class BinaryNode extends Node return; } - if (isset(self::$operators[$operator])) { - $operator = self::$operators[$operator]; + if (isset(self::OPERATORS[$operator])) { + $operator = self::OPERATORS[$operator]; } $compiler @@ -89,13 +89,13 @@ class BinaryNode extends Node $operator = $this->attributes['operator']; $left = $this->nodes['left']->evaluate($functions, $values); - if (isset(self::$functions[$operator])) { + if (isset(self::FUNCTIONS[$operator])) { $right = $this->nodes['right']->evaluate($functions, $values); if ('not in' === $operator) { return !\in_array($left, $right); } - $f = self::$functions[$operator]; + $f = self::FUNCTIONS[$operator]; return $f($left, $right); } diff --git a/vendor/symfony/expression-language/Node/UnaryNode.php b/vendor/symfony/expression-language/Node/UnaryNode.php index abf2cc6bac..dd6fba1df2 100644 --- a/vendor/symfony/expression-language/Node/UnaryNode.php +++ b/vendor/symfony/expression-language/Node/UnaryNode.php @@ -20,7 +20,7 @@ use Symfony\Component\ExpressionLanguage\Compiler; */ class UnaryNode extends Node { - private static $operators = [ + private const OPERATORS = [ '!' => '!', 'not' => '!', '+' => '+', @@ -39,7 +39,7 @@ class UnaryNode extends Node { $compiler ->raw('(') - ->raw(self::$operators[$this->attributes['operator']]) + ->raw(self::OPERATORS[$this->attributes['operator']]) ->compile($this->nodes['node']) ->raw(')') ; diff --git a/vendor/symfony/expression-language/composer.json b/vendor/symfony/expression-language/composer.json index eca9d7d98b..0e5cdadfb0 100644 --- a/vendor/symfony/expression-language/composer.json +++ b/vendor/symfony/expression-language/composer.json @@ -1,7 +1,7 @@ { "name": "symfony/expression-language", "type": "library", - "description": "Symfony ExpressionLanguage Component", + "description": "Provides an engine that can compile and evaluate expressions", "keywords": [], "homepage": "https://symfony.com", "license": "MIT", diff --git a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php index 9b6da11027..e4f0b3a5ac 100644 --- a/vendor/symfony/translation/DataCollector/TranslationDataCollector.php +++ b/vendor/symfony/translation/DataCollector/TranslationDataCollector.php @@ -69,7 +69,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto */ public function getMessages() { - return isset($this->data['messages']) ? $this->data['messages'] : []; + return $this->data['messages'] ?? []; } /** @@ -77,7 +77,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto */ public function getCountMissings() { - return isset($this->data[DataCollectorTranslator::MESSAGE_MISSING]) ? $this->data[DataCollectorTranslator::MESSAGE_MISSING] : 0; + return $this->data[DataCollectorTranslator::MESSAGE_MISSING] ?? 0; } /** @@ -85,7 +85,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto */ public function getCountFallbacks() { - return isset($this->data[DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK]) ? $this->data[DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK] : 0; + return $this->data[DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK] ?? 0; } /** @@ -93,7 +93,7 @@ class TranslationDataCollector extends DataCollector implements LateDataCollecto */ public function getCountDefines() { - return isset($this->data[DataCollectorTranslator::MESSAGE_DEFINED]) ? $this->data[DataCollectorTranslator::MESSAGE_DEFINED] : 0; + return $this->data[DataCollectorTranslator::MESSAGE_DEFINED] ?? 0; } public function getLocale() diff --git a/vendor/symfony/translation/Dumper/CsvFileDumper.php b/vendor/symfony/translation/Dumper/CsvFileDumper.php index bfa8db61ad..8f7b032fab 100644 --- a/vendor/symfony/translation/Dumper/CsvFileDumper.php +++ b/vendor/symfony/translation/Dumper/CsvFileDumper.php @@ -28,7 +28,7 @@ class CsvFileDumper extends FileDumper */ public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = []) { - $handle = fopen('php://memory', 'r+b'); + $handle = fopen('php://memory', 'r+'); foreach ($messages->all($domain) as $source => $target) { fputcsv($handle, [$source, $target], $this->delimiter, $this->enclosure); diff --git a/vendor/symfony/translation/Dumper/XliffFileDumper.php b/vendor/symfony/translation/Dumper/XliffFileDumper.php index dd9d788bad..72d9c6e9f3 100644 --- a/vendor/symfony/translation/Dumper/XliffFileDumper.php +++ b/vendor/symfony/translation/Dumper/XliffFileDumper.php @@ -162,7 +162,7 @@ class XliffFileDumper extends FileDumper $notesElement = $dom->createElement('notes'); foreach ($metadata['notes'] as $note) { $n = $dom->createElement('note'); - $n->appendChild($dom->createTextNode(isset($note['content']) ? $note['content'] : '')); + $n->appendChild($dom->createTextNode($note['content'] ?? '')); unset($note['content']); foreach ($note as $name => $value) { diff --git a/vendor/symfony/translation/Dumper/YamlFileDumper.php b/vendor/symfony/translation/Dumper/YamlFileDumper.php index d6e4af8fb6..520ae33400 100644 --- a/vendor/symfony/translation/Dumper/YamlFileDumper.php +++ b/vendor/symfony/translation/Dumper/YamlFileDumper.php @@ -35,7 +35,7 @@ class YamlFileDumper extends FileDumper */ public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = []) { - if (!class_exists('Symfony\Component\Yaml\Yaml')) { + if (!class_exists(Yaml::class)) { throw new LogicException('Dumping translations in the YAML format requires the Symfony Yaml component.'); } diff --git a/vendor/symfony/translation/IdentityTranslator.php b/vendor/symfony/translation/IdentityTranslator.php index 7316148e53..8643396150 100644 --- a/vendor/symfony/translation/IdentityTranslator.php +++ b/vendor/symfony/translation/IdentityTranslator.php @@ -70,7 +70,7 @@ class IdentityTranslator implements LegacyTranslatorInterface, TranslatorInterfa return $this->trans($id, ['%count%' => $number] + $parameters, $domain, $locale); } - private function getPluralizationRule(int $number, string $locale): int + private function getPluralizationRule(float $number, string $locale): int { return PluralizationRules::get($number, $locale, false); } diff --git a/vendor/symfony/translation/LICENSE b/vendor/symfony/translation/LICENSE index 9e936ec044..9ff2d0d630 100644 --- a/vendor/symfony/translation/LICENSE +++ b/vendor/symfony/translation/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2020 Fabien Potencier +Copyright (c) 2004-2021 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/symfony/translation/Loader/FileLoader.php b/vendor/symfony/translation/Loader/FileLoader.php index 7ec54a3c87..42c687d22f 100644 --- a/vendor/symfony/translation/Loader/FileLoader.php +++ b/vendor/symfony/translation/Loader/FileLoader.php @@ -47,7 +47,7 @@ abstract class FileLoader extends ArrayLoader $catalogue = parent::load($messages, $locale, $domain); - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + if (class_exists(FileResource::class)) { $catalogue->addResource(new FileResource($resource)); } diff --git a/vendor/symfony/translation/Loader/IcuDatFileLoader.php b/vendor/symfony/translation/Loader/IcuDatFileLoader.php index 545c2b02b8..dfdabc9d4f 100644 --- a/vendor/symfony/translation/Loader/IcuDatFileLoader.php +++ b/vendor/symfony/translation/Loader/IcuDatFileLoader.php @@ -52,7 +52,7 @@ class IcuDatFileLoader extends IcuResFileLoader $catalogue = new MessageCatalogue($locale); $catalogue->add($messages, $domain); - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + if (class_exists(FileResource::class)) { $catalogue->addResource(new FileResource($resource.'.dat')); } diff --git a/vendor/symfony/translation/Loader/IcuResFileLoader.php b/vendor/symfony/translation/Loader/IcuResFileLoader.php index 6dddf63f2c..126556fee0 100644 --- a/vendor/symfony/translation/Loader/IcuResFileLoader.php +++ b/vendor/symfony/translation/Loader/IcuResFileLoader.php @@ -52,7 +52,7 @@ class IcuResFileLoader implements LoaderInterface $catalogue = new MessageCatalogue($locale); $catalogue->add($messages, $domain); - if (class_exists('Symfony\Component\Config\Resource\DirectoryResource')) { + if (class_exists(DirectoryResource::class)) { $catalogue->addResource(new DirectoryResource($resource)); } diff --git a/vendor/symfony/translation/Loader/QtFileLoader.php b/vendor/symfony/translation/Loader/QtFileLoader.php index 2d4a4c084f..29567789e7 100644 --- a/vendor/symfony/translation/Loader/QtFileLoader.php +++ b/vendor/symfony/translation/Loader/QtFileLoader.php @@ -65,7 +65,7 @@ class QtFileLoader implements LoaderInterface $translation = $translation->nextSibling; } - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + if (class_exists(FileResource::class)) { $catalogue->addResource(new FileResource($resource)); } } diff --git a/vendor/symfony/translation/Loader/XliffFileLoader.php b/vendor/symfony/translation/Loader/XliffFileLoader.php index e744d6d0f8..11a721f455 100644 --- a/vendor/symfony/translation/Loader/XliffFileLoader.php +++ b/vendor/symfony/translation/Loader/XliffFileLoader.php @@ -41,7 +41,7 @@ class XliffFileLoader implements LoaderInterface $catalogue = new MessageCatalogue($locale); $this->extract($resource, $catalogue, $domain); - if (class_exists('Symfony\Component\Config\Resource\FileResource')) { + if (class_exists(FileResource::class)) { $catalogue->addResource(new FileResource($resource)); } @@ -139,7 +139,7 @@ class XliffFileLoader implements LoaderInterface // If the xlf file has another encoding specified, try to convert it because // simple_xml will always return utf-8 encoded values - $target = $this->utf8ToCharset((string) (isset($segment->target) ? $segment->target : $source), $encoding); + $target = $this->utf8ToCharset((string) ($segment->target ?? $source), $encoding); $catalogue->set((string) $source, $target, $domain); diff --git a/vendor/symfony/translation/Loader/YamlFileLoader.php b/vendor/symfony/translation/Loader/YamlFileLoader.php index e4bee0cfbf..b03c7b77d0 100644 --- a/vendor/symfony/translation/Loader/YamlFileLoader.php +++ b/vendor/symfony/translation/Loader/YamlFileLoader.php @@ -32,7 +32,7 @@ class YamlFileLoader extends FileLoader protected function loadResource($resource) { if (null === $this->yamlParser) { - if (!class_exists('Symfony\Component\Yaml\Parser')) { + if (!class_exists(\Symfony\Component\Yaml\Parser::class)) { throw new LogicException('Loading translations from the YAML format requires the Symfony Yaml component.'); } diff --git a/vendor/symfony/translation/PluralizationRules.php b/vendor/symfony/translation/PluralizationRules.php index f5fba40394..2a46ce094f 100644 --- a/vendor/symfony/translation/PluralizationRules.php +++ b/vendor/symfony/translation/PluralizationRules.php @@ -25,13 +25,15 @@ class PluralizationRules /** * Returns the plural position to use for the given locale and number. * - * @param int $number The number + * @param float $number The number * @param string $locale The locale * * @return int The plural position */ public static function get($number, $locale/*, bool $triggerDeprecation = true*/) { + $number = abs($number); + if (3 > \func_num_args() || func_get_arg(2)) { @trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2.', __CLASS__), \E_USER_DEPRECATED); } @@ -144,7 +146,7 @@ class PluralizationRules case 'xbr': case 'ti': case 'wa': - return ((0 == $number) || (1 == $number)) ? 0 : 1; + return ($number < 2) ? 0 : 1; case 'be': case 'bs': diff --git a/vendor/symfony/translation/README.md b/vendor/symfony/translation/README.md index f4f1706675..dc090df5b3 100644 --- a/vendor/symfony/translation/README.md +++ b/vendor/symfony/translation/README.md @@ -12,8 +12,10 @@ $ composer require symfony/translation ```php use Symfony\Component\Translation\Translator; +use Symfony\Component\Translation\Loader\ArrayLoader; $translator = new Translator('fr_FR'); +$translator->addLoader('array', new ArrayLoader()); $translator->addResource('array', [ 'Hello World!' => 'Bonjour !', ], 'fr_FR'); diff --git a/vendor/symfony/translation/composer.json b/vendor/symfony/translation/composer.json index aec9b30c3d..e58a7beecf 100644 --- a/vendor/symfony/translation/composer.json +++ b/vendor/symfony/translation/composer.json @@ -1,7 +1,7 @@ { "name": "symfony/translation", "type": "library", - "description": "Symfony Translation Component", + "description": "Provides tools to internationalize your application", "keywords": [], "homepage": "https://symfony.com", "license": "MIT", diff --git a/vendor/symfony/var-exporter/LICENSE b/vendor/symfony/var-exporter/LICENSE index 69d925ba75..2358414536 100644 --- a/vendor/symfony/var-exporter/LICENSE +++ b/vendor/symfony/var-exporter/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018-2020 Fabien Potencier +Copyright (c) 2018-2021 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/symfony/var-exporter/composer.json b/vendor/symfony/var-exporter/composer.json index 0158ab74d9..f2691fe1b4 100644 --- a/vendor/symfony/var-exporter/composer.json +++ b/vendor/symfony/var-exporter/composer.json @@ -1,7 +1,7 @@ { "name": "symfony/var-exporter", "type": "library", - "description": "A blend of var_export() + serialize() to turn any serializable data structure to plain PHP code", + "description": "Allows exporting any serializable PHP data structure to plain PHP code", "keywords": ["export", "serialize", "instantiate", "hydrate", "construct", "clone"], "homepage": "https://symfony.com", "license": "MIT", |
