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
commit f9b2714efb
1008 changed files with 1018 additions and 1011 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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