Skip to content

Commit 84f576d

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Revert "[Messenger] Redis Sentinel support" Minor fixes in partial denormalizing
2 parents 9f2b262 + 9a386f1 commit 84f576d

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

components/serializer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1236,15 +1236,15 @@ collect all exceptions at once, and to get the object partially denormalized::
12361236
]);
12371237
} catch (PartialDenormalizationException $e) {
12381238
$violations = new ConstraintViolationList();
1239-
/** @var NotNormalizableValueException */
1239+
/** @var NotNormalizableValueException $exception */
12401240
foreach ($e->getErrors() as $exception) {
12411241
$message = sprintf('The type must be one of "%s" ("%s" given).', implode(', ', $exception->getExpectedTypes()), $exception->getCurrentType());
12421242
$parameters = [];
12431243
if ($exception->canUseMessageForUser()) {
12441244
$parameters['hint'] = $exception->getMessage();
12451245
}
12461246
$violations->add(new ConstraintViolation($message, '', $parameters, null, $exception->getPath(), null));
1247-
};
1247+
}
12481248

12491249
return $this->json($violations, 400);
12501250
}

messenger.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,15 +1405,6 @@ redeliver_timeout Timeout before retrying a pending ``3600``
14051405
claim_interval Interval on which pending/abandoned ``60000`` (1 Minute)
14061406
messages should be checked for to
14071407
claim - in milliseconds
1408-
sentinel_persistent_id String, if null connection is null
1409-
non-persistent.
1410-
sentinel_retry_interval Int, value in milliseconds ``0``
1411-
sentinel_read_timeout Float, value in seconds ``0``
1412-
default indicates unlimited
1413-
sentinel_timeout Float, value in seconds ``0``
1414-
default indicates unlimited
1415-
sentinel_master String, if null or empty Sentinel null
1416-
support is disabled
14171408
======================= ===================================== =================================
14181409

14191410
.. caution::

0 commit comments

Comments
 (0)