Merge branch '6.4' into 7.3

* 6.4:
  [Validator] Update Romanian translations
  fix tests
  [String][Inflector] Fix edge cases
  [Security] Fix attribute-based chained user providers
  [Intl] Fix Intl::getIcuStubVersion()

Author: nicolas-grekas

src/Symfony/Component/Intl/Intl.php

@@ -106,7 +106,7 @@ public static function getIcuDataVersion(): string
      */
     public static function getIcuStubVersion(): string
     {
-        return '76.1';
+        return '77.1';
     }
 
     /**

src/Symfony/Component/Security/Core/Tests/User/ChainUserProviderTest.php

@@ -14,12 +14,14 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
 use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\AttributesBasedUserProviderInterface;
 use Symfony\Component\Security\Core\User\ChainUserProvider;
 use Symfony\Component\Security\Core\User\InMemoryUser;
 use Symfony\Component\Security\Core\User\InMemoryUserProvider;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
 
 class ChainUserProviderTest extends TestCase
 {
@@ -45,6 +47,28 @@ public function testLoadUserByIdentifier()
         $this->assertSame($account, $provider->loadUserByIdentifier('foo'));
     }
 
+    public function testLoadUserByIdentifierWithAttributes()
+    {
+        $provider1 = $this->createMock(UserProviderInterface::class);
+        $provider1
+            ->expects($this->once())
+            ->method('loadUserByIdentifier')
+            ->with($this->equalTo('foo'))
+            ->willThrowException(new UserNotFoundException('not found'))
+        ;
+
+        $provider2 = $this->createMock(AttributesBasedUserProviderInterface::class);
+        $provider2
+            ->expects($this->once())
+            ->method('loadUserByIdentifier')
+            ->with($this->equalTo('foo'), $this->equalTo(['attr' => 5]))
+            ->willReturn($account = $this->createMock(UserInterface::class))
+        ;
+
+        $provider = new ChainUserProvider([$provider1, $provider2]);
+        $this->assertSame($account, $provider->loadUserByIdentifier('foo', ['attr' => 5]));
+    }
+
     public function testLoadUserByIdentifierThrowsUserNotFoundException()
     {
         $provider1 = $this->createMock(InMemoryUserProvider::class);

src/Symfony/Component/Security/Core/User/ChainUserProvider.php

@@ -46,10 +46,18 @@ public function getProviders(): array
         return $this->providers;
     }
 
-    public function loadUserByIdentifier(string $identifier): UserInterface
+    /**
+     * @param array $attributes
+     */
+    public function loadUserByIdentifier(string $identifier/* , array $attributes = [] */): UserInterface
     {
+        $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];
         foreach ($this->providers as $provider) {
             try {
+                if ($provider instanceof AttributesBasedUserProviderInterface) {
+                    return $provider->loadUserByIdentifier($identifier, $attributes);
+                }
+
                 return $provider->loadUserByIdentifier($identifier);
             } catch (UserNotFoundException) {
                 // try next one

src/Symfony/Component/Serializer/Tests/Normalizer/DateTimeNormalizerTest.php

@@ -139,7 +139,7 @@ public static function normalizeUsingTimeZonePassedInContextAndExpectedFormatWit
                 '2018-12-01T18:03:06.067634',
                 new \DateTimeZone('UTC')
             ),
-            new \DateTimeZone('Europe/Kyiv'),
+            new \DateTimeZone(\in_array('Europe/Kyiv', \DateTimeZone::listIdentifiers(), true) ? 'Europe/Kyiv' : 'Europe/Kiev'),
         ];
 
         yield [

src/Symfony/Component/String/Inflector/EnglishInflector.php

@@ -25,6 +25,13 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: singular suffix, normal
 
+        // insignias (insigne), insignia (insigne)
+        ['saingisni', 9, true, true, 'insigne'],
+        ['aingisni', 8, true, true, 'insigne'],
+
+        // passersby (passerby)
+        ['ybsressap', 9, true, true, 'passerby'],
+
         // nodes (node)
         ['sedon', 5, true, true, 'node'],
 
@@ -205,6 +212,12 @@ final class EnglishInflector implements InflectorInterface
         // Fourth entry: Whether the suffix may succeed a consonant
         // Fifth entry: plural suffix, normal
 
+        // passerby (passersby)
+        ['ybressap', 8, true, true, 'passersby'],
+
+        // insigne (insignia, insignias)
+        ['engisni', 7, true, true, ['insignia', 'insignias']],
+
         // nodes (node)
         ['edon', 4, true, true, 'nodes'],
 

src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php

@@ -171,16 +171,15 @@ public static function singularizeProvider()
             ['waltzes', ['waltz', 'waltze']],
             ['wives', 'wife'],
             ['zombies', 'zombie'],
+            ['passersby', 'passerby'],
+            ['rattles', 'rattle'],
+            ['insignia', 'insigne'],
+            ['insignias', 'insigne'],
 
             // test casing: if the first letter was uppercase, it should remain so
             ['Men', 'Man'],
             ['GrandChildren', 'GrandChild'],
             ['SubTrees', 'SubTree'],
-
-            // Known issues
-            // ['insignia', 'insigne'],
-            // ['insignias', 'insigne'],
-            // ['rattles', 'rattle'],
         ];
     }
 
@@ -262,6 +261,7 @@ public static function pluralizeProvider()
             ['house', 'houses'],
             ['icon', 'icons'],
             ['index', ['indicies', 'indexes']],
+            ['insigne', ['insignia', 'insignias']],
             ['ion', 'ions'],
             ['iris', 'irises'],
             ['issue', 'issues'],
@@ -287,6 +287,7 @@ public static function pluralizeProvider()
             ['objective', 'objectives'],
             ['ox', 'oxen'],
             ['party', 'parties'],
+            ['passerby', 'passersby'],
             ['person', ['persons', 'people']],
             ['phenomenon', 'phenomena'],
             ['photo', 'photos'],
@@ -298,6 +299,7 @@ public static function pluralizeProvider()
             ['quiz', 'quizzes'],
             ['quorum', ['quora', 'quorums']],
             ['radius', 'radii'],
+            ['rattle', 'rattles'],
             ['roof', ['roofs', 'rooves']],
             ['rose', 'roses'],
             ['sandwich', 'sandwiches'],