Skip to content

Commit ddebd80

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '7.1' into 7.2
* 7.1: [DoctrineBridge] Fix Connection::createSchemaManager() for Doctrine DBAL v2 [HttpClient] Various cleanups after recent changes do not add child nodes to EmptyNode instances consider write property visibility to decide whether a property is writable add comment explaining why HttpClient tests are run separately silence warnings issued by Redis Sentinel on connection issues
2 parents f642d67 + b7795cc commit ddebd80

File tree

17 files changed

+104
-84
lines changed

17 files changed

+104
-84
lines changed

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ jobs:
111111
Remove-Item -Path src\Symfony\Bridge\PhpUnit -Recurse
112112
mv src\Symfony\Component\HttpClient\phpunit.xml.dist src\Symfony\Component\HttpClient\phpunit.xml
113113
php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
114+
# HttpClient tests need to run separately, they block when run with other components' tests concurrently
114115
php phpunit src\Symfony\Component\HttpClient || ($x = 1)
115116
116117
exit $x
@@ -124,6 +125,7 @@ jobs:
124125
125126
Copy c:\php\php.ini-max c:\php\php.ini
126127
php phpunit src\Symfony --exclude-group tty,benchmark,intl-data,network,transient-on-windows || ($x = 1)
128+
# HttpClient tests need to run separately, they block when run with other components' tests concurrently
127129
php phpunit src\Symfony\Component\HttpClient || ($x = 1)
128130
129131
exit $x

