Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2044ba8

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: [Intl] Update the ICU data to 65.1 (4.3 branch) Replace deprecated calls in tests [Intl] Update the ICU data to 65.1 Delete 5_Security_issue.md [DI] Whitelist validator.auto_mapper in UnusedTagsPass [HttpClient] Fixed #33832 NO_PROXY option ignored in NativeHttpClient::request() method [Cache] give 100ms before starting the expiration countdown [Cache] fix logger usage in CacheTrait::doGet() [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. Fixed invalid changelog 4.0.0 for VarDumper Fixed invalid VarDumper upgrade doc. [HttpFoundation] Check if data passed to SessionBagProxy::initialize is an array Don't let falsey usernames slip through
2 parents 80f545b + 2e92ffe commit 2044ba8

File tree

1,143 files changed

+9292
-6632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,143 files changed

+9292
-6632
lines changed

‎.github/ISSUE_TEMPLATE/5_Security_issue.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎UPGRADE-4.0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ Validator
924924
VarDumper
925925
---------
926926

927-
* The `VarDumperTestTrait::assertDumpEquals()` method expects a 3rd `$context = null`
927+
* The `VarDumperTestTrait::assertDumpEquals()` method expects a 3rd `$filter = 0`
928928
argument and moves `$message = ''` argument at 4th position.
929929

