Merge branch 'PHP-7.2' into PHP-7.3

cmb69 · cmb69 · commit 70239ea1d34b · 2019-04-25T23:29:03.000+02:00
* PHP-7.2:
  Fix #77940: test using outdated mon_thousands_sep for Swedish
diff --git a/ext/standard/tests/strings/bug65769.phpt b/ext/standard/tests/strings/bug65769.phpt
@@ -27,7 +27,7 @@ foreach ($locales as $locale) {
 		$lconv['mon_thousands_sep']
 	);
 	if ($locale === 'Swedish_Sweden.1252') {
-		var_dump(in_array($lconv['mon_thousands_sep'], [',', '�']));
+		var_dump(in_array($lconv['mon_thousands_sep'], ['.', '�']));
 	}
 	echo '++++++++++++++++++++++', "\n";
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ foreach ($locales as $locale) {`
`27`	`27`	`$lconv['mon_thousands_sep']`
`28`	`28`	`);`
`29`	`29`	`if ($locale === 'Swedish_Sweden.1252') {`
`30`		`- var_dump(in_array($lconv['mon_thousands_sep'], [',', ' ']));`
	`30`	`+ var_dump(in_array($lconv['mon_thousands_sep'], ['.', ' ']));`
`31`	`31`	`}`
`32`	`32`	`echo '++++++++++++++++++++++', "\n";`
`33`	`33`	`}`