Skip to content

Commit e26182d

Browse files
Merge branch '6.4' into 7.2
* 6.4: [Routing] Add test to validate that default value is allowed to not match requirement fix handling required options Fix @var phpdoc [Lock] [MongoDB] Enforce readPreference=primary and writeConcern=majority [FrameworkBundle] fix phpdoc in `MicroKernelTrait` Fixed validator translations for Albanian
2 parents bf38428 + 6d78fe8 commit e26182d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Response/AmpResponseV4.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ private static function generateResponse(Request $request, AmpClientStateV4 $mul
224224
});
225225

226226
try {
227-
/* @var Response $response */
227+
/** @var Response $response */
228228
if (null === $response = yield from self::getPushedResponse($request, $multi, $info, $headers, $options, $logger)) {
229229
$logger?->info(\sprintf('Request: "%s %s"', $info['http_method'], $info['url']));
230230

Tests/MockHttpClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ public function testUnixSocket()
512512

513513
public function testChangeResponseFactory()
514514
{
515-
/* @var MockHttpClient $client */
515+
/** @var MockHttpClient $client */
516516
$client = $this->getHttpClient(__METHOD__);
517517
$expectedBody = '{"foo": "bar"}';
518518
$client->setResponseFactory(new MockResponse($expectedBody));

0 commit comments

Comments
 (0)