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 6d19f56

Browse filesBrowse files
[HttpClient] hopefully fix transient test
1 parent 6b3bbe4 commit 6d19f56
Copy full SHA for 6d19f56

File tree

5 files changed

+13
-3
lines changed
Filter options

5 files changed

+13
-3
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ install:
4646
- php composer.phar self-update
4747
- copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
4848
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
49+
- git config --global user.email ""
50+
- git config --global user.name "Symfony"
4951
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
5052
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5153
- php composer.phar update --no-progress --no-suggest --ansi

‎.github/build-packages.php

Copy file name to clipboardExpand all lines: .github/build-packages.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
4848
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
4949
} else {
50-
passthru("cd $dir && git init && git add . && git commit --author \"Symfony <>\" -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
50+
passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
5151
}
5252

5353
if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@ install:
202202
203203
- |
204204
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
205+
git config --global user.email ""
206+
git config --global user.name "Symfony"
207+
205208
if [[ ! $deps ]]; then
206209
php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
207210
else

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/CurlResponse.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@ private static function perform(CurlClientState $multi, array &$responses = null
274274
*/
275275
private static function select(CurlClientState $multi, float $timeout): int
276276
{
277+
if (\PHP_VERSION_ID < 70123 || (70200 <= \PHP_VERSION_ID && \PHP_VERSION_ID < 70211)) {
278+
// workaround https://bugs.php.net/76480
279+
$timeout = min($timeout, 0.01);
280+
}
281+
277282
return curl_multi_select($multi->handle, $timeout);
278283
}
279284

‎src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php

Copy file name to clipboardExpand all lines: src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,9 @@ public function testNotATimeout()
597597
{
598598
$client = $this->getHttpClient(__FUNCTION__);
599599
$response = $client->request('GET', 'http://localhost:8057/timeout-header', [
600-
'timeout' => 0.5,
600+
'timeout' => 0.9,
601601
]);
602-
usleep(510000);
602+
sleep(1);
603603
$this->assertSame(200, $response->getStatusCode());
604604
}
605605

0 commit comments

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