‎src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ abstract public function postGenerateSchema(GenerateSchemaEventArgs $event): voi
2424
protected function getIsSameDatabaseChecker(Connection $connection): \Closure
2525
{
2626
return static function (\Closure $exec) use ($connection): bool {
27-
$schemaManager = $connection->createSchemaManager();
28-
27+
$schemaManager = method_exists($connection, 'createSchemaManager') ? $connection->createSchemaManager() : $connection->getSchemaManager();
2928
$checkTable = 'schema_subscriber_check_'.bin2hex(random_bytes(7));
3029
$table = new Table($checkTable);
3130
$table->addColumn('id', Types::INTEGER)

‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Bridge\Twig\Node\TransNode;
1616
use Twig\Environment;
1717
use Twig\Node\BlockNode;
18+
use Twig\Node\EmptyNode;
1819
use Twig\Node\Expression\ArrayExpression;
1920
use Twig\Node\Expression\AssignNameExpression;
2021
use Twig\Node\Expression\ConstantExpression;
@@ -75,6 +76,12 @@ public function enterNode(Node $node, Environment $env): Node
7576

7677
if ($node instanceof FilterExpression && 'trans' === ($node->hasAttribute('twig_callable') ? $node->getAttribute('twig_callable')->getName() : $node->getNode('filter')->getAttribute('value'))) {
7778
$arguments = $node->getNode('arguments');
79+
80+
if ($arguments instanceof EmptyNode) {
81+
$arguments = new Nodes();
82+
$node->setNode('arguments', $arguments);
83+
}
84+
7885
if ($this->isNamedArguments($arguments)) {
7986
if (!$arguments->hasNode('domain') && !$arguments->hasNode(1)) {
8087
$arguments->setNode('domain', $this->scope->get('domain'));

‎src/Symfony/Component/HttpClient/CurlHttpClient.php‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,8 @@ private static function createRedirectResolver(array $options, string $host, int
417417
}
418418
}
419419

420-
return static function ($ch, string $location, bool $noContent, bool &$locationHasHost) use (&$redirectHeaders, $options) {
420+
return static function ($ch, string $location, bool $noContent) use (&$redirectHeaders, $options) {
421421
try {
422-
$locationHasHost = false;
423422
$location = self::parseUrl($location);
424423
$url = self::parseUrl(curl_getinfo($ch, \CURLINFO_EFFECTIVE_URL));
425424
$url = self::resolveUrl($location, $url);
@@ -433,9 +432,7 @@ private static function createRedirectResolver(array $options, string $host, int
433432
$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
434433
}
435434

436-
$locationHasHost = isset($location['authority']);
437-
438-
if ($redirectHeaders && $locationHasHost) {
435+
if ($redirectHeaders && isset($location['authority'])) {
439436
$port = parse_url($location['authority'], \PHP_URL_PORT) ?: ('http:' === $location['scheme'] ? 80 : 443);
440437
$requestHeaders = parse_url($location['authority'], \PHP_URL_HOST) === $redirectHeaders['host'] && $redirectHeaders['port'] === $port ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];
441438
curl_setopt($ch, \CURLOPT_HTTPHEADER, $requestHeaders);

‎src/Symfony/Component/HttpClient/NativeHttpClient.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public function request(string $method, string $url, array $options = []): Respo
155155

156156
$progressInfo = $info;
157157
$progressInfo['url'] = implode('', $info['url']);
158+
$progressInfo['resolve'] = $resolve;
158159
unset($progressInfo['size_body']);
159160

160161
// Memoize the last progress to ease calling the callback periodically when no network transfer happens
@@ -167,7 +168,7 @@ public function request(string $method, string $url, array $options = []): Respo
167168
$lastProgress = $progress ?: $lastProgress;
168169
}
169170

170-
$onProgress($lastProgress[0], $lastProgress[1], $progressInfo, $resolve);
171+
$onProgress($lastProgress[0], $lastProgress[1], $progressInfo);
171172
};
172173
} elseif (0 < $options['max_duration']) {
173174
$maxDuration = $options['max_duration'];
@@ -352,6 +353,7 @@ private static function dnsResolve(string $host, NativeClientState $multi, array
352353

353354
$multi->dnsCache[$host] = $ip = $ip[0];
354355
$info['debug'] .= "* Added {$host}:0:{$ip} to DNS cache\n";
356+
$host = $ip;
355357
} else {
356358
$info['debug'] .= "* Hostname was found in DNS cache\n";
357359
$host = str_contains($ip, ':') ? "[$ip]" : $ip;

‎src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,20 @@ public function request(string $method, string $url, array $options = []): Respo
5252

5353
$subnets = $this->subnets;
5454

55-
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info, ?\Closure $resolve = null) use ($onProgress, $subnets): void {
55+
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info) use ($onProgress, $subnets): void {
5656
static $lastUrl = '';
5757
static $lastPrimaryIp = '';
5858

5959
if ($info['url'] !== $lastUrl) {
60-
$host = trim(parse_url($info['url'], PHP_URL_HOST) ?: '', '[]');
61-
$resolve ??= static fn () => null;
60+
$host = parse_url($info['url'], PHP_URL_HOST) ?: '';
61+
$resolve = $info['resolve'] ?? static function () { return null; };
6262

63-
if (($ip = $host)
64-
&& !filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6)
65-
&& !filter_var($ip, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4)
66-
&& !$ip = $resolve($host)
63+
if (($ip = trim($host, '[]'))
64+
&& !filter_var($ip, \FILTER_VALIDATE_IP)
65+
&& !($ip = $resolve($host))
66+
&& $ip = @(gethostbynamel($host)[0] ?? dns_get_record($host, \DNS_AAAA)[0]['ipv6'] ?? null)
6767
) {
68-
if ($ip = @(dns_get_record($host, \DNS_A)[0]['ip'] ?? null)) {
69-
$resolve($host, $ip);
70-
} elseif ($ip = @(dns_get_record($host, \DNS_AAAA)[0]['ipv6'] ?? null)) {
71-
$resolve($host, '['.$ip.']');
72-
}
68+
$resolve($host, $ip);
7369
}
7470

7571
if ($ip && IpUtils::checkIp($ip, $subnets ?? IpUtils::PRIVATE_SUBNETS)) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ public function __construct(
100100
$onProgress = $options['on_progress'] ?? static function () {};
101101
$onProgress = $this->onProgress = static function () use (&$info, $onProgress, $resolve) {
102102
$info['total_time'] = microtime(true) - $info['start_time'];
103-
$onProgress((int) $info['size_download'], ((int) (1 + $info['download_content_length']) ?: 1) - 1, (array) $info, $resolve);
103+
$info['resolve'] = $resolve;
104+
$onProgress((int) $info['size_download'], ((int) (1 + $info['download_content_length']) ?: 1) - 1, (array) $info);
104105
};
105106

106107
$pauseDeferred = new Deferred();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ public function replaceRequest(string $method, string $url, array $options = [])
160160
$this->info['previous_info'][] = $info = $this->response->getInfo();
161161
if (null !== $onProgress = $options['on_progress'] ?? null) {
162162
$thisInfo = &$this->info;
163-
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info, ?\Closure $resolve = null) use (&$thisInfo, $onProgress) {
164-
$onProgress($dlNow, $dlSize, $thisInfo + $info, $resolve);
163+
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info) use (&$thisInfo, $onProgress) {
164+
$onProgress($dlNow, $dlSize, $thisInfo + $info);
165165
};
166166
}
167167
if (0 < ($info['max_duration'] ?? 0) && 0 < ($info['total_time'] ?? 0)) {

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

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public function __construct(HttpClientInterface $client, string $method, string
5252

5353
if (null !== $onProgress = $options['on_progress'] ?? null) {
5454
$thisInfo = &$this->info;
55-
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info, ?\Closure $resolve = null) use (&$thisInfo, $onProgress) {
56-
$onProgress($dlNow, $dlSize, $thisInfo + $info, $resolve);
55+
$options['on_progress'] = static function (int $dlNow, int $dlSize, array $info) use (&$thisInfo, $onProgress) {
56+
$onProgress($dlNow, $dlSize, $thisInfo + $info);
5757
};
5858
}
5959
$this->response = $client->request($method, $url, ['buffer' => false] + $options);
@@ -118,11 +118,20 @@ public function getHeaders(bool $throw = true): array
118118

119119
public function getInfo(?string $type = null): mixed
120120
{
121+
if ('debug' === ($type ?? 'debug')) {
122+
$debug = implode('', array_column($this->info['previous_info'] ?? [], 'debug'));
123+
$debug .= $this->response->getInfo('debug');
124+
125+
if ('debug' === $type) {
126+
return $debug;
127+
}
128+
}
129+
121130
if (null !== $type) {
122131
return $this->info[$type] ?? $this->response->getInfo($type);
123132
}
124133

125-
return $this->info + $this->response->getInfo();
134+
return array_merge($this->info + $this->response->getInfo(), ['debug' => $debug]);
126135
}
127136

128137
/**
@@ -253,6 +262,7 @@ public static function stream(iterable $responses, ?float $timeout = null, ?stri
253262
return;
254263
}
255264

265+
$chunk = null;
256266
foreach ($client->stream($wrappedResponses, $timeout) as $response => $chunk) {
257267
$r = $asyncMap[$response];
258268

@@ -295,6 +305,9 @@ public static function stream(iterable $responses, ?float $timeout = null, ?stri
295305
}
296306
}
297307

308+
if (null === $chunk) {
309+
throw new \LogicException(\sprintf('"%s" is not compliant with HttpClientInterface: its "stream()" method didn\'t yield any chunks when it should have.', get_debug_type($client)));
310+
}
298311
if (null === $chunk->getError() && $chunk->isLast()) {
299312
$r->yieldedState = self::LAST_CHUNK_YIELDED;
300313
}

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function __construct(
135135
try {
136136
rewind($debugBuffer);
137137
$debug = ['debug' => stream_get_contents($debugBuffer)];
138-
$onProgress($dlNow, $dlSize, $url + curl_getinfo($ch) + $info + $debug, $resolve);
138+
$onProgress($dlNow, $dlSize, $url + curl_getinfo($ch) + $info + $debug + ['resolve' => $resolve]);
139139
} catch (\Throwable $e) {
140140
$multi->handlesActivity[(int) $ch][] = null;
141141
$multi->handlesActivity[(int) $ch][] = $e;
@@ -425,21 +425,11 @@ private static function parseHeaderLine($ch, string $data, array &$info, array &
425425
$info['http_method'] = 'HEAD' === $info['http_method'] ? 'HEAD' : 'GET';
426426
curl_setopt($ch, \CURLOPT_CUSTOMREQUEST, $info['http_method']);
427427
}
428-
$locationHasHost = false;
429428

430-
if (null === $info['redirect_url'] = $resolveRedirect($ch, $location, $noContent, $locationHasHost)) {
429+
if (null === $info['redirect_url'] = $resolveRedirect($ch, $location, $noContent)) {
431430
$options['max_redirects'] = curl_getinfo($ch, \CURLINFO_REDIRECT_COUNT);
432431
curl_setopt($ch, \CURLOPT_FOLLOWLOCATION, false);
433432
curl_setopt($ch, \CURLOPT_MAXREDIRS, $options['max_redirects']);
434-
} elseif ($locationHasHost) {
435-
$url = parse_url($info['redirect_url']);
436-
437-
if (null !== $ip = $multi->dnsCache->hostnames[$url['host'] = strtolower($url['host'])] ?? null) {
438-
// Populate DNS cache for redirects if needed
439-
$port = $url['port'] ?? ('http' === $url['scheme'] ? 80 : 443);
440-
curl_setopt($ch, \CURLOPT_RESOLVE, ["{$url['host']}:$port:$ip"]);
441-
$multi->dnsCache->removals["-{$url['host']}:$port"] = "-{$url['host']}:$port";
442-
}
443433
}
444434
}
445435

0 commit comments

Comments
 (0)