Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 4fa858cb4ea8 · 2021-06-30T15:58:03.000+02:00
* 5.3:
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.3.4
  Update VERSION for 5.3.3
  Update CHANGELOG for 5.3.3
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  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/Internal/AmpClientState.php b/Internal/AmpClientState.php
@@ -149,7 +149,7 @@ private function getClient(array $options): array
             public $uri;
             public $handle;
 
-            public function connect(string $uri, ?ConnectContext $context = null, ?CancellationToken $token = null): Promise
+            public function connect(string $uri, ConnectContext $context = null, CancellationToken $token = null): Promise
             {
                 $result = $this->connector->connect($this->uri ?? $uri, $context, $token);
                 $result->onResolve(function ($e, $socket) {

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ private function getClient(array $options): array`
`149`	`149`	`public $uri;`
`150`	`150`	`public $handle;`
`151`	`151`
`152`		`- public function connect(string $uri, ?ConnectContext $context = null, ?CancellationToken $token = null): Promise`
	`152`	`+ public function connect(string $uri, ConnectContext $context = null, CancellationToken $token = null): Promise`
`153`	`153`	`{`
`154`	`154`	`$result = $this->connector->connect($this->uri ?? $uri, $context, $token);`
`155`	`155`	`$result->onResolve(function ($e, $socket) {`