Skip to content
Permalink
Browse files

Merge branch '3.4' into 4.3

* 3.4:
  [Intl] Update the ICU data to 65.1
  [VarDumper] fix dumping uninitialized SplFileInfo
  Added missing translations.
  Fixed invalid VarDumper upgrade doc.
  [HttpFoundation] Check if data passed to SessionBagProxy::initialize is an array
  Don't let falsey usernames slip through
  • Loading branch information...
nicolas-grekas committed Oct 4, 2019
2 parents ede6b49 + 14d0e27 commit 1d0a0774ab5fca96e594dfd25d983d660f1a8c0c
Showing 897 changed files with 6,253 additions and 3,644 deletions.
@@ -924,7 +924,7 @@ Validator
VarDumper
---------

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

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

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

Before:
@@ -458,7 +458,7 @@ protected function loadSession(array &$session = null)
foreach ($bags as $bag) {
$key = $bag->getStorageKey();
$session[$key] = isset($session[$key]) ? $session[$key] : [];
$session[$key] = isset($session[$key]) && \is_array($session[$key]) ? $session[$key] : [];
$bag->initialize($session[$key]);
}
@@ -256,7 +256,7 @@ public static function getIcuDataVersion()
*/
public static function getIcuStubVersion()
{
return '64.2';
return '65.1';
}
/**
@@ -1,9 +1,9 @@
{
"Version": "2.1.48.17",
"Version": "36",
"Names": {
"AED": [
"AED",
"Verenigde Arabiese Emirate dirham"
"Verenigde Arabiese Emirate-dirham"
],
"AFN": [
"AFN",
@@ -91,11 +91,11 @@
],
"BWP": [
"BWP",
"Botswana pula"
"Botswana-pula"
],
"BYN": [
"BYN",
"Belo-Russiese roebel"
"Belarusiese roebel"
],
"BYR": [
"BYR",
@@ -106,7 +106,7 @@
"Beliziese dollar"
],
"CAD": [
"CA$",
"CAD",
"Kanadese dollar"
],
"CDF": [
@@ -123,11 +123,11 @@
],
"CNH": [
"CNH",
"Chinese joean"
"Chinese joean (buiteland)"
],
"CNY": [
"CN¥",
"Sjinese joean renminbi"
"Chinese joean"
],
"COP": [
"COP",
@@ -155,7 +155,7 @@
],
"DJF": [
"DJF",
"Djiboeti frank"
"Djiboeti-frank"
],
"DKK": [
"DKK",
@@ -191,7 +191,7 @@
],
"FKP": [
"FKP",
"Falkland-eilande pond"
"Falkland-eilandse pond"
],
"GBP": [
"£",
@@ -235,7 +235,7 @@
],
"HKD": [
"HK$",
"Hong Kong dollar"
"Hongkongse dollar"
],
"HNL": [
"HNL",
@@ -323,7 +323,7 @@
],
"KYD": [
"KYD",
"Cayman-eilande dollar"
"Cayman-eilandse dollar"
],
"KZT": [
"KZT",
@@ -335,7 +335,7 @@
],
"LBP": [
"LBP",
"Lebanese pond"
"Libanese pond"
],
"LKR": [
"LKR",
@@ -399,7 +399,7 @@
],
"MUR": [
"MUR",
"Mauritiaanse rupee"
"Mauritiaanse roepee"
],
"MVR": [
"MVR",
@@ -447,7 +447,7 @@
],
"NZD": [
"NZ$",
"Nieu-Seeland dollar"
"Nieu-Seelandse dollar"
],
"OMR": [
"OMR",
@@ -491,27 +491,27 @@
],
"RSD": [
"RSD",
"Serbiese dinar"
"Serwiese dinar"
],
"RUB": [
"RUB",
"Russiese roebel"
],
"RWF": [
"RWF",
"Rwandiese frank"
"Rwandese frank"
],
"SAR": [
"SAR",
"Saoedi-Arabiese riyal"
],
"SBD": [
"SBD",
"Salomonseilande dollar"
"Salomonseilandse dollar"
],
"SCR": [
"SCR",
"Seychellese rupee"
"Seychellese roepee"
],
"SDG": [
"SDG",
@@ -527,11 +527,11 @@
],
"SGD": [
"SGD",
"Singapoer dollar"
"Singapoer-dollar"
],
"SHP": [
"SHP",
"Sint Helena pond"
"Sint Helena-pond"
],
"SLL": [
"SLL",
@@ -555,7 +555,7 @@
],
"STN": [
"STN",
"São Tomé en Príncipe dobra"
"São Tomé en Príncipe-dobra"
],
"SYP": [
"SYP",
@@ -571,7 +571,7 @@
],
"TJS": [
"TJS",
"Tadjikse roebel"
"Tadjikse somoni"
],
"TMT": [
"TMT",
@@ -591,11 +591,11 @@
],
"TRY": [
"TRY",
"Turkse lier"
"Turkse lira"
],
"TTD": [
"TTD",
"Trinidad en Tobago dollar"
"Trinidad en Tobago-dollar"
],
"TWD": [
"NT$",
@@ -614,8 +614,8 @@
"Ugandese sjieling"
],
"USD": [
"US$",
"Amerikaanse dollar"
"USD",
"VSA-dollar"
],
"UYU": [
"UYU",
@@ -631,7 +631,7 @@
],
"VES": [
"VES",
"Venezolaanse Bolívar"
"Venezolaanse bolívar"
],
"VND": [
"",
@@ -647,15 +647,15 @@
],
"XAF": [
"FCFA",
"CFA frank BEAC"
"Sentraal Afrikaanse CFA-frank"
],
"XCD": [
"EC$",
"Oos-Karibbiese dollar"
"Oos-Karibiese dollar"
],
"XOF": [
"CFA",
"CFA frank BCEAO"
"Wes-Afrikaanse CFA-frank"
],
"XPF": [
"CFPF",
@@ -1,5 +1,5 @@
{
"Version": "2.1.48.22",
"Version": "36",
"Names": {
"NAD": [
"$",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.82",
"Version": "36",
"Names": {
"AED": [
"AED",
@@ -1,5 +1,5 @@
{
"Version": "2.1.49.82",
"Version": "36",
"Names": {
"AED": [
"AED",
@@ -1,5 +1,5 @@
{
"Version": "2.1.49.82",
"Version": "36",
"Names": {
"ADP": [
"ADP",
@@ -105,10 +105,6 @@
"BEL",
"فرنك بلجيكي مالي"
],
"BGL": [
"BGL",
"BGL"
],
"BGN": [
"BGN",
"ليف بلغاري"
@@ -314,7 +310,7 @@
"فرنك فرنسي"
],
"GBP": [
"£",
"UK£",
"جنيه إسترليني"
],
"GEL": [
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"DJF": [
"Fdj",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"ERN": [
"Nfk",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"KMF": [
"CF",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"SDG": [
"SDG",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"SOS": [
"S",
@@ -1,5 +1,5 @@
{
"Version": "2.1.47.69",
"Version": "36",
"Names": {
"GBP": [
"GB£",
@@ -1,5 +1,5 @@
{
"Version": "2.1.48.17",
"Version": "36",
"Names": {
"AED": [
"AED",

0 comments on commit 1d0a077

Please sign in to comment.
You can’t perform that action at this time.