Merge branch '5.1' into 5.2

* 5.1:
  [Notifier] Fix parsing Dsn with empty user/password
  Remove void return type from test methods
  [Notifier] Use assertSame()

Author: fabpot

Tests/Transport/DsnTest.php

@@ -15,12 +15,12 @@
 use Symfony\Component\Notifier\Exception\InvalidArgumentException;
 use Symfony\Component\Notifier\Transport\Dsn;
 
-class DsnTest extends TestCase
+final class DsnTest extends TestCase
 {
     /**
      * @dataProvider fromStringProvider
      */
-    public function testFromString(string $string, Dsn $expectedDsn): void
+    public function testFromString(string $string, Dsn $expectedDsn)
     {
         $actualDsn = Dsn::fromString($string);
 
@@ -42,6 +42,26 @@ public function fromStringProvider(): iterable
             new Dsn('scheme', 'localhost', null, null, null, [], null),
         ];
 
+        yield 'simple dsn including @ sign, but no user/password/token' => [
+            'scheme://@localhost',
+            new Dsn('scheme', 'localhost', null, null),
+        ];
+
+        yield 'simple dsn including : sign and @ sign, but no user/password/token' => [
+            'scheme://:@localhost',
+            new Dsn('scheme', 'localhost', null, null),
+        ];
+
+        yield 'simple dsn including user, : sign and @ sign, but no password' => [
+            'scheme://user1:@localhost',
+            new Dsn('scheme', 'localhost', 'user1', null),
+        ];
+
+        yield 'simple dsn including : sign, password, and @ sign, but no user' => [
+            'scheme://:pass@localhost',
+            new Dsn('scheme', 'localhost', null, 'pass'),
+        ];
+
         yield 'dsn with user and pass' => [
             'scheme://u$er:pa$s@localhost',
             new Dsn('scheme', 'localhost', 'u$er', 'pa$s', null, [], null),
@@ -66,7 +86,7 @@ public function fromStringProvider(): iterable
     /**
      * @dataProvider invalidDsnProvider
      */
-    public function testInvalidDsn(string $dsn, string $exceptionMessage): void
+    public function testInvalidDsn(string $dsn, string $exceptionMessage)
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage($exceptionMessage);
@@ -91,7 +111,7 @@ public function invalidDsnProvider(): iterable
         ];
     }
 
-    public function testGetOption(): void
+    public function testGetOption()
     {
         $options = ['with_value' => 'some value', 'nullable' => null];
         $dsn = new Dsn('scheme', 'localhost', 'u$er', 'pa$s', '8000', $options, '/channel');

Transport/Dsn.php

@@ -54,8 +54,8 @@ public static function fromString(string $dsn): self
             throw new InvalidArgumentException(sprintf('The "%s" notifier DSN must contain a host (use "default" by default).', $dsn));
         }
 
-        $user = isset($parsedDsn['user']) ? urldecode($parsedDsn['user']) : null;
-        $password = isset($parsedDsn['pass']) ? urldecode($parsedDsn['pass']) : null;
+        $user = '' !== ($parsedDsn['user'] ?? '') ? urldecode($parsedDsn['user']) : null;
+        $password = '' !== ($parsedDsn['pass'] ?? '') ? urldecode($parsedDsn['pass']) : null;
         $port = $parsedDsn['port'] ?? null;
         $path = $parsedDsn['path'] ?? null;
         parse_str($parsedDsn['query'] ?? '', $query);