930930
Before:
@@ -939,7 +939,7 @@ VarDumper
939939
VarDumperTestTrait::assertDumpEquals($dump, $data, $filter = 0, $message = '');
940940
```
941941

942-
* The `VarDumperTestTrait::assertDumpMatchesFormat()` method expects a 3rd `$context = null`
942+
* The `VarDumperTestTrait::assertDumpMatchesFormat()` method expects a 3rd `$filter = 0`
943943
argument and moves `$message = ''` argument at 4th position.
944944

945945
Before:

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class UnusedTagsPass implements CompilerPassInterface
6565
'twig.loader',
6666
'validator.constraint_validator',
6767
'validator.initializer',
68+
'validator.auto_mapper',
6869
];
6970

7071
public function process(ContainerBuilder $container)

‎src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ static function ($deferred, $namespace, &$expiredIds) use ($getId) {
7676
$key = (string) $key;
7777
if (null === $item->expiry) {
7878
$ttl = 0 < $item->defaultLifetime ? $item->defaultLifetime : 0;
79-
} elseif (0 >= $ttl = (int) ($item->expiry - $now)) {
79+
} elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
8080
$expiredIds[] = $getId($key);
8181
continue;
8282
}
8383
if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
8484
unset($metadata[CacheItem::METADATA_TAGS]);
8585
}
8686
// For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
87-
$byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
87+
$byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
8888
}
8989

9090
return $byLifetime;

‎src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {
8181
$key = (string) $key;
8282
if (null === $item->expiry) {
8383
$ttl = 0 < $item->defaultLifetime ? $item->defaultLifetime : 0;
84-
} elseif (0 >= $ttl = (int) ($item->expiry - $now)) {
84+
} elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
8585
$expiredIds[] = $getId($key);
8686
continue;
8787
}
@@ -95,7 +95,7 @@ static function ($deferred, &$expiredIds) use ($getId, $tagPrefix) {
9595

9696
if ($metadata) {
9797
// For compactness, expiry and creation duration are packed, using magic numbers as separators
98-
$value['meta'] = pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME]);
98+
$value['meta'] = pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME]);
9999
}
100100

101101
// Extract tag changes, these should be removed from values in doSave()

‎src/Symfony/Component/Cache/Adapter/ProxyAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static function (CacheItemInterface $innerItem, array $item) {
8484
}
8585
if ($metadata) {
8686
// For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
87-
$item["\0*\0value"] = ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - CacheItem::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
87+
$item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
8888
}
8989
$innerItem->set($item["\0*\0value"]);
9090
$innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6f', $item["\0*\0expiry"])) : null);

‎src/Symfony/Component/Cache/Psr16Cache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public function getMultiple($keys, $default = null)
177177
unset($metadata[CacheItem::METADATA_TAGS]);
178178

179179
if ($metadata) {
180-
$values[$key] = ["\x9D".pack('VN', (int) $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET, $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
180+
$values[$key] = ["\x9D".pack('VN', (int) (0.1 + $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
181181
}
182182
}
183183

‎src/Symfony/Component/Cache/Tests/Adapter/AdapterTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testGetMetadata()
109109
$cache->deleteItem('foo');
110110
$cache->get('foo', function ($item) {
111111
$item->expiresAfter(10);
112-
sleep(1);
112+
usleep(999000);
113113

114114
return 'bar';
115115
});

‎src/Symfony/Component/Cache/Traits/ContractsTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function doGet(AdapterInterface $pool, string $key, callable $callback,
6161
static function (CacheItem $item, float $startTime, ?array &$metadata) {
6262
if ($item->expiry > $endTime = microtime(true)) {
6363
$item->newMetadata[CacheItem::METADATA_EXPIRY] = $metadata[CacheItem::METADATA_EXPIRY] = $item->expiry;
64-
$item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = 1000 * (int) ($endTime - $startTime);
64+
$item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = (int) ceil(1000 * ($endTime - $startTime));
6565
} else {
6666
unset($metadata[CacheItem::METADATA_EXPIRY], $metadata[CacheItem::METADATA_CTIME]);
6767
}

‎src/Symfony/Component/HttpClient/NativeHttpClient.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function request(string $method, string $url, array $options = []): Respo
221221
];
222222

223223
$proxy = self::getProxy($options['proxy'], $url);
224-
$noProxy = $_SERVER['no_proxy'] ?? $_SERVER['NO_PROXY'] ?? '';
224+
$noProxy = $options['no_proxy'] ?? $_SERVER['no_proxy'] ?? $_SERVER['NO_PROXY'] ?? '';
225225
$noProxy = $noProxy ? preg_split('/[\s,]+/', $noProxy) : [];
226226

227227
$resolveRedirect = self::createRedirectResolver($options, $host, $proxy, $noProxy, $info, $onProgress);

‎src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ protected function loadSession(array &$session = null)
456456

457457
foreach ($bags as $bag) {
458458
$key = $bag->getStorageKey();
459-
$session[$key] = isset($session[$key]) ? $session[$key] : [];
459+
$session[$key] = isset($session[$key]) && \is_array($session[$key]) ? $session[$key] : [];
460460
$bag->initialize($session[$key]);
461461
}
462462

‎src/Symfony/Component/Intl/Intl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public static function getIcuDataVersion(): string
256256
*/
257257
public static function getIcuStubVersion(): string
258258
{
259-
return '64.2';
259+
return '65.1';
260260
}
261261

262262
/**

‎src/Symfony/Component/Intl/Resources/data/currencies/af.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"Version": "2.1.48.17",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",
6-
"Verenigde Arabiese Emirate dirham"
6+
"Verenigde Arabiese Emirate-dirham"
77
],
88
"AFN": [
99
"AFN",
@@ -91,11 +91,11 @@
9191
],
9292
"BWP": [
9393
"BWP",
94-
"Botswana pula"
94+
"Botswana-pula"
9595
],
9696
"BYN": [
9797
"BYN",
98-
"Belo-Russiese roebel"
98+
"Belarusiese roebel"
9999
],
100100
"BYR": [
101101
"BYR",
@@ -106,7 +106,7 @@
106106
"Beliziese dollar"
107107
],
108108
"CAD": [
109-
"CA$",
109+
"CAD",
110110
"Kanadese dollar"
111111
],
112112
"CDF": [
@@ -123,11 +123,11 @@
123123
],
124124
"CNH": [
125125
"CNH",
126-
"Chinese joean"
126+
"Chinese joean (buiteland)"
127127
],
128128
"CNY": [
129129
"CN¥",
130-
"Sjinese joean renminbi"
130+
"Chinese joean"
131131
],
132132
"COP": [
133133
"COP",
@@ -155,7 +155,7 @@
155155
],
156156
"DJF": [
157157
"DJF",
158-
"Djiboeti frank"
158+
"Djiboeti-frank"
159159
],
160160
"DKK": [
161161
"DKK",
@@ -191,7 +191,7 @@
191191
],
192192
"FKP": [
193193
"FKP",
194-
"Falkland-eilande pond"
194+
"Falkland-eilandse pond"
195195
],
196196
"GBP": [
197197
"£",
@@ -235,7 +235,7 @@
235235
],
236236
"HKD": [
237237
"HK$",
238-
"Hong Kong dollar"
238+
"Hongkongse dollar"
239239
],
240240
"HNL": [
241241
"HNL",
@@ -323,7 +323,7 @@
323323
],
324324
"KYD": [
325325
"KYD",
326-
"Cayman-eilande dollar"
326+
"Cayman-eilandse dollar"
327327
],
328328
"KZT": [
329329
"KZT",
@@ -335,7 +335,7 @@
335335
],
336336
"LBP": [
337337
"LBP",
338-
"Lebanese pond"
338+
"Libanese pond"
339339
],
340340
"LKR": [
341341
"LKR",
@@ -399,7 +399,7 @@
399399
],
400400
"MUR": [
401401
"MUR",
402-
"Mauritiaanse rupee"
402+
"Mauritiaanse roepee"
403403
],
404404
"MVR": [
405405
"MVR",
@@ -447,7 +447,7 @@
447447
],
448448
"NZD": [
449449
"NZ$",
450-
"Nieu-Seeland dollar"
450+
"Nieu-Seelandse dollar"
451451
],
452452
"OMR": [
453453
"OMR",
@@ -491,27 +491,27 @@
491491
],
492492
"RSD": [
493493
"RSD",
494-
"Serbiese dinar"
494+
"Serwiese dinar"
495495
],
496496
"RUB": [
497497
"RUB",
498498
"Russiese roebel"
499499
],
500500
"RWF": [
501501
"RWF",
502-
"Rwandiese frank"
502+
"Rwandese frank"
503503
],
504504
"SAR": [
505505
"SAR",
506506
"Saoedi-Arabiese riyal"
507507
],
508508
"SBD": [
509509
"SBD",
510-
"Salomonseilande dollar"
510+
"Salomonseilandse dollar"
511511
],
512512
"SCR": [
513513
"SCR",
514-
"Seychellese rupee"
514+
"Seychellese roepee"
515515
],
516516
"SDG": [
517517
"SDG",
@@ -527,11 +527,11 @@
527527
],
528528
"SGD": [
529529
"SGD",
530-
"Singapoer dollar"
530+
"Singapoer-dollar"
531531
],
532532
"SHP": [
533533
"SHP",
534-
"Sint Helena pond"
534+
"Sint Helena-pond"
535535
],
536536
"SLL": [
537537
"SLL",
@@ -555,7 +555,7 @@
555555
],
556556
"STN": [
557557
"STN",
558-
"São Tomé en Príncipe dobra"
558+
"São Tomé en Príncipe-dobra"
559559
],
560560
"SYP": [
561561
"SYP",
@@ -571,7 +571,7 @@
571571
],
572572
"TJS": [
573573
"TJS",
574-
"Tadjikse roebel"
574+
"Tadjikse somoni"
575575
],
576576
"TMT": [
577577
"TMT",
@@ -591,11 +591,11 @@
591591
],
592592
"TRY": [
593593
"TRY",
594-
"Turkse lier"
594+
"Turkse lira"
595595
],
596596
"TTD": [
597597
"TTD",
598-
"Trinidad en Tobago dollar"
598+
"Trinidad en Tobago-dollar"
599599
],
600600
"TWD": [
601601
"NT$",
@@ -614,8 +614,8 @@
614614
"Ugandese sjieling"
615615
],
616616
"USD": [
617-
"US$",
618-
"Amerikaanse dollar"
617+
"USD",
618+
"VSA-dollar"
619619
],
620620
"UYU": [
621621
"UYU",
@@ -631,7 +631,7 @@
631631
],
632632
"VES": [
633633
"VES",
634-
"Venezolaanse Bolívar"
634+
"Venezolaanse bolívar"
635635
],
636636
"VND": [
637637
"₫",
@@ -647,15 +647,15 @@
647647
],
648648
"XAF": [
649649
"FCFA",
650-
"CFA frank BEAC"
650+
"Sentraal Afrikaanse CFA-frank"
651651
],
652652
"XCD": [
653653
"EC$",
654-
"Oos-Karibbiese dollar"
654+
"Oos-Karibiese dollar"
655655
],
656656
"XOF": [
657657
"CFA",
658-
"CFA frank BCEAO"
658+
"Wes-Afrikaanse CFA-frank"
659659
],
660660
"XPF": [
661661
"CFPF",

‎src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.48.22",
2+
"Version": "36",
33
"Names": {
44
"NAD": [
55
"$",

‎src/Symfony/Component/Intl/Resources/data/currencies/ak.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.47.82",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",

‎src/Symfony/Component/Intl/Resources/data/currencies/am.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "2.1.49.82",
2+
"Version": "36",
33
"Names": {
44
"AED": [
55
"AED",

0 commit comments

Comments
 (0)