Update composer dependencies

This commit is contained in:
grandeljay 2022-11-28 11:17:27 +01:00
parent 5260e2dcc8
commit bfb62acc87
21 changed files with 272 additions and 102 deletions

50
composer.lock generated
View file

@ -8,16 +8,16 @@
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.3.3", "version": "1.3.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" "reference": "69098eca243998b53eed7a48d82dedd28b447cd5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5",
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", "reference": "69098eca243998b53eed7a48d82dedd28b447cd5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -64,7 +64,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues", "issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.3.3" "source": "https://github.com/composer/ca-bundle/tree/1.3.4"
}, },
"funding": [ "funding": [
{ {
@ -80,7 +80,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-07-20T07:14:26+00:00" "time": "2022-10-12T12:08:29+00:00"
}, },
{ {
"name": "embed/embed", "name": "embed/embed",
@ -247,16 +247,16 @@
}, },
{ {
"name": "gettext/languages", "name": "gettext/languages",
"version": "2.9.0", "version": "2.10.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-gettext/Languages.git", "url": "https://github.com/php-gettext/Languages.git",
"reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
"reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -305,7 +305,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-gettext/Languages/issues", "issues": "https://github.com/php-gettext/Languages/issues",
"source": "https://github.com/php-gettext/Languages/tree/2.9.0" "source": "https://github.com/php-gettext/Languages/tree/2.10.0"
}, },
"funding": [ "funding": [
{ {
@ -317,7 +317,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-11-11T17:30:39+00:00" "time": "2022-10-18T15:00:10+00:00"
}, },
{ {
"name": "gettext/translator", "name": "gettext/translator",
@ -647,16 +647,16 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.4.1", "version": "2.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" "reference": "67c26b443f348a51926030c83481b85718457d3d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", "reference": "67c26b443f348a51926030c83481b85718457d3d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -746,7 +746,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.1" "source": "https://github.com/guzzle/psr7/tree/2.4.3"
}, },
"funding": [ "funding": [
{ {
@ -762,7 +762,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-08-28T14:45:39+00:00" "time": "2022-10-26T14:07:24+00:00"
}, },
{ {
"name": "jaybizzle/crawler-detect", "name": "jaybizzle/crawler-detect",
@ -1287,16 +1287,16 @@
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.26.0", "version": "v1.27.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1305,7 +1305,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.26-dev" "dev-main": "1.27-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@ -1350,7 +1350,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
}, },
"funding": [ "funding": [
{ {
@ -1366,7 +1366,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-05-10T07:21:04+00:00" "time": "2022-11-03T14:55:06+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",

View file

@ -1,7 +1,7 @@
## ##
## Bundle of CA Root Certificates ## Bundle of CA Root Certificates
## ##
## Certificate data from Mozilla as of: Tue Jul 19 03:12:06 2022 GMT ## Certificate data from Mozilla as of: Tue Oct 11 03:12:05 2022 GMT
## ##
## This is a bundle of X.509 certificates of public Certificate Authorities ## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates ## (CA). These were automatically extracted from Mozilla's root certificates
@ -14,7 +14,7 @@
## Just configure this file as the SSLCACertificateFile. ## Just configure this file as the SSLCACertificateFile.
## ##
## Conversion done with mk-ca-bundle.pl version 1.29. ## Conversion done with mk-ca-bundle.pl version 1.29.
## SHA256: 9bf3799611fb58197f61d45e71ce3dc19f30e7dd73731915872ce5108a7bb066 ## SHA256: 3ff8bd209b5f2e739b9f2b96eacb694a774114685b02978257824f37ff528f71
## ##
@ -3458,3 +3458,49 @@ zPUwHQYDVR0OBBYEFP+CMXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W PQQDAwNpADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/67W4W
Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3 Aie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFxvmjkI6TZraE3
-----END CERTIFICATE----- -----END CERTIFICATE-----
Security Communication RootCA3
==============================
-----BEGIN CERTIFICATE-----
MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNVBAYTAkpQMSUw
IwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScwJQYDVQQDEx5TZWN1cml0eSBD
b21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQsw
CQYDVQQGEwJKUDElMCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UE
AxMeU2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
MIICCgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4rCmDvu20r
hvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzAlrenfna84xtSGc4RHwsE
NPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MGTfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2
/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF79+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGm
npjKIG58u4iFW/vAEGK78vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtY
XLVqAvO4g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3weGVPK
p7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst+3A7caoreyYn8xrC
3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M0V9hvqG8OmpI6iZVIhZdXw3/JzOf
GAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQT9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0Vcw
CBEF/VfR2ccCAwEAAaNCMEAwHQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB
/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PAFNr0Y/Dq9HHu
Tofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd9XbXv8S2gVj/yP9kaWJ5rW4O
H3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQIUYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASx
YfQAW0q3nHE3GYV5v4GwxxMOdnE+OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZ
XSEIx2C/pHF7uNkegr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml
+LLfiAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUVnuiZIesn
KwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD2NCcnWXL0CsnMQMeNuE9
dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm
6Vwdp6POXiUyK+OVrCoHzrQoeIY8LaadTdJ0MN1kURXbg4NR16/9M51NZg==
-----END CERTIFICATE-----
Security Communication ECC RootCA1
==================================
-----BEGIN CERTIFICATE-----
MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYTAkpQMSUwIwYD
VQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTZWN1cml0eSBDb21t
dW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYxNjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTEL
MAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNV
BAMTIlNlY3VyaXR5IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQA
IgNiAASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+CnnfdldB9sELLo
5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpKULGjQjBAMB0GA1UdDgQW
BBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAK
BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L
snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e
N9k=
-----END CERTIFICATE-----

View file

@ -2,17 +2,17 @@
"packages": [ "packages": [
{ {
"name": "composer/ca-bundle", "name": "composer/ca-bundle",
"version": "1.3.3", "version": "1.3.4",
"version_normalized": "1.3.3.0", "version_normalized": "1.3.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/ca-bundle.git", "url": "https://github.com/composer/ca-bundle.git",
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c" "reference": "69098eca243998b53eed7a48d82dedd28b447cd5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/30897edbfb15e784fe55587b4f73ceefd3c4d98c", "url": "https://api.github.com/repos/composer/ca-bundle/zipball/69098eca243998b53eed7a48d82dedd28b447cd5",
"reference": "30897edbfb15e784fe55587b4f73ceefd3c4d98c", "reference": "69098eca243998b53eed7a48d82dedd28b447cd5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -26,7 +26,7 @@
"symfony/phpunit-bridge": "^4.2 || ^5", "symfony/phpunit-bridge": "^4.2 || ^5",
"symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0" "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
}, },
"time": "2022-07-20T07:14:26+00:00", "time": "2022-10-12T12:08:29+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
@ -61,7 +61,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/ca-bundle/issues", "issues": "https://github.com/composer/ca-bundle/issues",
"source": "https://github.com/composer/ca-bundle/tree/1.3.3" "source": "https://github.com/composer/ca-bundle/tree/1.3.4"
}, },
"funding": [ "funding": [
{ {
@ -250,17 +250,17 @@
}, },
{ {
"name": "gettext/languages", "name": "gettext/languages",
"version": "2.9.0", "version": "2.10.0",
"version_normalized": "2.9.0.0", "version_normalized": "2.10.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-gettext/Languages.git", "url": "https://github.com/php-gettext/Languages.git",
"reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
"reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -269,7 +269,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4" "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4"
}, },
"time": "2021-11-11T17:30:39+00:00", "time": "2022-10-18T15:00:10+00:00",
"bin": [ "bin": [
"bin/export-plural-rules" "bin/export-plural-rules"
], ],
@ -311,7 +311,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-gettext/Languages/issues", "issues": "https://github.com/php-gettext/Languages/issues",
"source": "https://github.com/php-gettext/Languages/tree/2.9.0" "source": "https://github.com/php-gettext/Languages/tree/2.10.0"
}, },
"funding": [ "funding": [
{ {
@ -665,17 +665,17 @@
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.4.1", "version": "2.4.3",
"version_normalized": "2.4.1.0", "version_normalized": "2.4.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" "reference": "67c26b443f348a51926030c83481b85718457d3d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d",
"reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", "reference": "67c26b443f348a51926030c83481b85718457d3d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -696,7 +696,7 @@
"suggest": { "suggest": {
"laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
}, },
"time": "2022-08-28T14:45:39+00:00", "time": "2022-10-26T14:07:24+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"bamarni-bin": { "bamarni-bin": {
@ -767,7 +767,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.4.1" "source": "https://github.com/guzzle/psr7/tree/2.4.3"
}, },
"funding": [ "funding": [
{ {
@ -1338,27 +1338,27 @@
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.26.0", "version": "v1.27.0",
"version_normalized": "1.26.0.0", "version_normalized": "1.27.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
"reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1" "php": ">=7.1"
}, },
"time": "2022-05-10T07:21:04+00:00", "time": "2022-11-03T14:55:06+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.26-dev" "dev-main": "1.27-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@ -1404,7 +1404,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
}, },
"funding": [ "funding": [
{ {

View file

@ -3,7 +3,7 @@
'name' => '__root__', 'name' => '__root__',
'pretty_version' => 'dev-develop', 'pretty_version' => 'dev-develop',
'version' => 'dev-develop', 'version' => 'dev-develop',
'reference' => '99dd799165573cb1f7b4c02b3385a1e690b05855', 'reference' => '5260e2dcc8473e59a2c63eae3264f51cf6b863a5',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
@ -13,16 +13,16 @@
'__root__' => array( '__root__' => array(
'pretty_version' => 'dev-develop', 'pretty_version' => 'dev-develop',
'version' => 'dev-develop', 'version' => 'dev-develop',
'reference' => '99dd799165573cb1f7b4c02b3385a1e690b05855', 'reference' => '5260e2dcc8473e59a2c63eae3264f51cf6b863a5',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'composer/ca-bundle' => array( 'composer/ca-bundle' => array(
'pretty_version' => '1.3.3', 'pretty_version' => '1.3.4',
'version' => '1.3.3.0', 'version' => '1.3.4.0',
'reference' => '30897edbfb15e784fe55587b4f73ceefd3c4d98c', 'reference' => '69098eca243998b53eed7a48d82dedd28b447cd5',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/./ca-bundle', 'install_path' => __DIR__ . '/./ca-bundle',
'aliases' => array(), 'aliases' => array(),
@ -47,9 +47,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'gettext/languages' => array( 'gettext/languages' => array(
'pretty_version' => '2.9.0', 'pretty_version' => '2.10.0',
'version' => '2.9.0.0', 'version' => '2.10.0.0',
'reference' => 'ed56dd2c7f4024cc953ed180d25f02f2640e3ffa', 'reference' => '4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../gettext/languages', 'install_path' => __DIR__ . '/../gettext/languages',
'aliases' => array(), 'aliases' => array(),
@ -92,9 +92,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'guzzlehttp/psr7' => array( 'guzzlehttp/psr7' => array(
'pretty_version' => '2.4.1', 'pretty_version' => '2.4.3',
'version' => '2.4.1.0', 'version' => '2.4.3.0',
'reference' => '69568e4293f4fa993f3b0e51c9723e1e17c41379', 'reference' => '67c26b443f348a51926030c83481b85718457d3d',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../guzzlehttp/psr7', 'install_path' => __DIR__ . '/../guzzlehttp/psr7',
'aliases' => array(), 'aliases' => array(),
@ -209,9 +209,9 @@
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'symfony/polyfill-php80' => array( 'symfony/polyfill-php80' => array(
'pretty_version' => 'v1.26.0', 'pretty_version' => 'v1.27.0',
'version' => '1.26.0.0', 'version' => '1.27.0.0',
'reference' => 'cfa0ae98841b9e461207c13ab093d76b0fa7bace', 'reference' => '7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936',
'type' => 'library', 'type' => 'library',
'install_path' => __DIR__ . '/../symfony/polyfill-php80', 'install_path' => __DIR__ . '/../symfony/polyfill-php80',
'aliases' => array(), 'aliases' => array(),

View file

@ -301,15 +301,11 @@ class CldrData
} }
// Fix the languages for which we have plurals // Fix the languages for which we have plurals
$formerCodes = array( $formerCodes = array(
'in' => 'id', // former Indonesian
'iw' => 'he', // former Hebrew
'ji' => 'yi', // former Yiddish
'jw' => 'jv', // former Javanese 'jw' => 'jv', // former Javanese
'mo' => 'ro_MD', // former Moldavian 'mo' => 'ro_MD', // former Moldavian
); );
$knownMissingLanguages = array( $knownMissingLanguages = array(
'guw' => 'Gun', 'guw' => 'Gun',
'hnj' => 'Mong Njua',
'nah' => 'Nahuatl', 'nah' => 'Nahuatl',
'smi' => 'Sami', 'smi' => 'Sami',
); );

View file

@ -162,7 +162,7 @@ class FormulaConverter
} }
switch ($op) { switch ($op) {
case '==': case '==':
return '(' . implode(' || ', $chunks) . ')'; break; return '(' . implode(' || ', $chunks) . ')';
case '!=': case '!=':
return implode(' && ', $chunks); return implode(' && ', $chunks);
} }

View file

@ -3,7 +3,7 @@
"en-US": { "en-US": {
"identity": { "identity": {
"version": { "version": {
"_cldrVersion": "40" "_cldrVersion": "42"
}, },
"language": "en", "language": "en",
"territory": "US" "territory": "US"
@ -31,6 +31,7 @@
"am": "Amharic", "am": "Amharic",
"an": "Aragonese", "an": "Aragonese",
"ang": "Old English", "ang": "Old English",
"ann": "Obolo",
"anp": "Angika", "anp": "Angika",
"ar": "Arabic", "ar": "Arabic",
"ar-001": "Modern Standard Arabic", "ar-001": "Modern Standard Arabic",
@ -48,6 +49,7 @@
"asa": "Asu", "asa": "Asu",
"ase": "American Sign Language", "ase": "American Sign Language",
"ast": "Asturian", "ast": "Asturian",
"atj": "Atikamekw",
"av": "Avaric", "av": "Avaric",
"avk": "Kotava", "avk": "Kotava",
"awa": "Awadhi", "awa": "Awadhi",
@ -70,6 +72,7 @@
"bfd": "Bafut", "bfd": "Bafut",
"bfq": "Badaga", "bfq": "Badaga",
"bg": "Bulgarian", "bg": "Bulgarian",
"bgc": "Haryanvi",
"bgn": "Western Balochi", "bgn": "Western Balochi",
"bho": "Bhojpuri", "bho": "Bhojpuri",
"bi": "Bislama", "bi": "Bislama",
@ -77,7 +80,8 @@
"bin": "Bini", "bin": "Bini",
"bjn": "Banjar", "bjn": "Banjar",
"bkm": "Kom", "bkm": "Kom",
"bla": "Siksika", "bla": "Siksiká",
"blt": "Tai Dam",
"bm": "Bambara", "bm": "Bambara",
"bn": "Bangla", "bn": "Bangla",
"bo": "Tibetan", "bo": "Tibetan",
@ -117,16 +121,25 @@
"ckb": "Central Kurdish", "ckb": "Central Kurdish",
"ckb-alt-menu": "Kurdish, Central", "ckb-alt-menu": "Kurdish, Central",
"ckb-alt-variant": "Kurdish, Sorani", "ckb-alt-variant": "Kurdish, Sorani",
"clc": "Chilcotin",
"co": "Corsican", "co": "Corsican",
"cop": "Coptic", "cop": "Coptic",
"cps": "Capiznon", "cps": "Capiznon",
"cr": "Cree", "cr": "Cree",
"crh": "Crimean Turkish", "crg": "Michif",
"crh": "Crimean Tatar",
"crj": "Southern East Cree",
"crk": "Plains Cree",
"crl": "Northern East Cree",
"crm": "Moose Cree",
"crr": "Carolina Algonquian",
"crs": "Seselwa Creole French", "crs": "Seselwa Creole French",
"cs": "Czech", "cs": "Czech",
"csb": "Kashubian", "csb": "Kashubian",
"csw": "Swampy Cree",
"cu": "Church Slavic", "cu": "Church Slavic",
"cv": "Chuvash", "cv": "Chuvash",
"cwd": "Woods Cree",
"cy": "Welsh", "cy": "Welsh",
"da": "Danish", "da": "Danish",
"dak": "Dakota", "dak": "Dakota",
@ -180,7 +193,7 @@
"fa-AF": "Dari", "fa-AF": "Dari",
"fan": "Fang", "fan": "Fang",
"fat": "Fanti", "fat": "Fanti",
"ff": "Fulah", "ff": "Fula",
"fi": "Finnish", "fi": "Finnish",
"fil": "Filipino", "fil": "Filipino",
"fit": "Tornedalen Finnish", "fit": "Tornedalen Finnish",
@ -230,12 +243,17 @@
"hai": "Haida", "hai": "Haida",
"hak": "Hakka Chinese", "hak": "Hakka Chinese",
"haw": "Hawaiian", "haw": "Hawaiian",
"hax": "Southern Haida",
"hdn": "Northern Haida",
"he": "Hebrew", "he": "Hebrew",
"hi": "Hindi", "hi": "Hindi",
"hi-Latn": "Hindi (Latin)",
"hi-Latn-alt-variant": "Hinglish",
"hif": "Fiji Hindi", "hif": "Fiji Hindi",
"hil": "Hiligaynon", "hil": "Hiligaynon",
"hit": "Hittite", "hit": "Hittite",
"hmn": "Hmong", "hmn": "Hmong",
"hnj": "Hmong Njua",
"ho": "Hiri Motu", "ho": "Hiri Motu",
"hr": "Croatian", "hr": "Croatian",
"hsb": "Upper Sorbian", "hsb": "Upper Sorbian",
@ -243,6 +261,7 @@
"ht": "Haitian Creole", "ht": "Haitian Creole",
"hu": "Hungarian", "hu": "Hungarian",
"hup": "Hupa", "hup": "Hupa",
"hur": "Halkomelem",
"hy": "Armenian", "hy": "Armenian",
"hz": "Herero", "hz": "Herero",
"ia": "Interlingua", "ia": "Interlingua",
@ -253,6 +272,8 @@
"ig": "Igbo", "ig": "Igbo",
"ii": "Sichuan Yi", "ii": "Sichuan Yi",
"ik": "Inupiaq", "ik": "Inupiaq",
"ike": "Eastern Canadian Inuktitut",
"ikt": "Western Canadian Inuktitut",
"ilo": "Iloko", "ilo": "Iloko",
"inh": "Ingush", "inh": "Ingush",
"io": "Ido", "io": "Ido",
@ -319,12 +340,13 @@
"kut": "Kutenai", "kut": "Kutenai",
"kv": "Komi", "kv": "Komi",
"kw": "Cornish", "kw": "Cornish",
"kwk": "Kwakʼwala",
"ky": "Kyrgyz", "ky": "Kyrgyz",
"ky-alt-variant": "Kirghiz", "ky-alt-variant": "Kirghiz",
"la": "Latin", "la": "Latin",
"lad": "Ladino", "lad": "Ladino",
"lag": "Langi", "lag": "Langi",
"lah": "Lahnda", "lah": "Western Panjabi",
"lam": "Lamba", "lam": "Lamba",
"lb": "Luxembourgish", "lb": "Luxembourgish",
"lez": "Lezghian", "lez": "Lezghian",
@ -332,6 +354,7 @@
"lg": "Ganda", "lg": "Ganda",
"li": "Limburgish", "li": "Limburgish",
"lij": "Ligurian", "lij": "Ligurian",
"lil": "Lillooet",
"liv": "Livonian", "liv": "Livonian",
"lkt": "Lakota", "lkt": "Lakota",
"lmo": "Lombard", "lmo": "Lombard",
@ -341,6 +364,7 @@
"lou": "Louisiana Creole", "lou": "Louisiana Creole",
"loz": "Lozi", "loz": "Lozi",
"lrc": "Northern Luri", "lrc": "Northern Luri",
"lsm": "Saamia",
"lt": "Lithuanian", "lt": "Lithuanian",
"ltg": "Latgalian", "ltg": "Latgalian",
"lu": "Luba-Katanga", "lu": "Luba-Katanga",
@ -379,6 +403,7 @@
"mn": "Mongolian", "mn": "Mongolian",
"mnc": "Manchu", "mnc": "Manchu",
"mni": "Manipuri", "mni": "Manipuri",
"moe": "Innu-aimun",
"moh": "Mohawk", "moh": "Mohawk",
"mos": "Mossi", "mos": "Mossi",
"mr": "Marathi", "mr": "Marathi",
@ -432,6 +457,12 @@
"nzi": "Nzima", "nzi": "Nzima",
"oc": "Occitan", "oc": "Occitan",
"oj": "Ojibwa", "oj": "Ojibwa",
"ojb": "Northwestern Ojibwa",
"ojc": "Central Ojibwa",
"ojg": "Eastern Ojibwa",
"ojs": "Oji-Cree",
"ojw": "Western Ojibwa",
"oka": "Okanagan",
"om": "Oromo", "om": "Oromo",
"or": "Odia", "or": "Odia",
"os": "Ossetic", "os": "Ossetic",
@ -451,10 +482,12 @@
"pfl": "Palatine German", "pfl": "Palatine German",
"phn": "Phoenician", "phn": "Phoenician",
"pi": "Pali", "pi": "Pali",
"pis": "Pijin",
"pl": "Polish", "pl": "Polish",
"pms": "Piedmontese", "pms": "Piedmontese",
"pnt": "Pontic", "pnt": "Pontic",
"pon": "Pohnpeian", "pon": "Pohnpeian",
"pqm": "Maliseet-Passamaquoddy",
"prg": "Prussian", "prg": "Prussian",
"pro": "Old Provençal", "pro": "Old Provençal",
"ps": "Pashto", "ps": "Pashto",
@ -486,7 +519,7 @@
"rwk": "Rwa", "rwk": "Rwa",
"sa": "Sanskrit", "sa": "Sanskrit",
"sad": "Sandawe", "sad": "Sandawe",
"sah": "Sakha", "sah": "Yakut",
"sam": "Samaritan Aramaic", "sam": "Samaritan Aramaic",
"saq": "Samburu", "saq": "Samburu",
"sas": "Sasak", "sas": "Sasak",
@ -518,6 +551,7 @@
"sid": "Sidamo", "sid": "Sidamo",
"sk": "Slovak", "sk": "Slovak",
"sl": "Slovenian", "sl": "Slovenian",
"slh": "Southern Lushootseed",
"sli": "Lower Silesian", "sli": "Lower Silesian",
"sly": "Selayar", "sly": "Selayar",
"sm": "Samoan", "sm": "Samoan",
@ -542,6 +576,7 @@
"ssy": "Saho", "ssy": "Saho",
"st": "Southern Sotho", "st": "Southern Sotho",
"stq": "Saterland Frisian", "stq": "Saterland Frisian",
"str": "Straits Salish",
"su": "Sundanese", "su": "Sundanese",
"suk": "Sukuma", "suk": "Sukuma",
"sus": "Susu", "sus": "Susu",
@ -554,6 +589,7 @@
"syr": "Syriac", "syr": "Syriac",
"szl": "Silesian", "szl": "Silesian",
"ta": "Tamil", "ta": "Tamil",
"tce": "Southern Tutchone",
"tcy": "Tulu", "tcy": "Tulu",
"te": "Telugu", "te": "Telugu",
"tem": "Timne", "tem": "Timne",
@ -561,7 +597,9 @@
"ter": "Tereno", "ter": "Tereno",
"tet": "Tetum", "tet": "Tetum",
"tg": "Tajik", "tg": "Tajik",
"tgx": "Tagish",
"th": "Thai", "th": "Thai",
"tht": "Tahltan",
"ti": "Tigrinya", "ti": "Tigrinya",
"tig": "Tigre", "tig": "Tigre",
"tiv": "Tiv", "tiv": "Tiv",
@ -576,14 +614,17 @@
"tn": "Tswana", "tn": "Tswana",
"to": "Tongan", "to": "Tongan",
"tog": "Nyasa Tonga", "tog": "Nyasa Tonga",
"tok": "Toki Pona",
"tpi": "Tok Pisin", "tpi": "Tok Pisin",
"tr": "Turkish", "tr": "Turkish",
"tru": "Turoyo", "tru": "Turoyo",
"trv": "Taroko", "trv": "Taroko",
"trw": "Torwali",
"ts": "Tsonga", "ts": "Tsonga",
"tsd": "Tsakonian", "tsd": "Tsakonian",
"tsi": "Tsimshian", "tsi": "Tsimshian",
"tt": "Tatar", "tt": "Tatar",
"ttm": "Northern Tutchone",
"ttt": "Muslim Tat", "ttt": "Muslim Tat",
"tum": "Tumbuka", "tum": "Tumbuka",
"tvl": "Tuvalu", "tvl": "Tuvalu",

View file

@ -3,7 +3,7 @@
"en-US": { "en-US": {
"identity": { "identity": {
"version": { "version": {
"_cldrVersion": "40" "_cldrVersion": "42"
}, },
"language": "en", "language": "en",
"territory": "US" "territory": "US"
@ -90,6 +90,7 @@
"Jurc": "Jurchen", "Jurc": "Jurchen",
"Kali": "Kayah Li", "Kali": "Kayah Li",
"Kana": "Katakana", "Kana": "Katakana",
"Kawi": "Kawi",
"Khar": "Kharoshthi", "Khar": "Kharoshthi",
"Khmr": "Khmer", "Khmr": "Khmer",
"Khoj": "Khojki", "Khoj": "Khojki",
@ -129,6 +130,7 @@
"Mtei": "Meitei Mayek", "Mtei": "Meitei Mayek",
"Mult": "Multani", "Mult": "Multani",
"Mymr": "Myanmar", "Mymr": "Myanmar",
"Nagm": "Nag Mundari",
"Nand": "Nandinagari", "Nand": "Nandinagari",
"Narb": "Old North Arabian", "Narb": "Old North Arabian",
"Nbat": "Nabataean", "Nbat": "Nabataean",

View file

@ -3,7 +3,7 @@
"en-US": { "en-US": {
"identity": { "identity": {
"version": { "version": {
"_cldrVersion": "40" "_cldrVersion": "42"
}, },
"language": "en", "language": "en",
"territory": "US" "territory": "US"
@ -230,6 +230,7 @@
"NR": "Nauru", "NR": "Nauru",
"NU": "Niue", "NU": "Niue",
"NZ": "New Zealand", "NZ": "New Zealand",
"NZ-alt-variant": "Aotearoa New Zealand",
"OM": "Oman", "OM": "Oman",
"PA": "Panama", "PA": "Panama",
"PE": "Peru", "PE": "Peru",
@ -289,6 +290,7 @@
"TN": "Tunisia", "TN": "Tunisia",
"TO": "Tonga", "TO": "Tonga",
"TR": "Turkey", "TR": "Turkey",
"TR-alt-variant": "Türkiye",
"TT": "Trinidad & Tobago", "TT": "Trinidad & Tobago",
"TV": "Tuvalu", "TV": "Tuvalu",
"TW": "Taiwan", "TW": "Taiwan",

View file

@ -2,7 +2,7 @@
"supplemental": { "supplemental": {
"version": { "version": {
"_unicodeVersion": "14.0.0", "_unicodeVersion": "14.0.0",
"_cldrVersion": "40" "_cldrVersion": "42"
}, },
"plurals-type-cardinal": { "plurals-type-cardinal": {
"af": { "af": {
@ -107,7 +107,8 @@
}, },
"ca": { "ca": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1", "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-many": "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …",
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6c3, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …"
}, },
"ce": { "ce": {
"pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000", "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
@ -275,10 +276,9 @@
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
"he": { "he": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1", "pluralRule-count-one": "i = 1 and v = 0 or i = 0 and v != 0 @integer 1 @decimal 0.0~0.9, 0.00~0.05",
"pluralRule-count-two": "i = 2 and v = 0 @integer 2", "pluralRule-count-two": "i = 2 and v = 0 @integer 2",
"pluralRule-count-many": "v = 0 and n != 0..10 and n % 10 = 0 @integer 20, 30, 40, 50, 60, 70, 80, 90, 100, 1000, 10000, 100000, 1000000, …", "pluralRule-count-other": " @integer 0, 3~17, 100, 1000, 10000, 100000, 1000000, … @decimal 1.0~2.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
"pluralRule-count-other": " @integer 0, 3~17, 101, 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
"hi": { "hi": {
"pluralRule-count-one": "i = 0 or n = 1 @integer 0, 1 @decimal 0.0~1.0, 0.00~0.04", "pluralRule-count-one": "i = 0 or n = 1 @integer 0, 1 @decimal 0.0~1.0, 0.00~0.04",
@ -324,8 +324,8 @@
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
"is": { "is": {
"pluralRule-count-one": "t = 0 and i % 10 = 1 and i % 100 != 11 or t != 0 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1~1.6, 10.1, 100.1, 1000.1, …", "pluralRule-count-one": "t = 0 and i % 10 = 1 and i % 100 != 11 or t % 10 = 1 and t % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, … @decimal 0.1, 1.0, 1.1, 2.1, 3.1, 4.1, 5.1, 6.1, 7.1, 10.1, 100.1, 1000.1, …",
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0, 0.2~0.9, 1.2~1.8, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
"it": { "it": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1", "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
@ -494,7 +494,7 @@
}, },
"mo": { "mo": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1", "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
"pluralRule-count-few": "v != 0 or n = 0 or n % 100 = 2..19 @integer 0, 2~16, 102, 1002, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …", "pluralRule-count-few": "v != 0 or n = 0 or n != 1 and n % 100 = 1..19 @integer 0, 2~16, 101, 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …",
"pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, …" "pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, …"
}, },
"mr": { "mr": {
@ -506,7 +506,8 @@
}, },
"mt": { "mt": {
"pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000", "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
"pluralRule-count-few": "n = 0 or n % 100 = 2..10 @integer 0, 2~10, 102~107, 1002, … @decimal 0.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 10.0, 102.0, 1002.0, …", "pluralRule-count-two": "n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000",
"pluralRule-count-few": "n = 0 or n % 100 = 3..10 @integer 0, 3~10, 103~109, 1003, … @decimal 0.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …",
"pluralRule-count-many": "n % 100 = 11..19 @integer 11~19, 111~117, 1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …", "pluralRule-count-many": "n % 100 = 11..19 @integer 11~19, 111~117, 1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …",
"pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
@ -627,7 +628,7 @@
}, },
"ro": { "ro": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1", "pluralRule-count-one": "i = 1 and v = 0 @integer 1",
"pluralRule-count-few": "v != 0 or n = 0 or n % 100 = 2..19 @integer 0, 2~16, 102, 1002, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …", "pluralRule-count-few": "v != 0 or n = 0 or n != 1 and n % 100 = 1..19 @integer 0, 2~16, 101, 1001, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …",
"pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, …" "pluralRule-count-other": " @integer 20~35, 100, 1000, 10000, 100000, 1000000, …"
}, },
"rof": { "rof": {
@ -860,6 +861,11 @@
"pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000", "pluralRule-count-one": "n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000",
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~0.9, 1.1~1.6, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },
"vec": {
"pluralRule-count-one": "i = 1 and v = 0 @integer 1",
"pluralRule-count-many": "e = 0 and i != 0 and i % 1000000 = 0 and v = 0 or e != 0..5 @integer 1000000, 1c6, 2c6, 3c6, 4c6, 5c6, 6c6, … @decimal 1.0000001c6, 1.1c6, 2.0000001c6, 2.1c6, 3.0000001c6, 3.1c6, …",
"pluralRule-count-other": " @integer 0, 2~16, 100, 1000, 10000, 100000, 1c3, 2c3, 3c3, 4c3, 5c3, 6c3, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, 1.0001c3, 1.1c3, 2.0001c3, 2.1c3, 3.0001c3, 3.1c3, …"
},
"vi": { "vi": {
"pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …" "pluralRule-count-other": " @integer 0~15, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …"
}, },

View file

@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased ## Unreleased
## 2.4.3 - 2022-10-26
### Changed
- Replaced `sha1(uniqid())` by `bin2hex(random_bytes(20))`
## 2.4.2 - 2022-10-25
### Fixed
- Fixed erroneous behaviour when combining host and relative path
## 2.4.1 - 2022-08-28 ## 2.4.1 - 2022-08-28
### Fixed ### Fixed
@ -103,7 +115,7 @@ Identical to the RC release.
### Removed ### Removed
- PHP < 7.2 support - PHP < 7.2 support
- All functions in the Guzzle\Psr7 namespace - All functions in the `GuzzleHttp\Psr7` namespace
## 1.8.1 - 2021-03-21 ## 1.8.1 - 2021-03-21

View file

@ -380,10 +380,28 @@ of the header. When a parameter does not contain a value, but just
contains a key, this function will inject a key with a '' string value. contains a key, this function will inject a key with a '' string value.
## `GuzzleHttp\Psr7\Header::normalize` ## `GuzzleHttp\Psr7\Header::splitList`
`public static function splitList(string|string[] $header): string[]`
Splits a HTTP header defined to contain a comma-separated list into
each individual value:
```
$knownEtags = Header::splitList($request->getHeader('if-none-match'));
```
Example headers include `accept`, `cache-control` and `if-none-match`.
## `GuzzleHttp\Psr7\Header::normalize` (deprecated)
`public static function normalize(string|array $header): array` `public static function normalize(string|array $header): array`
`Header::normalize()` is deprecated in favor of [`Header::splitList()`](README.md#guzzlehttppsr7headersplitlist)
which performs the same operation with a cleaned up API and improved
documentation.
Converts an array of header values that may contain comma separated Converts an array of header values that may contain comma separated
headers into an array of headers with no comma separated values. headers into an array of headers with no comma separated values.

View file

@ -62,7 +62,7 @@ final class Header
} }
/** /**
* Splits a HTTP header defined to contain comma-separated list into * Splits a HTTP header defined to contain a comma-separated list into
* each individual value. Empty values will be removed. * each individual value. Empty values will be removed.
* *
* Example headers include 'accept', 'cache-control' and 'if-none-match'. * Example headers include 'accept', 'cache-control' and 'if-none-match'.

View file

@ -34,7 +34,7 @@ final class MultipartStream implements StreamInterface
*/ */
public function __construct(array $elements = [], string $boundary = null) public function __construct(array $elements = [], string $boundary = null)
{ {
$this->boundary = $boundary ?: sha1(uniqid('', true)); $this->boundary = $boundary ?: bin2hex(random_bytes(20));
$this->stream = $this->createStream($elements); $this->stream = $this->createStream($elements);
} }

View file

@ -172,10 +172,14 @@ class Uri implements UriInterface, \JsonSerializable
$uri .= $scheme . ':'; $uri .= $scheme . ':';
} }
if ($authority != ''|| $scheme === 'file') { if ($authority != '' || $scheme === 'file') {
$uri .= '//' . $authority; $uri .= '//' . $authority;
} }
if ($authority != '' && $path != '' && $path[0] != '/') {
$path = '/' . $path;
}
$uri .= $path; $uri .= $path;
if ($query != '') { if ($query != '') {
@ -731,8 +735,6 @@ class Uri implements UriInterface, \JsonSerializable
if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) { if ($this->scheme === '' && false !== strpos(explode('/', $this->path, 2)[0], ':')) {
throw new MalformedUriException('A relative URI must not have a path beginning with a segment containing a colon'); throw new MalformedUriException('A relative URI must not have a path beginning with a segment containing a colon');
} }
} elseif (isset($this->path[0]) && $this->path[0] !== '/') {
throw new MalformedUriException('The path of a URI with an authority must start with a slash "/" or be empty');
} }
} }
} }

View file

@ -1,5 +1,14 @@
<?php <?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
#[Attribute(Attribute::TARGET_CLASS)] #[Attribute(Attribute::TARGET_CLASS)]
final class Attribute final class Attribute
{ {

View file

@ -1,6 +1,15 @@
<?php <?php
if (\PHP_VERSION_ID < 80000 && \extension_loaded('tokenizer')) { /*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
if (\PHP_VERSION_ID < 80000 && extension_loaded('tokenizer')) {
class PhpToken extends Symfony\Polyfill\Php80\PhpToken class PhpToken extends Symfony\Polyfill\Php80\PhpToken
{ {
} }

View file

@ -1,5 +1,14 @@
<?php <?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
if (\PHP_VERSION_ID < 80000) { if (\PHP_VERSION_ID < 80000) {
interface Stringable interface Stringable
{ {

View file

@ -1,5 +1,14 @@
<?php <?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
if (\PHP_VERSION_ID < 80000) { if (\PHP_VERSION_ID < 80000) {
class UnhandledMatchError extends Error class UnhandledMatchError extends Error
{ {

View file

@ -1,5 +1,14 @@
<?php <?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
if (\PHP_VERSION_ID < 80000) { if (\PHP_VERSION_ID < 80000) {
class ValueError extends Error class ValueError extends Error
{ {

View file

@ -30,7 +30,7 @@
"minimum-stability": "dev", "minimum-stability": "dev",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.26-dev" "dev-main": "1.27-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",