Merge branch '5.2' into 5.3

* 5.2:
  [Contracts] Add missing `@return` annotations
  [FrameworkBundle] Fixed file operations in Sodium vault seal
  [Messenger] [Redis] Make `auth` option works

Author: nicolas-grekas

src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php

@@ -90,7 +90,7 @@ public function seal(string $name, string $value): void
         $list = $this->list();
         $list[$name] = null;
         uksort($list, 'strnatcmp');
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list), \LOCK_EX));
+        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
         $this->lastMessage = sprintf('Secret "%s" encrypted in "%s"; you can commit it.', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
     }
@@ -142,7 +142,7 @@ public function remove(string $name): bool
 
         $list = $this->list();
         unset($list[$name]);
-        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list), \LOCK_EX));
+        file_put_contents($this->pathPrefix.'list.php', sprintf("<?php\n\nreturn %s;\n", VarExporter::export($list)), \LOCK_EX);
 
         $this->lastMessage = sprintf('Secret "%s" removed from "%s".', $name, $this->getPrettyPath(\dirname($this->pathPrefix).\DIRECTORY_SEPARATOR));
 

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php

@@ -217,6 +217,39 @@ public function testAuth()
         Connection::fromDsn('redis://password@localhost/queue', [], $redis);
     }
 
+    public function testAuthFromOptions()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with('password')
+            ->willReturn(true);
+
+        Connection::fromDsn('redis://localhost/queue', ['auth' => 'password'], $redis);
+    }
+
+    public function testAuthFromOptionsAndDsn()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with('password2')
+            ->willReturn(true);
+
+        Connection::fromDsn('redis://password1@localhost/queue', ['auth' => 'password2'], $redis);
+    }
+
+    public function testAuthAsUserInDsn()
+    {
+        $redis = $this->createMock(\Redis::class);
+
+        $redis->expects($this->exactly(1))->method('auth')
+            ->with('password')
+            ->willReturn(true);
+
+        Connection::fromDsn('redis://password:localhost/queue', [], $redis);
+    }
+
     public function testNoAuthWithEmptyPassword()
     {
         $redis = $this->createMock(\Redis::class);

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

@@ -231,7 +231,7 @@ public static function fromDsn(string $dsn, array $redisOptions = [], $redis = n
             $connectionCredentials = [
                 'host' => $parsedUrl['host'] ?? '127.0.0.1',
                 'port' => $parsedUrl['port'] ?? 6379,
-                'auth' => $parsedUrl['pass'] ?? $parsedUrl['user'] ?? null,
+                'auth' => $redisOptions['auth'] ?? $parsedUrl['pass'] ?? $parsedUrl['user'] ?? null,
             ];
 
             $pathParts = explode('/', rtrim($parsedUrl['path'] ?? '', '/'));

src/Symfony/Contracts/Cache/CacheTrait.php

@@ -27,6 +27,8 @@ trait CacheTrait
 {
     /**
      * {@inheritdoc}
+     *
+     * @return mixed
      */
     public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
     {

src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php

@@ -18,6 +18,9 @@ class TestHttpServer
 {
     private static $process = [];
 
+    /**
+     * @return Process
+     */
     public static function start(int $port = 8057)
     {
         if (isset(self::$process[$port])) {

src/Symfony/Contracts/Service/ServiceSubscriberTrait.php

@@ -52,6 +52,8 @@ public static function getSubscribedServices(): array
 
     /**
      * @required
+     *
+     * @return ContainerInterface|null
      */
     public function setContainer(ContainerInterface $container)
     {

src/Symfony/Contracts/Service/Test/ServiceLocatorTest.php

@@ -17,6 +17,9 @@
 
 abstract class ServiceLocatorTest extends TestCase
 {
+    /**
+     * @return ContainerInterface
+     */
     protected function getServiceLocator(array $factories)
     {
         return new class($factories) implements ContainerInterface {

src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php

@@ -42,7 +42,7 @@ public function aParentService(): Service1
     {
     }
 
-    public function setContainer(ContainerInterface $container)
+    public function setContainer(ContainerInterface $container): ContainerInterface
     {
         return $container;
     }

src/Symfony/Contracts/Translation/Test/TranslatorTest.php

@@ -43,6 +43,9 @@ protected function tearDown(): void
         \Locale::setDefault($this->defaultLocale);
     }
 
+    /**
+     * @return TranslatorInterface
+     */
     public function getTranslator()
     {
         return new class() implements TranslatorInterface {