Merge branch '5.1' into 5.2

* 5.1:
  Fix transient tests
  Fix class resolution in Doctrine EventListenerPass
  [Serializer] Fix tests  marked as incomplete
  propagate the object being validated to sub-constraints
  [Translator] fix handling plural for floating numbers
  fix redis messenger options with dsn
  Update ConsoleEvents.php
  allow Doctrine persistence 2 too
  [Messenger] Fix transporting non-UTF8 payloads by encoding them using base 64
  add doctrine/persistence as a dev requirement
  Exclude non-initialized properties accessed with getters

Author: nicolas-grekas

Translation/Test/TranslatorTest.php

@@ -142,11 +142,11 @@ public function getInternal()
     /**
      * @dataProvider getChooseTests
      */
-    public function testChoose($expected, $id, $number)
+    public function testChoose($expected, $id, $number, $locale = null)
     {
         $translator = $this->getTranslator();
 
-        $this->assertEquals($expected, $translator->trans($id, ['%count%' => $number]));
+        $this->assertEquals($expected, $translator->trans($id, ['%count%' => $number], null, $locale));
     }
 
     public function testReturnMessageIfExactlyOneStandardRuleIsGiven()
@@ -255,6 +255,18 @@ public function getChooseTests()
             ['', '|', 1],
             // Empty plural set (3 plural forms) from a .PO file
             ['', '||', 1],
+
+            // Floating values
+            ['1.5 liters', '%count% liter|%count% liters', 1.5],
+            ['1.5 litre', '%count% litre|%count% litres', 1.5, 'fr'],
+
+            // Negative values
+            ['-1 degree', '%count% degree|%count% degrees', -1],
+            ['-1 degré', '%count% degré|%count% degrés', -1],
+            ['-1.5 degrees', '%count% degree|%count% degrees', -1.5],
+            ['-1.5 degré', '%count% degré|%count% degrés', -1.5, 'fr'],
+            ['-2 degrees', '%count% degree|%count% degrees', -2],
+            ['-2 degrés', '%count% degré|%count% degrés', -2],
         ];
     }
 

Translation/TranslatorTrait.php

@@ -136,8 +136,10 @@ public function trans(?string $id, array $parameters = [], string $domain = null
      * which is subject to the new BSD license (http://framework.zend.com/license/new-bsd).
      * Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
      */
-    private function getPluralizationRule(int $number, string $locale): int
+    private function getPluralizationRule(float $number, string $locale): int
     {
+        $number = abs($number);
+
         switch ('pt_BR' !== $locale && \strlen($locale) > 3 ? substr($locale, 0, strrpos($locale, '_')) : $locale) {
             case 'af':
             case 'bn':
@@ -205,7 +207,7 @@ private function getPluralizationRule(int $number, string $locale): int
             case 'pt_BR':
             case 'ti':
             case 'wa':
-                return ((0 == $number) || (1 == $number)) ? 0 : 1;
+                return ($number < 2) ? 0 : 1;
 
             case 'be':
             case 'bs':