Commit6f4f04b

committed

Merge branch '7.2' into 7.3

* 7.2: skip transient test on GitHub Actions skip transient test on GitHub Actions pass CURLOPT_INFILESIZE_LARGE only when supported

2 parents7e9ecaf +a963232 commit6f4f04bCopy full SHA for 6f4f04b

File tree

-2

lines changed

src/Symfony/Component
- HttpClient
  - CurlHttpClient.php
- Process/Tests
  - ProcessTest.php

-2

lines changed

Lines changed: 2 additions & 2 deletions

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 ($curloptsas$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);`

Lines changed: 3 additions & 0 deletions

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`

Comments

(0)