Merge branch '6.0' into 6.1

* 6.0:
  Revert "[Messenger] Redis Sentinel support"
  Minor fixes in partial denormalizing

Author: javiereguiluz

components/serializer.rst

@@ -1236,15 +1236,15 @@ collect all exceptions at once, and to get the object partially denormalized::
         ]);
     } catch (PartialDenormalizationException $e) {
         $violations = new ConstraintViolationList();
-        /** @var NotNormalizableValueException */
+        /** @var NotNormalizableValueException $exception */
         foreach ($e->getErrors() as $exception) {
             $message = sprintf('The type must be one of "%s" ("%s" given).', implode(', ', $exception->getExpectedTypes()), $exception->getCurrentType());
             $parameters = [];
             if ($exception->canUseMessageForUser()) {
                 $parameters['hint'] = $exception->getMessage();
             }
             $violations->add(new ConstraintViolation($message, '', $parameters, null, $exception->getPath(), null));
-        };
+        }
 
         return $this->json($violations, 400);
     }

messenger.rst

@@ -1369,15 +1369,6 @@ redeliver_timeout        Timeout before retrying a pending      ``3600``
 claim_interval           Interval on which pending/abandoned    ``60000`` (1 Minute)
                          messages should be checked for to
                          claim - in milliseconds
-sentinel_persistent_id   String, if null connection is          null
-                         non-persistent.
-sentinel_retry_interval  Int, value in milliseconds             ``0``
-sentinel_read_timeout    Float, value in seconds                ``0``
-                         default indicates unlimited
-sentinel_timeout         Float, value in seconds                ``0``
-                         default indicates unlimited
-sentinel_master          String, if null or empty Sentinel      null
-                         support is disabled
 =======================  =====================================  =================================
 
 .. caution::