Merge branch '3.4' into 4.2

* 3.4:
  SCA: minor code tweaks
  [Intl] Update the ICU data to 64.1
  [Bridge][Twig] DebugCommand - fix escaping and filter
This commit is contained in:
Nicolas Grekas 2019-04-01 09:32:59 +02:00
commit 99684434bc
1031 changed files with 9019 additions and 2923 deletions

View File

@ -78,11 +78,7 @@ class RouterMatchCommandTest extends TestCase
->expects($this->atLeastOnce())
->method('has')
->will($this->returnCallback(function ($id) {
if ('console.command_loader' === $id) {
return false;
}
return true;
return 'console.command_loader' !== $id;
}))
;
$container

View File

@ -13,13 +13,12 @@ namespace Symfony\Component\Cache\Adapter;
use Psr\SimpleCache\CacheInterface;
use Symfony\Component\Cache\PruneableInterface;
use Symfony\Component\Cache\ResettableInterface;
use Symfony\Component\Cache\Traits\ProxyTrait;
/**
* @author Nicolas Grekas <p@tchwork.com>
*/
class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface
{
use ProxyTrait;

View File

@ -35,6 +35,10 @@ trait TesterTrait
*/
public function getDisplay($normalize = false)
{
if (null === $this->output) {
throw new \RuntimeException('Output not initialized, did you execute the command before requesting the display?');
}
rewind($this->output->getStream());
$display = stream_get_contents($this->output->getStream());

View File

@ -34,7 +34,6 @@ final class Dotenv
private $lineno;
private $data;
private $end;
private $state;
private $values;
/**
@ -162,27 +161,27 @@ final class Dotenv
$this->lineno = 1;
$this->cursor = 0;
$this->end = \strlen($this->data);
$this->state = self::STATE_VARNAME;
$state = self::STATE_VARNAME;
$this->values = [];
$name = '';
$this->skipEmptyLines();
while ($this->cursor < $this->end) {
switch ($this->state) {
switch ($state) {
case self::STATE_VARNAME:
$name = $this->lexVarname();
$this->state = self::STATE_VALUE;
$state = self::STATE_VALUE;
break;
case self::STATE_VALUE:
$this->values[$name] = $this->lexValue();
$this->state = self::STATE_VARNAME;
$state = self::STATE_VARNAME;
break;
}
}
if (self::STATE_VALUE === $this->state) {
if (self::STATE_VALUE === $state) {
$this->values[$name] = '';
}

View File

@ -33,7 +33,7 @@ class LocaleTypeTest extends BaseTypeTest
$this->assertContains(new ChoiceView('en', 'en', 'English'), $choices, '', false, false);
$this->assertContains(new ChoiceView('en_GB', 'en_GB', 'English (United Kingdom)'), $choices, '', false, false);
$this->assertContains(new ChoiceView('zh_Hant_MO', 'zh_Hant_MO', 'Chinese (Traditional, Macau SAR China)'), $choices, '', false, false);
$this->assertContains(new ChoiceView('zh_Hant_HK', 'zh_Hant_HK', 'Chinese (Traditional, Hong Kong SAR China)'), $choices, '', false, false);
}
/**

View File

@ -105,7 +105,7 @@ class DebugHandlersListener implements EventSubscriberInterface
if (method_exists($kernel = $event->getKernel(), 'terminateWithException')) {
$request = $event->getRequest();
$hasRun = &$this->hasTerminatedWithException;
$this->exceptionHandler = function (\Exception $e) use ($kernel, $request, &$hasRun) {
$this->exceptionHandler = static function (\Exception $e) use ($kernel, $request, &$hasRun) {
if ($hasRun) {
throw $e;
}

View File

@ -215,7 +215,7 @@ class ResponseCacheStrategy implements ResponseCacheStrategyInterface
}
if (false !== $this->ageDirectives[$directive]) {
$value = $value - $age;
$value -= $age;
$this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value;
}
}

View File

@ -39,6 +39,7 @@ class LanguageDataGenerator extends AbstractDataGenerator
'cs' => 'ces',
'cy' => 'cym',
'de' => 'deu',
'dz' => 'dzo',
'el' => 'ell',
'et' => 'est',
'eu' => 'eus',

View File

@ -235,7 +235,7 @@ final class Intl
*/
public static function getIcuStubVersion()
{
return '63.1';
return '64.1';
}
/**

View File

@ -85,7 +85,9 @@ final class Locale extends \Locale
array_pop($localeSubTags);
return locale_compose($localeSubTags);
$fallback = locale_compose($localeSubTags);
return false !== $fallback ? $fallback : null;
}
if (false !== $pos = strrpos($locale, '_')) {

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.48.17",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.48.22",
"Names": {
"NAD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.39.11",
"Version": "2.1.47.82",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.48.18",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.50",
"Version": "2.1.48.22",
"Names": {
"ADP": [
"ADP",
@ -105,6 +105,10 @@
"BEL",
"فرنك بلجيكي مالي"
],
"BGL": [
"BGL",
"BGL"
],
"BGN": [
"BGN",
"ليف بلغاري"

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"DJF": [
"Fdj",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"ERN": [
"Nfk",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"KMF": [
"CF",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"SDG": [
"SDG",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"SOS": [
"S",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.80",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"GB£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.94",
"Version": "2.1.48.17",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.53",
"Version": "2.1.48.17",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.53",
"Version": "2.1.47.82",
"Names": {
"AZN": [
"₼",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.48.17",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.94",
"Version": "2.1.48.42",
"Names": {
"ADP": [
"ADP",
@ -917,14 +917,6 @@
"щ.д.",
"Щатски долар"
],
"USN": [
"USN",
"USN"
],
"USS": [
"USS",
"USS"
],
"UYI": [
"UYI",
"Уругвайско песо (индекс на инфлацията)"

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.39.11",
"Version": "2.1.47.82",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.36",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.82",
"Names": {
"CNY": [
"¥",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.82",
"Names": {
"CNY": [
"CN¥",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.86",
"Names": {
"ADP": [
"ADP",
@ -45,18 +45,6 @@
"AON",
"kwanza nevez Angola (19902000)"
],
"AOR": [
"AOR",
"AOR"
],
"ARA": [
"ARA",
"ARA"
],
"ARL": [
"ARL",
"ARL"
],
"ARM": [
"ARM",
"peso Arcʼhantina (18811970)"
@ -121,10 +109,6 @@
"BEL",
"BEL"
],
"BGL": [
"BGL",
"BGL"
],
"BGM": [
"BGM",
"lev sokialour Bulgaria"
@ -165,38 +149,10 @@
"BOP",
"peso Bolivia"
],
"BOV": [
"BOV",
"BOV"
],
"BRB": [
"BRB",
"BRB"
],
"BRC": [
"BRC",
"BRC"
],
"BRE": [
"BRE",
"BRE"
],
"BRL": [
"BRL",
"real Brazil"
],
"BRN": [
"BRN",
"BRN"
],
"BRR": [
"BRR",
"BRR"
],
"BRZ": [
"BRZ",
"BRZ"
],
"BSD": [
"BSD",
"dollar Bahamas"
@ -273,10 +229,6 @@
"COP",
"peso Kolombia"
],
"COU": [
"COU",
"COU"
],
"CRC": [
"CRC",
"colón Costa Rica"
@ -285,10 +237,6 @@
"CSD",
"dinar Serbia (20022006)"
],
"CSK": [
"CSK",
"CSK"
],
"CUC": [
"CUC",
"peso kemmadus Kuba"
@ -333,14 +281,6 @@
"DZD",
"dinar Aljeria"
],
"ECS": [
"ECS",
"ECS"
],
"ECV": [
"ECV",
"ECV"
],
"EEK": [
"EEK",
"kurunenn Estonia"
@ -353,10 +293,6 @@
"ERN",
"nakfa Eritrea"
],
"ESA": [
"ESA",
"ESA"
],
"ESB": [
"ESB",
"peseta gemmadus Spagn"
@ -393,18 +329,10 @@
"£ RU",
"lur Breizh-Veur"
],
"GEK": [
"GEK",
"GEK"
],
"GEL": [
"GEL",
"lari Jorjia"
],
"GHC": [
"GHC",
"GHC"
],
"GHS": [
"GHS",
"cedi Ghana"
@ -437,10 +365,6 @@
"GTQ",
"quetzal Guatemala"
],
"GWE": [
"GWE",
"GWE"
],
"GWP": [
"GWP",
"peso Ginea-Bissau"
@ -609,10 +533,6 @@
"LUF",
"lur Luksembourg"
],
"LUL": [
"LUL",
"LUL"
],
"LVL": [
"LVL",
"lats Latvia"
@ -637,10 +557,6 @@
"MCF",
"lur Monaco"
],
"MDC": [
"MDC",
"MDC"
],
"MDL": [
"MDL",
"leu Moldova"
@ -717,10 +633,6 @@
"MXP",
"peso arcʼhant Mecʼhiko (18611992)"
],
"MXV": [
"MXV",
"MXV"
],
"MYR": [
"MYR",
"ringgit Malaysia"
@ -777,10 +689,6 @@
"PAB",
"balboa Panamá"
],
"PEI": [
"PEI",
"PEI"
],
"PEN": [
"PEN",
"sol Perou"
@ -993,10 +901,6 @@
"UAH",
"hryvnia Ukraina"
],
"UAK": [
"UAK",
"UAK"
],
"UGS": [
"UGS",
"shilling Ouganda (19661987)"
@ -1009,18 +913,6 @@
"$ SU",
"dollar SU"
],
"USN": [
"USN",
"USN"
],
"USS": [
"USS",
"USS"
],
"UYI": [
"UYI",
"UYI"
],
"UYP": [
"UYP",
"peso Uruguay (19751993)"
@ -1089,10 +981,6 @@
"CFPF",
"lur CFP"
],
"XRE": [
"XRE",
"XRE"
],
"YDD": [
"YDD",
"dinar Yemen"
@ -1101,10 +989,6 @@
"YER",
"rial Yemen"
],
"YUD": [
"YUD",
"YUD"
],
"YUM": [
"YUM",
"dinar nevez Yougoslavia (19942002)"
@ -1117,10 +1001,6 @@
"YUR",
"dinar adreizhet Yougoslavia (19921993)"
],
"ZAL": [
"ZAL",
"ZAL"
],
"ZAR": [
"ZAR",
"rand Suafrika"
@ -1133,14 +1013,6 @@
"ZMW",
"kwacha Zambia"
],
"ZRN": [
"ZRN",
"ZRN"
],
"ZRZ": [
"ZRZ",
"ZRZ"
],
"ZWD": [
"ZWD",
"dollar Zimbabwe (19802008)"

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.88",
"Version": "2.1.48.17",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.41.34",
"Version": "2.1.48.17",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.48.42",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.39",
"Version": "2.1.47.69",
"Names": {
"FRF": [
"F",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.41.34",
"Version": "2.1.47.82",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.44",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.17",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.48.17",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.42",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.50",
"Version": "2.1.47.86",
"Names": {
"BYN": [
"BYN",
@ -9,6 +9,10 @@
"BYR",
"Weissrussischer Rubel (20002016)"
],
"CHF": [
"CHF",
"Schweizer Franken"
],
"EUR": [
"EUR",
"Euro"

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.39",
"Version": "2.1.47.69",
"Names": {
"EUR": [
"EUR",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.39",
"Version": "2.1.47.69",
"Names": {
"LUF": [
"F",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.41.34",
"Version": "2.1.47.82",
"Names": {
"AED": [
"AED",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.88",
"Version": "2.1.47.82",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.43.65",
"Version": "2.1.49.26",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.91",
"Version": "2.1.48.65",
"Names": {
"ADP": [
"ADP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.18",
"Version": "2.1.47.69",
"Names": {
"BYB": [
"BYB",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"EUR": [
"€",

View File

@ -0,0 +1,9 @@
{
"Version": "2.1.48.67",
"Names": {
"AED": [
"AED",
"United Arab Emirates Dirham"
]
}
}

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.18",
"Version": "2.1.48.43",
"Names": {
"AUD": [
"$",
@ -97,6 +97,10 @@
"UYU",
"Peso Uruguayo"
],
"VES": [
"VES",
"VES"
],
"VND": [
"VND",
"Vietnamese Dong"

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"BBD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.48.22",
"Names": {
"BIF": [
"FBu",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"BMD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"BSD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"BWP": [
"P",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"BZD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.88",
"Version": "2.1.47.86",
"Names": {
"CAD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"AUD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"NZD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"AUD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"DKK": [
"kr.",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"ERN": [
"Nfk",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"FJD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"FKP": [
"£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.18",
"Version": "2.1.47.86",
"Names": {
"SHP": [
"SHP",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GHS": [
"GH₵",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"GB£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GMD": [
"D",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GYD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.18",
"Version": "2.1.49.14",
"Names": {
"VEF": [
"VEF",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.18",
"Version": "2.1.47.69",
"Names": {
"JMD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"KES": [
"Ksh",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"AUD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"KYD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"LRD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"ZAR": [
"R",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"MGA": [
"Ar",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"MOP": [
"MOP$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"XCD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"GBP": [
"GB£",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"MUR": [
"Rs",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.69",
"Names": {
"MWK": [
"MK",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"MYR": [
"RM",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"NAD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"AUD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.48.22",
"Names": {
"NGN": [
"₦",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"VUV": [
"VT",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"AUD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.38.69",
"Version": "2.1.47.70",
"Names": {
"NZD": [
"$",

View File

@ -1,5 +1,5 @@
{
"Version": "2.1.44.88",
"Version": "2.1.47.86",
"Names": {
"NZD": [
"$",

Some files were not shown because too many files have changed in this diff Show More