Merge branch '7.2' into 7.3

xabbuh · xabbuh · commit 6f4f04b98f61 · 2025-02-05T09:49:55.000+01:00
* 7.2:
  skip transient test on GitHub Actions
  skip transient test on GitHub Actions
  pass CURLOPT_INFILESIZE_LARGE only when supported
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -322,8 +322,8 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         foreach ($curlopts as $opt => $value) {
-            if (\CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {
-                $opt = 115; // 115 === CURLOPT_INFILESIZE_LARGE, but it's not defined in PHP
+            if (\PHP_INT_SIZE === 8 && \defined('CURLOPT_INFILESIZE_LARGE') && \CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {
+                $opt = \CURLOPT_INFILESIZE_LARGE;
             }
             if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') || \CURLOPT_HEADEROPT !== $opt)) {
                 $constantName = $this->findConstantName($opt);
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -1686,6 +1686,9 @@ public function testNotIgnoringSignal()
         if (!\function_exists('pcntl_signal')) {
             $this->markTestSkipped('pnctl extension is required.');
         }
+        if (\PHP_VERSION_ID < 80300 && isset($_SERVER['GITHUB_ACTIONS'])) {
+            $this->markTestSkipped('Transient on GHA with PHP < 8.3');
+        }
 
         $process = $this->getProcess(['sleep', '10']);
 

Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,8 @@ public function request(string $method, string $url, array $options = []): Respo`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`foreach ($curlopts as $opt => $value) {`
`325`		`- if (\CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {`
`326`		`- $opt = 115; // 115 === CURLOPT_INFILESIZE_LARGE, but it's not defined in PHP`
	`325`	`+ if (\PHP_INT_SIZE === 8 && \defined('CURLOPT_INFILESIZE_LARGE') && \CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {`
	`326`	`+ $opt = \CURLOPT_INFILESIZE_LARGE;`
`327`	`327`	`}`
`328`	`328`	`if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') \|\| \CURLOPT_HEADEROPT !== $opt)) {`
`329`	`329`	`$constantName = $this->findConstantName($opt);`
Original file line number	Diff line number	Diff line change
`@@ -1686,6 +1686,9 @@ public function testNotIgnoringSignal()`
`1686`	`1686`	`if (!\function_exists('pcntl_signal')) {`
`1687`	`1687`	`$this->markTestSkipped('pnctl extension is required.');`
`1688`	`1688`	`}`
	`1689`	`+ if (\PHP_VERSION_ID < 80300 && isset($_SERVER['GITHUB_ACTIONS'])) {`
	`1690`	`+ $this->markTestSkipped('Transient on GHA with PHP < 8.3');`
	`1691`	`+ }`
`1689`	`1692`
`1690`	`1693`	`$process = $this->getProcess(['sleep', '10']);`
`1691`	`1694`