Merge branch '5.3' into 5.4

* 5.3:
  [HttpClient] Don't ignore errors from curl_multi_exec()
  [HttpClient] Double check if handle is complete
  CI for macOS
  [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass
  [Translation] [Bridge] [Lokalise] Fix push keys to lokalise. Closes #…
  [PropertyAccess] Fix accessing public property in Object
  [Process] fixed uppercase ARGC and ARGV should also be skipped
  [PropertyAccess] Add tests accessing public (dynamic) properties
  [Mailer] Update docs for sendmail -t
  [FrameworkBundle] Fix cache pool configuration with one adapter and one provider
  [FrameworkBundle] Use correct cookie domain in loginUser()
  Missing translations for Belarusian (be) #41032

Author: derrabus

DependencyInjection/Configuration.php

@@ -1084,13 +1084,14 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
                             ->prototype('array')
                                 ->fixXmlConfig('adapter')
                                 ->beforeNormalization()
-                                    ->ifTrue(function ($v) { return (isset($v['adapters']) || \is_array($v['adapter'] ?? null)) && isset($v['provider']); })
-                                    ->thenInvalid('Pool cannot have a "provider" while "adapter" is set to a map')
+                                    ->ifTrue(function ($v) { return isset($v['provider']) && \is_array($v['adapters'] ?? $v['adapter'] ?? null) && 1 < \count($v['adapters'] ?? $v['adapter']); })
+                                    ->thenInvalid('Pool cannot have a "provider" while more than one adapter is defined')
                                 ->end()
                                 ->children()
                                     ->arrayNode('adapters')
                                         ->performNoDeepMerging()
                                         ->info('One or more adapters to chain for creating the pool, defaults to "cache.app".')
+                                        ->beforeNormalization()->castToArray()->end()
                                         ->beforeNormalization()
                                             ->always()->then(function ($values) {
                                                 if ([0] === array_keys($values) && \is_array($values[0])) {

KernelBrowser.php

@@ -144,8 +144,13 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
         $session->set('_security_'.$firewallContext, serialize($token));
         $session->save();
 
-        $cookie = new Cookie($session->getName(), $session->getId());
-        $this->getCookieJar()->set($cookie);
+        $domains = array_unique(array_map(function (Cookie $cookie) use ($session) {
+            return $cookie->getName() === $session->getName() ? $cookie->getDomain() : '';
+        }, $this->getCookieJar()->all())) ?: [''];
+        foreach ($domains as $domain) {
+            $cookie = new Cookie($session->getName(), $session->getId(), null, null, $domain);
+            $this->getCookieJar()->set($cookie);
+        }
 
         return $this;
     }

Tests/Functional/SecurityTest.php

@@ -70,4 +70,20 @@ public function testLoginInBetweenRequests()
         $client->request('GET', '/main/user_profile');
         $this->assertEquals('Welcome the-username!', $client->getResponse()->getContent());
     }
+
+    public function testLoginUserMultipleTimes()
+    {
+        $userFoo = new InMemoryUser('the-username', 'the-password', ['ROLE_FOO']);
+        $userBar = new InMemoryUser('no-role-username', 'the-password');
+        $client = $this->createClient(['test_case' => 'Security', 'root_config' => 'config.yml']);
+        $client->loginUser($userFoo);
+
+        $client->request('GET', '/main/user_profile');
+        $this->assertEquals('Welcome the-username!', $client->getResponse()->getContent());
+
+        $client->loginUser($userBar);
+
+        $client->request('GET', '/main/user_profile');
+        $this->assertEquals('Welcome no-role-username!', $client->getResponse()->getContent());
+    }
 }