Merge branch '5.3' into 5.4

* 5.3:
  cs fix
  [DependencyInjection][Console] tighten types
  [Lock] fix derivating semaphore from key
  [Notifier] Fix TransportTestCase
  [Security\Core] Fix wrong deprecation message in UserPasswordValidator

Author: nicolas-grekas

Test/TransportTestCase.php

@@ -96,7 +96,7 @@ public function testCanSetCustomHost()
 
         $transport->setHost($customHost = self::CUSTOM_HOST);
 
-        $this->assertStringContainsString(sprintf('://%s', $customHost), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*\@%s)/', $customHost, $customHost), (string) $transport);
     }
 
     public function testCanSetCustomPort()
@@ -106,9 +106,9 @@ public function testCanSetCustomPort()
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
         /*
-         * @see https://regex101.com/r/0xQKuY/2
+         * @see https://regex101.com/r/shT9O2/1
          */
-        $this->assertMatchesRegularExpression(sprintf('/^.*\/\/.*\:%s.*$/', $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/.*(\@.*)?\:%s((\?.*|\/.*))?$/', $customPort), (string) $transport);
     }
 
     public function testCanSetCustomHostAndPort()
@@ -118,6 +118,6 @@ public function testCanSetCustomHostAndPort()
         $transport->setHost($customHost = self::CUSTOM_HOST);
         $transport->setPort($customPort = self::CUSTOM_PORT);
 
-        $this->assertStringContainsString(sprintf('://%s:%s', $customHost, $customPort), (string) $transport);
+        $this->assertMatchesRegularExpression(sprintf('/^.*\:\/\/(%s|.*\@%s)\:%s/', $customHost, $customHost, $customPort), (string) $transport);
     }
 }