Merge branch '6.4' into 7.3

* 6.4:
  [Cache] Fix internal representation of non-static values
  [Cache] Make `TagAwareAdapter` registrable as a service
  refactor: Unify & more humane translation message
  fix Resources translations validators.pt.xlf
  [Security] Pass attributes to nested `ChainUserProviders`
  [Validator] Update translation for the Video constraint
  [Messenger] Firebird Database - incompatibility with expected lowercase columns
  SQLSRV: Change column type from TEXT to STRING
  Fix exception catch when deleting temporary table in the sameDatabaseChecker
  [Serializer] Fix serializer crash due to asymmetric visibility on `protected(set)` properties

Author: nicolas-grekas

Tests/User/ChainUserProviderTest.php

@@ -49,6 +49,14 @@ public function testLoadUserByIdentifier()
 
     public function testLoadUserByIdentifierWithAttributes()
     {
+        $provider0 = $this->createMock(ChainUserProvider::class);
+        $provider0
+            ->expects($this->once())
+            ->method('loadUserByIdentifier')
+            ->with($this->equalTo('foo'), $this->equalTo(['attr' => 5]))
+            ->willThrowException(new UserNotFoundException('not found'))
+        ;
+
         $provider1 = $this->createMock(UserProviderInterface::class);
         $provider1
             ->expects($this->once())
@@ -65,7 +73,7 @@ public function testLoadUserByIdentifierWithAttributes()
             ->willReturn($account = $this->createMock(UserInterface::class))
         ;
 
-        $provider = new ChainUserProvider([$provider1, $provider2]);
+        $provider = new ChainUserProvider([$provider0, $provider1, $provider2]);
         $this->assertSame($account, $provider->loadUserByIdentifier('foo', ['attr' => 5]));
     }
 

User/ChainUserProvider.php

@@ -54,7 +54,7 @@ public function loadUserByIdentifier(string $identifier/* , array $attributes =
         $attributes = \func_num_args() > 1 ? func_get_arg(1) : [];
         foreach ($this->providers as $provider) {
             try {
-                if ($provider instanceof AttributesBasedUserProviderInterface) {
+                if ($provider instanceof AttributesBasedUserProviderInterface || $provider instanceof self) {
                     return $provider->loadUserByIdentifier($identifier, $attributes);
                 }