summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2021-02-06 16:50:32 +0000
committerGreg Roach <greg@subaqua.co.uk>2021-02-07 08:26:22 +0000
commitbfaab54a7bdb208f1667959aa083f02dea8e38a1 (patch)
treefff77d01a66f3a2332d9da63c72359304976ac6a /vendor
parent24f2a3af38709f9bf0a739b30264240d20ba34e8 (diff)
downloadwebtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.tar.gz
webtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.tar.bz2
webtrees-bfaab54a7bdb208f1667959aa083f02dea8e38a1.zip
Upgrade vendor dependencies
Diffstat (limited to 'vendor')
-rw-r--r--vendor/composer/InstalledVersions.php34
-rw-r--r--vendor/composer/installed.json86
-rw-r--r--vendor/composer/installed.php34
-rw-r--r--vendor/nesbot/carbon/composer.json2
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Lang/ru.php6
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Traits/Date.php6
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Traits/Localization.php4
-rw-r--r--vendor/nesbot/carbon/src/Carbon/Traits/Options.php4
-rw-r--r--vendor/symfony/cache/Adapter/ChainAdapter.php2
-rw-r--r--vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php2
-rw-r--r--vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php2
-rw-r--r--vendor/symfony/cache/CacheItem.php2
-rw-r--r--vendor/symfony/cache/LICENSE2
-rw-r--r--vendor/symfony/cache/Psr16Cache.php2
-rw-r--r--vendor/symfony/cache/README.md13
-rw-r--r--vendor/symfony/cache/Simple/ChainCache.php2
-rw-r--r--vendor/symfony/cache/Traits/ApcuTrait.php2
-rw-r--r--vendor/symfony/cache/Traits/FilesystemCommonTrait.php15
-rw-r--r--vendor/symfony/cache/Traits/FilesystemTrait.php6
-rw-r--r--vendor/symfony/cache/Traits/MemcachedTrait.php2
-rw-r--r--vendor/symfony/cache/Traits/PdoTrait.php16
-rw-r--r--vendor/symfony/cache/Traits/PhpFilesTrait.php2
-rw-r--r--vendor/symfony/cache/Traits/RedisTrait.php2
-rw-r--r--vendor/symfony/cache/composer.json10
-rw-r--r--vendor/symfony/expression-language/LICENSE2
-rw-r--r--vendor/symfony/expression-language/Node/BinaryNode.php16
-rw-r--r--vendor/symfony/expression-language/Node/UnaryNode.php4
-rw-r--r--vendor/symfony/expression-language/composer.json2
-rw-r--r--vendor/symfony/translation/DataCollector/TranslationDataCollector.php8
-rw-r--r--vendor/symfony/translation/Dumper/CsvFileDumper.php2
-rw-r--r--vendor/symfony/translation/Dumper/XliffFileDumper.php2
-rw-r--r--vendor/symfony/translation/Dumper/YamlFileDumper.php2
-rw-r--r--vendor/symfony/translation/IdentityTranslator.php2
-rw-r--r--vendor/symfony/translation/LICENSE2
-rw-r--r--vendor/symfony/translation/Loader/FileLoader.php2
-rw-r--r--vendor/symfony/translation/Loader/IcuDatFileLoader.php2
-rw-r--r--vendor/symfony/translation/Loader/IcuResFileLoader.php2
-rw-r--r--vendor/symfony/translation/Loader/QtFileLoader.php2
-rw-r--r--vendor/symfony/translation/Loader/XliffFileLoader.php4
-rw-r--r--vendor/symfony/translation/Loader/YamlFileLoader.php2
-rw-r--r--vendor/symfony/translation/PluralizationRules.php6
-rw-r--r--vendor/symfony/translation/README.md2
-rw-r--r--vendor/symfony/translation/composer.json2
-rw-r--r--vendor/symfony/var-exporter/LICENSE2
-rw-r--r--vendor/symfony/var-exporter/composer.json2
45 files changed, 174 insertions, 154 deletions
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 4ba9e23f6e..928fcdccde 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -19,7 +19,7 @@ private static $installed = array (
'aliases' =>
array (
),
- 'reference' => 'f2a3936017a21212e6a9c05613e272bb4af6e022',
+ 'reference' => '3597d99894f523730a6c01bad794425e2abac416',
'name' => 'fisharebest/webtrees',
),
'versions' =>
@@ -148,7 +148,7 @@ private static $installed = array (
'aliases' =>
array (
),
- 'reference' => 'f2a3936017a21212e6a9c05613e272bb4af6e022',
+ 'reference' => '3597d99894f523730a6c01bad794425e2abac416',
),
'guzzlehttp/guzzle' =>
array (
@@ -287,12 +287,12 @@ private static $installed = array (
),
'nesbot/carbon' =>
array (
- 'pretty_version' => '2.43.0',
- 'version' => '2.43.0.0',
+ 'pretty_version' => '2.44.0',
+ 'version' => '2.44.0.0',
'aliases' =>
array (
),
- 'reference' => 'd32c57d8389113742f4a88725a170236470012e2',
+ 'reference' => 'e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd',
),
'nyholm/psr7' =>
array (
@@ -475,12 +475,12 @@ private static $installed = array (
),
'symfony/cache' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => '23cc546c9104693d6fce1b3aaa31c1fd47198bdc',
+ 'reference' => '3c18a6d8e4fb15b9e6ed4e6eb1c93f2ad0fd4d55',
),
'symfony/cache-contracts' =>
array (
@@ -500,12 +500,12 @@ private static $installed = array (
),
'symfony/expression-language' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'c1763368a38d5061e5aa03160b328075d000291b',
+ 'reference' => '066402a1894fcaef22cbff1591c8a0bdf7f66e9b',
),
'symfony/polyfill-ctype' =>
array (
@@ -581,12 +581,12 @@ private static $installed = array (
),
'symfony/translation' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'c1001b7d75b3136648f94b245588209d881c6939',
+ 'reference' => 'e1d0c67167a553556d9f974b5fa79c2448df317a',
),
'symfony/translation-contracts' =>
array (
@@ -606,12 +606,12 @@ private static $installed = array (
),
'symfony/var-exporter' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'f04b7d187b120e0a44c18a2d479c2dd0abe99d9c',
+ 'reference' => '3a3ea598bba6901d20b58c2579f68700089244ed',
),
'tecnickcom/tcpdf' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 0ace6c3dda..b82a99b114 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1944,17 +1944,17 @@
},
{
"name": "nesbot/carbon",
- "version": "2.43.0",
- "version_normalized": "2.43.0.0",
+ "version": "2.44.0",
+ "version_normalized": "2.44.0.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
- "reference": "d32c57d8389113742f4a88725a170236470012e2"
+ "reference": "e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d32c57d8389113742f4a88725a170236470012e2",
- "reference": "d32c57d8389113742f4a88725a170236470012e2",
+ "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd",
+ "reference": "e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd",
"shasum": ""
},
"require": {
@@ -1970,10 +1970,10 @@
"phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.54",
- "phpunit/phpunit": "^7.5 || ^8.0",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.14",
"squizlabs/php_codesniffer": "^3.4"
},
- "time": "2020-12-17T20:55:32+00:00",
+ "time": "2021-01-26T20:46:41+00:00",
"bin": [
"bin/carbon"
],
@@ -3029,17 +3029,17 @@
},
{
"name": "symfony/cache",
- "version": "v4.4.18",
- "version_normalized": "4.4.18.0",
+ "version": "v4.4.19",
+ "version_normalized": "4.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "23cc546c9104693d6fce1b3aaa31c1fd47198bdc"
+ "reference": "3c18a6d8e4fb15b9e6ed4e6eb1c93f2ad0fd4d55"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/23cc546c9104693d6fce1b3aaa31c1fd47198bdc",
- "reference": "23cc546c9104693d6fce1b3aaa31c1fd47198bdc",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/3c18a6d8e4fb15b9e6ed4e6eb1c93f2ad0fd4d55",
+ "reference": "3c18a6d8e4fb15b9e6ed4e6eb1c93f2ad0fd4d55",
"shasum": ""
},
"require": {
@@ -3051,9 +3051,9 @@
"symfony/var-exporter": "^4.2|^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"
},
"provide": {
@@ -3064,16 +3064,16 @@
"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"
},
- "time": "2020-12-10T17:56:42+00:00",
+ "time": "2021-01-27T09:09:26+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -3098,14 +3098,14 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
+ "description": "Provides an extended PSR-6, PSR-16 (and tags) implementation",
"homepage": "https://symfony.com",
"keywords": [
"caching",
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v4.4.18"
+ "source": "https://github.com/symfony/cache/tree/v4.4.19"
},
"funding": [
{
@@ -3207,17 +3207,17 @@
},
{
"name": "symfony/expression-language",
- "version": "v4.4.18",
- "version_normalized": "4.4.18.0",
+ "version": "v4.4.19",
+ "version_normalized": "4.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
- "reference": "c1763368a38d5061e5aa03160b328075d000291b"
+ "reference": "066402a1894fcaef22cbff1591c8a0bdf7f66e9b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/expression-language/zipball/c1763368a38d5061e5aa03160b328075d000291b",
- "reference": "c1763368a38d5061e5aa03160b328075d000291b",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/066402a1894fcaef22cbff1591c8a0bdf7f66e9b",
+ "reference": "066402a1894fcaef22cbff1591c8a0bdf7f66e9b",
"shasum": ""
},
"require": {
@@ -3225,7 +3225,7 @@
"symfony/cache": "^3.4|^4.0|^5.0",
"symfony/service-contracts": "^1.1|^2"
},
- "time": "2020-12-08T16:59:59+00:00",
+ "time": "2021-01-27T09:09:26+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -3250,10 +3250,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony ExpressionLanguage Component",
+ "description": "Provides an engine that can compile and evaluate expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/expression-language/tree/v4.4.18"
+ "source": "https://github.com/symfony/expression-language/tree/v4.4.19"
},
"funding": [
{
@@ -3945,17 +3945,17 @@
},
{
"name": "symfony/translation",
- "version": "v4.4.18",
- "version_normalized": "4.4.18.0",
+ "version": "v4.4.19",
+ "version_normalized": "4.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "c1001b7d75b3136648f94b245588209d881c6939"
+ "reference": "e1d0c67167a553556d9f974b5fa79c2448df317a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/c1001b7d75b3136648f94b245588209d881c6939",
- "reference": "c1001b7d75b3136648f94b245588209d881c6939",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/e1d0c67167a553556d9f974b5fa79c2448df317a",
+ "reference": "e1d0c67167a553556d9f974b5fa79c2448df317a",
"shasum": ""
},
"require": {
@@ -3988,7 +3988,7 @@
"symfony/config": "",
"symfony/yaml": ""
},
- "time": "2020-12-08T16:59:59+00:00",
+ "time": "2021-01-27T09:09:26+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -4013,10 +4013,10 @@
"homepage": "https://symfony.com/contributors"
}
],
- "description": "Symfony Translation Component",
+ "description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/translation/tree/v4.4.18"
+ "source": "https://github.com/symfony/translation/tree/v4.4.19"
},
"funding": [
{
@@ -4117,17 +4117,17 @@
},
{
"name": "symfony/var-exporter",
- "version": "v4.4.18",
- "version_normalized": "4.4.18.0",
+ "version": "v4.4.19",
+ "version_normalized": "4.4.19.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "f04b7d187b120e0a44c18a2d479c2dd0abe99d9c"
+ "reference": "3a3ea598bba6901d20b58c2579f68700089244ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/f04b7d187b120e0a44c18a2d479c2dd0abe99d9c",
- "reference": "f04b7d187b120e0a44c18a2d479c2dd0abe99d9c",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/3a3ea598bba6901d20b58c2579f68700089244ed",
+ "reference": "3a3ea598bba6901d20b58c2579f68700089244ed",
"shasum": ""
},
"require": {
@@ -4136,7 +4136,7 @@
"require-dev": {
"symfony/var-dumper": "^4.4.9|^5.0.9"
},
- "time": "2020-10-28T20:42:29+00:00",
+ "time": "2021-01-27T09:09:26+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -4161,7 +4161,7 @@
"homepage": "https://symfony.com/contributors"
}
],
- "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",
"homepage": "https://symfony.com",
"keywords": [
"clone",
@@ -4172,7 +4172,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v4.4.18"
+ "source": "https://github.com/symfony/var-exporter/tree/v4.4.19"
},
"funding": [
{
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index e7c944e605..17c10d2a09 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,7 +6,7 @@
'aliases' =>
array (
),
- 'reference' => 'f2a3936017a21212e6a9c05613e272bb4af6e022',
+ 'reference' => '3597d99894f523730a6c01bad794425e2abac416',
'name' => 'fisharebest/webtrees',
),
'versions' =>
@@ -135,7 +135,7 @@
'aliases' =>
array (
),
- 'reference' => 'f2a3936017a21212e6a9c05613e272bb4af6e022',
+ 'reference' => '3597d99894f523730a6c01bad794425e2abac416',
),
'guzzlehttp/guzzle' =>
array (
@@ -274,12 +274,12 @@
),
'nesbot/carbon' =>
array (
- 'pretty_version' => '2.43.0',
- 'version' => '2.43.0.0',
+ 'pretty_version' => '2.44.0',
+ 'version' => '2.44.0.0',
'aliases' =>
array (
),
- 'reference' => 'd32c57d8389113742f4a88725a170236470012e2',
+ 'reference' => 'e6ef33cb1f67a4bed831ed6d0f7e156739a5d8cd',
),
'nyholm/psr7' =>
array (
@@ -462,12 +462,12 @@
),
'symfony/cache' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => '23cc546c9104693d6fce1b3aaa31c1fd47198bdc',
+ 'reference' => '3c18a6d8e4fb15b9e6ed4e6eb1c93f2ad0fd4d55',
),
'symfony/cache-contracts' =>
array (
@@ -487,12 +487,12 @@
),
'symfony/expression-language' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'c1763368a38d5061e5aa03160b328075d000291b',
+ 'reference' => '066402a1894fcaef22cbff1591c8a0bdf7f66e9b',
),
'symfony/polyfill-ctype' =>
array (
@@ -568,12 +568,12 @@
),
'symfony/translation' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'c1001b7d75b3136648f94b245588209d881c6939',
+ 'reference' => 'e1d0c67167a553556d9f974b5fa79c2448df317a',
),
'symfony/translation-contracts' =>
array (
@@ -593,12 +593,12 @@
),
'symfony/var-exporter' =>
array (
- 'pretty_version' => 'v4.4.18',
- 'version' => '4.4.18.0',
+ 'pretty_version' => 'v4.4.19',
+ 'version' => '4.4.19.0',
'aliases' =>
array (
),
- 'reference' => 'f04b7d187b120e0a44c18a2d479c2dd0abe99d9c',
+ 'reference' => '3a3ea598bba6901d20b58c2579f68700089244ed',
),
'tecnickcom/tcpdf' =>
array (
diff --git a/vendor/nesbot/carbon/composer.json b/vendor/nesbot/carbon/composer.json
index 0fe60311cc..29fb08d929 100644
--- a/vendor/nesbot/carbon/composer.json
+++ b/vendor/nesbot/carbon/composer.json
@@ -40,7 +40,7 @@
"phpmd/phpmd": "^2.9",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12.54",
- "phpunit/phpunit": "^7.5 || ^8.0",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.14",
"squizlabs/php_codesniffer": "^3.4"
},
"autoload": {
diff --git a/vendor/nesbot/carbon/src/Carbon/Lang/ru.php b/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
index f2e19f6340..93e0e01bb2 100644
--- a/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
+++ b/vendor/nesbot/carbon/src/Carbon/Lang/ru.php
@@ -79,11 +79,11 @@ return [
},
'diff_now' => 'только что',
'diff_today' => 'Сегодня,',
- 'diff_today_regexp' => 'Сегодня,(?:\\s+в)?',
+ 'diff_today_regexp' => 'Сегодня,?(?:\\s+в)?',
'diff_yesterday' => 'вчера',
- 'diff_yesterday_regexp' => 'Вчера,(?:\\s+в)?',
+ 'diff_yesterday_regexp' => 'Вчера,?(?:\\s+в)?',
'diff_tomorrow' => 'завтра',
- 'diff_tomorrow_regexp' => 'Завтра,(?:\\s+в)?',
+ 'diff_tomorrow_regexp' => 'Завтра,?(?:\\s+в)?',
'diff_before_yesterday' => 'позавчера',
'diff_after_tomorrow' => 'послезавтра',
'formats' => [
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
index 7516180300..f4b7c42b0c 100644
--- a/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
+++ b/vendor/nesbot/carbon/src/Carbon/Traits/Date.php
@@ -1374,17 +1374,17 @@ trait Date
/**
* Returns the minutes offset to UTC if no arguments passed, else set the timezone with given minutes shift passed.
*
- * @param int|null $offset
+ * @param int|null $minuteOffset
*
* @return int|static
*/
- public function utcOffset(int $offset = null)
+ public function utcOffset(int $minuteOffset = null)
{
if (\func_num_args() < 1) {
return $this->offsetMinutes;
}
- return $this->setTimezone(static::safeCreateDateTimeZone($offset / static::MINUTES_PER_HOUR));
+ return $this->setTimezone(CarbonTimeZone::createFromMinuteOffset($minuteOffset));
}
/**
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php
index 827d7b47fe..7bbedf999f 100644
--- a/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php
+++ b/vendor/nesbot/carbon/src/Carbon/Traits/Localization.php
@@ -396,11 +396,11 @@ trait Localization
);
}
- return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/i', function ($match) use ($fromTranslations, $toTranslations) {
+ return substr(preg_replace_callback('/(?<=[\d\s+.\/,_-])('.implode('|', $fromTranslations).')(?=[\d\s+.\/,_-])/iu', function ($match) use ($fromTranslations, $toTranslations) {
[$chunk] = $match;
foreach ($fromTranslations as $index => $word) {
- if (preg_match("/^$word\$/i", $chunk)) {
+ if (preg_match("/^$word\$/iu", $chunk)) {
return $toTranslations[$index] ?? '';
}
}
diff --git a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php
index 626a23cd17..ce03faf323 100644
--- a/vendor/nesbot/carbon/src/Carbon/Traits/Options.php
+++ b/vendor/nesbot/carbon/src/Carbon/Traits/Options.php
@@ -61,7 +61,7 @@ trait Options
/**
* Format regex patterns.
*
- * @var array
+ * @var array<string, string>
*/
protected static $regexFormats = [
'd' => '(3[01]|[12][0-9]|0[1-9])',
@@ -72,7 +72,7 @@ trait Options
'S' => '(st|nd|rd|th)',
'w' => '([0-6])',
'z' => '(36[0-5]|3[0-5][0-9]|[12][0-9]{2}|[1-9]?[0-9])',
- 'W' => '(5[012]|[1-4][0-9]|[1-9])',
+ 'W' => '(5[012]|[1-4][0-9]|0?[1-9])',
'F' => '([a-zA-Z]{2,})',
'm' => '(1[012]|0[1-9])',
'M' => '([a-zA-Z]{3})',
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",