Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit f9b2714

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
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
2 parents b913b86 + 148b13c commit f9b2714
Copy full SHA for f9b2714

1,008 files changed

+1,018-1,011Lines changed: 1018 additions & 1011 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ public function getTypes($class, $property, array $context = [])
175175
switch ($typeOfField) {
176176
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
177177
case 'json_array':
178-
case self::$useDeprecatedConstants ? false : Types::JSON:
179178
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
180179

181180
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
@@ -290,7 +289,6 @@ private function getPhpType(string $doctrineType): ?string
290289
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
291290
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
292291
case 'json_array':
293-
case self::$useDeprecatedConstants ? false : Types::JSON:
294292
return Type::BUILTIN_TYPE_ARRAY;
295293
}
296294

Collapse file

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public function typesProvider()
221221
];
222222

223223
if (class_exists(Types::class)) {
224-
$provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
224+
$provider[] = ['json', null];
225225
}
226226

227227
return $provider;
Collapse file

‎src/Symfony/Component/Config/Loader/FileLoader.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Loader/FileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
9090
$ret = [];
9191
$isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/');
9292
foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath, false, $excluded) as $path => $info) {
93-
if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) {
93+
if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) {
9494
$ret[] = $res;
9595
}
9696
$isSubpath = true;
Collapse file

‎src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Tests/Util/XmlUtilsTest.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,15 @@ public function testLoadFile()
4242
XmlUtils::loadFile($fixtures.'not_readable.xml');
4343
$this->fail();
4444
} catch (\InvalidArgumentException $e) {
45+
chmod($fixtures.'not_readable.xml', 0644);
4546
$this->assertStringContainsString('is not readable', $e->getMessage());
4647
}
4748

4849
try {
4950
XmlUtils::loadFile($fixtures.'invalid.xml');
5051
$this->fail();
5152
} catch (\InvalidArgumentException $e) {
52-
$this->assertStringContainsString('ERROR 77', $e->getMessage());
53+
$this->assertStringContainsString('ERROR ', $e->getMessage());
5354
}
5455

5556
try {
Collapse file

‎src/Symfony/Component/Intl/Intl.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Intl.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public static function getIcuDataVersion(): string
256256
*/
257257
public static function getIcuStubVersion(): string
258258
{
259-
return '65.1';
259+
return '66.1';
260260
}
261261

262262
/**
Collapse file

‎src/Symfony/Component/Intl/Resources/data/currencies/af.json‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/af.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "36",
2+
"Version": "36.1",
33
"Names": {
44
"AED": [
55
"AED",
Collapse file

‎src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/af_NA.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "36",
2+
"Version": "36.1",
33
"Names": {
44
"NAD": [
55
"$",
Collapse file

‎src/Symfony/Component/Intl/Resources/data/currencies/ak.json‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ak.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "36",
2+
"Version": "36.1",
33
"Names": {
44
"AED": [
55
"AED",
Collapse file

‎src/Symfony/Component/Intl/Resources/data/currencies/am.json‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/am.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "36",
2+
"Version": "36.1",
33
"Names": {
44
"AED": [
55
"AED",
Collapse file

‎src/Symfony/Component/Intl/Resources/data/currencies/ar.json‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/Intl/Resources/data/currencies/ar.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Version": "36",
2+
"Version": "36.1",
33
"Names": {
44
"ADP": [
55
"ADP",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.