Skip to content

Commit 665bc11

Browse files
Merge branch '4.4' into 5.2
* 4.4: Fix SkippedTestSuite [Console] Fix type annotation on InputInterface::hasArgument() Revert "minor #41949 [Console] fix type annotations on InputInterface (nicolas-grekas)" [EventDispatcher] Correct the called event listener method case Add missing translations for Japanese. Revert "bug #41952 [Console] fix handling positional arguments (nicolas-grekas)" [Security] Don't skip UserPasswordValidatorTest [DI] CS fix [Console] fix handling positional arguments [Validator] add translation for Vietnamese Add Bulgarian translation for the validator
2 parents 0544209 + 5c9b42e commit 665bc11

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Tests/HttpClientTestCase.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\HttpClient\Tests;
1313

14+
use PHPUnit\Framework\SkippedTestSuiteError;
1415
use Symfony\Component\HttpClient\Exception\ClientException;
1516
use Symfony\Component\HttpClient\Exception\TransportException;
1617
use Symfony\Component\HttpClient\Internal\ClientState;
@@ -295,11 +296,11 @@ private static function startVulcain(HttpClientInterface $client)
295296
}
296297

297298
if ('\\' === \DIRECTORY_SEPARATOR) {
298-
self::markTestSkipped('Testing with the "vulcain" is not supported on Windows.');
299+
throw new SkippedTestSuiteError('Testing with the "vulcain" is not supported on Windows.');
299300
}
300301

301302
if (['application/json'] !== $client->request('GET', 'http://127.0.0.1:8057/json')->getHeaders()['content-type']) {
302-
self::markTestSkipped('symfony/http-client-contracts >= 2.0.1 required');
303+
throw new SkippedTestSuiteError('symfony/http-client-contracts >= 2.0.1 required');
303304
}
304305

305306
$process = new Process(['vulcain'], null, [
@@ -316,14 +317,14 @@ private static function startVulcain(HttpClientInterface $client)
316317

317318
if (!$process->isRunning()) {
318319
if ('\\' !== \DIRECTORY_SEPARATOR && 127 === $process->getExitCode()) {
319-
self::markTestSkipped('vulcain binary is missing');
320+
throw new SkippedTestSuiteError('vulcain binary is missing');
320321
}
321322

322323
if ('\\' !== \DIRECTORY_SEPARATOR && 126 === $process->getExitCode()) {
323-
self::markTestSkipped('vulcain binary is not executable');
324+
throw new SkippedTestSuiteError('vulcain binary is not executable');
324325
}
325326

326-
self::markTestSkipped((new ProcessFailedException($process))->getMessage());
327+
throw new SkippedTestSuiteError((new ProcessFailedException($process))->getMessage());
327328
}
328329

329330
self::$vulcainStarted = true;

0 commit comments

Comments
 (0)