Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit d1fbefcc3b4a · 2021-06-30T15:06:15.000+02:00
* 4.4:
  CS fixes
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26
diff --git a/Transport/Dsn.php b/Transport/Dsn.php
@@ -25,7 +25,7 @@ final class Dsn
     private $port;
     private $options;
 
-    public function __construct(string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [])
+    public function __construct(string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [])
     {
         $this->scheme = $scheme;
         $this->host = $host;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ final class Dsn`
`25`	`25`	`private $port;`
`26`	`26`	`private $options;`
`27`	`27`
`28`		`- public function __construct(string $scheme, string $host, ?string $user = null, ?string $password = null, ?int $port = null, array $options = [])`
	`28`	`+ public function __construct(string $scheme, string $host, string $user = null, string $password = null, int $port = null, array $options = [])`
`29`	`29`	`{`
`30`	`30`	`$this->scheme = $scheme;`
`31`	`31`	`$this->host = $host;`