diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.4 

* 3.4:
  [Config] fix test
  [Intl][3.4] Bump ICU 66.1
  fix import from config file using type: glob
  [DoctrineBridge][DoctrineExtractor] Fix wrong guessed type for "json" type
This commit is contained in:
Nicolas Grekas 2020-03-13 09:01:26 +01:00
parent b913b860c4 148b13cdf0
commit f9b2714efb
1008 changed files with 1018 additions and 1011 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
View File

@ -175,7 +175,6 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
switch ($typeOfField) {
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
case 'json_array':
case self::$useDeprecatedConstants ? false : Types::JSON:
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
@ -290,7 +289,6 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
case 'json_array':
case self::$useDeprecatedConstants ? false : Types::JSON:
return Type::BUILTIN_TYPE_ARRAY;
}

2
src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
View File

@ -221,7 +221,7 @@ class DoctrineExtractorTest extends TestCase
];
if (class_exists(Types::class)) {
$provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
$provider[] = ['json', null];
}
return $provider;

2
src/Symfony/Component/Config/Loader/FileLoader.php
View File

@ -90,7 +90,7 @@ abstract class FileLoader extends Loader
$ret = [];
$isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/');
foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath, false, $excluded) as $path => $info) {
if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) {
if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) {
$ret[] = $res;
}
$isSubpath = true;

3
src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
View File

@ -42,6 +42,7 @@ class XmlUtilsTest extends TestCase
XmlUtils::loadFile($fixtures.'not_readable.xml');
$this->fail();
} catch (\InvalidArgumentException $e) {
chmod($fixtures.'not_readable.xml', 0644);
$this->assertStringContainsString('is not readable', $e->getMessage());
}
@ -49,7 +50,7 @@ class XmlUtilsTest extends TestCase
XmlUtils::loadFile($fixtures.'invalid.xml');
$this->fail();
} catch (\InvalidArgumentException $e) {
$this->assertStringContainsString('ERROR 77', $e->getMessage());
$this->assertStringContainsString('ERROR ', $e->getMessage());
}
try {

2
src/Symfony/Component/Intl/Intl.php
View File

@ -256,7 +256,7 @@ final class Intl
*/
public static function getIcuStubVersion(): string
{
return '65.1';
return '66.1';
}
/**

2
src/Symfony/Component/Intl/Resources/data/currencies/af.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NAD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/ak.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/am.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_DJ.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"DJF": [
"Fdj",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_ER.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ERN": [
"Nfk",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_KM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"KMF": [
"CF",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_LB.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"SDG": [
"SDG",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_SO.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"SOS": [
"S",

2
src/Symfony/Component/Intl/Resources/data/currencies/ar_SS.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"GB£",

2
src/Symfony/Component/Intl/Resources/data/currencies/as.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/az.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/az_Cyrl.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AZN": [
"₼",

2
src/Symfony/Component/Intl/Resources/data/currencies/be.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/bg.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/bm.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/bn.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/bo.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"CNY": [
"¥",

2
src/Symfony/Component/Intl/Resources/data/currencies/bo_IN.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"CNY": [
"CN¥",

2
src/Symfony/Component/Intl/Resources/data/currencies/br.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/bs.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/bs_Cyrl.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/ca.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/ca_FR.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"FRF": [
"F",

2
src/Symfony/Component/Intl/Resources/data/currencies/ce.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/cs.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/cy.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/da.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/de.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/de_CH.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BYN": [
"BYN",

2
src/Symfony/Component/Intl/Resources/data/currencies/de_LI.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"EUR": [
"EUR",

2
src/Symfony/Component/Intl/Resources/data/currencies/de_LU.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"LUF": [
"F",

2
src/Symfony/Component/Intl/Resources/data/currencies/dz.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/ee.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/el.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/en.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ADP": [
"ADP",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_001.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BYB": [
"BYB",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_150.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"EUR": [
"€",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_AE.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_AG.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_AI.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_AU.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AED": [
"AED",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BB.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BBD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BI.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BIF": [
"FBu",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BMD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BS.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BSD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BW.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BWP": [
"P",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_BZ.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"BZD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_CA.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"CAD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_CC.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AUD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_CK.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NZD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_CX.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AUD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_DK.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"DKK": [
"kr.",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_DM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_ER.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ERN": [
"Nfk",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_FJ.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"FJD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_FK.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"FKP": [
"£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GD.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GG.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GH.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GHS": [
"GH₵",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GI.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"GB£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GMD": [
"D",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_GY.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GYD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_IM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_IN.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"VEF": [
"VEF",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_JE.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_JM.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"JMD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_KE.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"KES": [
"Ksh",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_KI.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AUD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_KN.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_KY.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"KYD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_LC.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_LR.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"LRD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_LS.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"ZAR": [
"R",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MG.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"MGA": [
"Ar",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MO.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"MOP": [
"MOP$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MS.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"XCD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MT.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"GBP": [
"GB£",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MU.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"MUR": [
"Rs",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MW.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"MWK": [
"MK",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_MY.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"MYR": [
"RM",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NA.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NAD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NF.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AUD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NG.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NGN": [
"₦",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NH.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"VUV": [
"VT",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NR.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"AUD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NU.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NZD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_NZ.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NZD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_PG.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"PGK": [
"K",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_PH.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"PHP": [
"₱",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_PK.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"PKR": [
"Rs",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_PN.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"NZD": [
"$",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_RW.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"RWF": [
"RF",

2
src/Symfony/Component/Intl/Resources/data/currencies/en_SB.json
View File

@ -1,5 +1,5 @@
{
"Version": "36",
"Version": "36.1",
"Names": {
"SBD": [
"$",

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