Skip to content

Commit f87efa1

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [HttpClient] Fix cURL default options remove no longer needed PHP version check
2 parents 616c582 + f0ca74d commit f87efa1

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public function getProxyCode(Definition $definition, ?string $id = null): string
105105

106106
if ($asGhostObject) {
107107
try {
108-
return (\PHP_VERSION_ID >= 80200 && $class?->isReadOnly() ? 'readonly ' : '').'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
108+
return ($class?->isReadOnly() ? 'readonly ' : '').'class '.$proxyClass.ProxyHelper::generateLazyGhost($class);
109109
} catch (LogicException $e) {
110110
throw new InvalidArgumentException(sprintf('Cannot generate lazy ghost for service "%s".', $id ?? $definition->getClass()), 0, $e);
111111
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ public function __construct(
181181
curl_multi_remove_handle($multi->handle, $ch);
182182
curl_setopt_array($ch, [
183183
\CURLOPT_NOPROGRESS => true,
184-
\CURLOPT_PROGRESSFUNCTION => null,
185-
\CURLOPT_HEADERFUNCTION => null,
186-
\CURLOPT_WRITEFUNCTION => null,
187-
\CURLOPT_READFUNCTION => null,
188184
\CURLOPT_INFILE => null,
189185
]);
190186

0 commit comments

Comments
 (0)