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 14c95a9

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.0'
* 5.0: [Config] fix test [HttpClient] disable debug log with curl 7.64.0 [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 d108f7b + 381c2e8 commit 14c95a9
Copy full SHA for 14c95a9

1,010 files changed

+1,026-1,015Lines changed: 1026 additions & 1015 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
@@ -163,7 +163,6 @@ public function getTypes(string $class, string $property, array $context = [])
163163
switch ($typeOfField) {
164164
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
165165
case 'json_array':
166-
case self::$useDeprecatedConstants ? false : Types::JSON:
167166
return [new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true)];
168167

169168
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
@@ -278,7 +277,6 @@ private function getPhpType(string $doctrineType): ?string
278277
case self::$useDeprecatedConstants ? DBALType::TARRAY : Types::ARRAY:
279278
case self::$useDeprecatedConstants ? DBALType::SIMPLE_ARRAY : Types::SIMPLE_ARRAY:
280279
case 'json_array':
281-
case self::$useDeprecatedConstants ? false : Types::JSON:
282280
return Type::BUILTIN_TYPE_ARRAY;
283281
}
284282

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
@@ -178,7 +178,7 @@ public function typesProvider()
178178
];
179179

180180
if (class_exists(Types::class)) {
181-
$provider[] = ['json', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)]];
181+
$provider[] = ['json', null];
182182
}
183183

184184
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
@@ -83,7 +83,7 @@ public function import($resource, string $type = null, bool $ignoreErrors = fals
8383
$ret = [];
8484
$isSubpath = 0 !== $i && false !== strpos(substr($resource, 0, $i), '/');
8585
foreach ($this->glob($resource, false, $_, $ignoreErrors || !$isSubpath, false, $excluded) as $path => $info) {
86-
if (null !== $res = $this->doImport($path, $type, $ignoreErrors, $sourceResource)) {
86+
if (null !== $res = $this->doImport($path, 'glob' === $type ? null : $type, $ignoreErrors, $sourceResource)) {
8787
$ret[] = $res;
8888
}
8989
$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/HttpClient/CurlHttpClient.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/CurlHttpClient.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ public function request(string $method, string $url, array $options = []): Respo
308308
}
309309
}
310310

311-
return $pushedResponse ?? new CurlResponse($this->multi, $ch, $options, $this->logger, $method, self::createRedirectResolver($options, $host));
311+
return $pushedResponse ?? new CurlResponse($this->multi, $ch, $options, $this->logger, $method, self::createRedirectResolver($options, $host), self::$curlVersion['version_number']);
312312
}
313313

314314
/**
Collapse file

‎src/Symfony/Component/HttpClient/Response/CurlResponse.php‎

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/CurlResponse.php
+7-3Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,19 @@ final class CurlResponse implements ResponseInterface
3737
/**
3838
* @internal
3939
*/
40-
public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null)
40+
public function __construct(CurlClientState $multi, $ch, array $options = null, LoggerInterface $logger = null, string $method = 'GET', callable $resolveRedirect = null, int $curlVersion = null)
4141
{
4242
$this->multi = $multi;
4343

4444
if (\is_resource($ch)) {
4545
$this->handle = $ch;
4646
$this->debugBuffer = fopen('php://temp', 'w+');
47-
curl_setopt($ch, CURLOPT_VERBOSE, true);
48-
curl_setopt($ch, CURLOPT_STDERR, $this->debugBuffer);
47+
if (0x074000 === $curlVersion) {
48+
fwrite($this->debugBuffer, 'Due to a bug in curl 7.64.0, the debug log is disabled; use another version to work around the issue.');
49+
} else {
50+
curl_setopt($ch, CURLOPT_VERBOSE, true);
51+
curl_setopt($ch, CURLOPT_STDERR, $this->debugBuffer);
52+
}
4953
} else {
5054
$this->info['url'] = $ch;
5155
$ch = $this->handle;
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
@@ -125,7 +125,7 @@ public static function getIcuDataVersion(): string
125125
*/
126126
public static function getIcuStubVersion(): string
127127
{
128-
return '65.1';
128+
return '66.1';
129129
}
130130

131131
/**
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",

0 commit comments

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