Skip to content

Commit 6f05960

Browse files
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Allow simple, relative paths in importmap.php [PropertyInfo] Make isWriteable() more consistent with isReadable() when checking snake_case properties [AssetMapper] Add support for CSS files in the importmap [Messenger] Add `--all` option to the `messenger:failed:remove` command Fix merge fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE [HttpClient] Fix Static Code Analyzer issue with JsonMockResponse [Messenger] Fix exiting `FailedMessagesRetryCommand` [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize() remove an unreachable code branch [Validator] Fix `File::$extensions`’ PHPDoc [Mime] Fix email (de)serialization issues [FrameworkBundle][WebProfilerBundle][Console][Form][HttpKernel][PropertyInfo][Validator] Remove optional before required param Replace usages of SkippedTestSuiteError with markTestSkipped() call Update InteractiveAuthenticatorInterface description wording to match documentation [Serializer] Fix parsing XML root node attributes fix parsing of payload timestamp to DateTimeImmutable Fix routing to multiple fallback transports Fix missing stamps in delayed message handling [DoctrineBridge] Ignore invalid stores in `LockStoreSchemaListener` raised by `StoreFactory`
2 parents 46460fd + 1313f17 commit 6f05960

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Response/JsonMockResponse.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
class JsonMockResponse extends MockResponse
1717
{
18+
/**
19+
* @param mixed $body Any value that `json_encode()` can serialize
20+
*/
1821
public function __construct(mixed $body = [], array $info = [])
1922
{
2023
try {

Tests/HttpClientTestCase.php

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

1212
namespace Symfony\Component\HttpClient\Tests;
1313

14-
use PHPUnit\Framework\SkippedTestSuiteError;
1514
use Symfony\Component\HttpClient\Exception\ClientException;
1615
use Symfony\Component\HttpClient\Exception\TransportException;
1716
use Symfony\Component\HttpClient\Internal\ClientState;
@@ -318,7 +317,7 @@ private static function startVulcain(HttpClientInterface $client)
318317
}
319318

320319
if ('\\' === \DIRECTORY_SEPARATOR) {
321-
throw new SkippedTestSuiteError('Testing with the "vulcain" is not supported on Windows.');
320+
self::markTestSkipped('Testing with the "vulcain" is not supported on Windows.');
322321
}
323322

324323
$process = new Process(['vulcain'], null, [
@@ -335,14 +334,14 @@ private static function startVulcain(HttpClientInterface $client)
335334

336335
if (!$process->isRunning()) {
337336
if ('\\' !== \DIRECTORY_SEPARATOR && 127 === $process->getExitCode()) {
338-
throw new SkippedTestSuiteError('vulcain binary is missing');
337+
self::markTestSkipped('vulcain binary is missing');
339338
}
340339

341340
if ('\\' !== \DIRECTORY_SEPARATOR && 126 === $process->getExitCode()) {
342-
throw new SkippedTestSuiteError('vulcain binary is not executable');
341+
self::markTestSkipped('vulcain binary is not executable');
343342
}
344343

345-
throw new SkippedTestSuiteError((new ProcessFailedException($process))->getMessage());
344+
self::markTestSkipped((new ProcessFailedException($process))->getMessage());
346345
}
347346

348347
self::$vulcainStarted = true;

0 commit comments

Comments
 (0)