Skip to content

Commit 25229e8

Browse files
Merge branch '6.4' into 7.0
* 6.4: [Process] remove fixing of legacy bug, when PTS functionality is enabled DX: re-apply self_accessor and phpdoc_types_order by PHP CS Fixer [HttpClient] Psr18Client: parse HTTP Reason Phrase for Response fix test Fix wrong yaml parse null test [AssetMapper] Fixing merge from multiple PR's Bump Symfony version to 5.4.31 Update VERSION for 5.4.30 Update CONTRIBUTORS for 5.4.30 Update CHANGELOG for 5.4.30 Fix wrong merge [AssetMapper] Allowing circular references in JavaScriptImportPathCompiler [AssetMapper] Fix file deleting errors & remove nullable MappedAsset on JS import [Lock] Fix mongodb extension requirement in tests [Yaml] Remove dead code [AssetMapper] Fix in-file imports to resolve via filesystem throw better exception in TranslatableNormalizer, add to changelog Passing null to Inline::parse is not allowed Fix passing null to trim()
2 parents 82d93b2 + ead3202 commit 25229e8

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

Response.php

+2
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ public function prepare(Request $request): static
307307
/**
308308
* Sends HTTP headers.
309309
*
310+
* @param positive-int|null $statusCode The status code to use, override the statusCode property if set and not null
311+
*
310312
* @return $this
311313
*/
312314
public function sendHeaders(int $statusCode = null): static

StreamedResponse.php

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ public function getCallback(): ?\Closure
6969
/**
7070
* This method only sends the headers once.
7171
*
72+
* @param positive-int|null $statusCode The status code to use, override the statusCode property if set and not null
73+
*
7274
* @return $this
7375
*/
7476
public function sendHeaders(int $statusCode = null): static

Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use MongoDB\Client;
1515
use PHPUnit\Framework\MockObject\MockObject;
16+
use PHPUnit\Framework\SkippedTestSuiteError;
1617
use PHPUnit\Framework\TestCase;
1718
use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler;
1819

@@ -29,13 +30,16 @@ class MongoDbSessionHandlerTest extends TestCase
2930
private MockObject&Client $mongo;
3031
private MongoDbSessionHandler $storage;
3132

32-
protected function setUp(): void
33+
public static function setUpBeforeClass(): void
3334
{
34-
parent::setUp();
35-
3635
if (!class_exists(Client::class)) {
37-
$this->markTestSkipped('The mongodb/mongodb package is required.');
36+
throw new SkippedTestSuiteError('The mongodb/mongodb package is required.');
3837
}
38+
}
39+
40+
protected function setUp(): void
41+
{
42+
parent::setUp();
3943

4044
$this->mongo = $this->getMockBuilder(Client::class)
4145
->disableOriginalConstructor()

0 commit comments

Comments
 (0)