Make implicit nullable types explicit (#111)

src/Certificate.php

@@ -17,7 +17,7 @@ final class Certificate
  * @param string $certFile Certificate file with the certificate + intermediaries.
  * @param string|null $keyFile Key file with the corresponding private key or `null` if the key is in $certFile.
  */
- public function __construct(string $certFile, string $keyFile = null)
+ public function __construct(string $certFile, ?string $keyFile = null)
  {
  $this->certFile = $certFile;
  $this->keyFile = $keyFile ?? $certFile;

src/ClientTlsContext.php

@@ -179,7 +179,7 @@ public function getVerificationDepth(): int
  *
  * @return self Cloned, modified instance.
  */
- public function withCiphers(string $ciphers = null): self
+ public function withCiphers(?string $ciphers = null): self
  {
  $clone = clone $this;
  $clone->ciphers = $ciphers;
@@ -202,7 +202,7 @@ public function getCiphers(): string
  *
  * @return self Cloned, modified instance.
  */
- public function withCaFile(string $cafile = null): self
+ public function withCaFile(?string $cafile = null): self
  {
  $clone = clone $this;
  $clone->caFile = $cafile;
@@ -225,7 +225,7 @@ public function getCaFile(): ?string
  *
  * @return self Cloned, modified instance.
  */
- public function withCaPath(string $capath = null): self
+ public function withCaPath(?string $capath = null): self
  {
  $clone = clone $this;
  $clone->caPath = $capath;
@@ -361,7 +361,7 @@ public function getSecurityLevel(): int
  *
  * @return self Cloned, modified instance.
  */
- public function withCertificate(Certificate $certificate = null): self
+ public function withCertificate(?Certificate $certificate = null): self
  {
  $clone = clone $this;
  $clone->certificate = $certificate;

src/Internal/functions.php

@@ -191,7 +191,7 @@ function shutdownTls($socket): Promise
  *
  * @throws \Error If an invalid option has been passed.
  */
-function normalizeBindToOption(string $bindTo = null)
+function normalizeBindToOption(?string $bindTo = null)
 {
  if ($bindTo === null) {
  return null;

src/PendingAcceptError.php

@@ -10,7 +10,7 @@ final class PendingAcceptError extends \Error
  public function __construct(
  string $message = 'The previous accept operation must complete before accept can be called again',
  int $code = 0,
- \Throwable $previous = null
+ ?\Throwable $previous = null
  ) {
  parent::__construct($message, $code, $previous);
  }

src/PendingReceiveError.php

@@ -10,7 +10,7 @@ final class PendingReceiveError extends \Error
  public function __construct(
  string $message = 'The previous receive operation must complete before receive can be called again',
  int $code = 0,
- \Throwable $previous = null
+ ?\Throwable $previous = null
  ) {
  parent::__construct($message, $code, $previous);
  }

src/ServerTlsContext.php

@@ -87,7 +87,7 @@ public function getMinimumVersion(): int
  *
  * @return self Cloned, modified instance.
  */
- public function withPeerName(string $peerName = null): self
+ public function withPeerName(?string $peerName = null): self
  {
  $clone = clone $this;
  $clone->peerName = $peerName;
@@ -171,7 +171,7 @@ public function getVerificationDepth(): int
  *
  * @return self Cloned, modified instance.
  */
- public function withCiphers(string $ciphers = null): self
+ public function withCiphers(?string $ciphers = null): self
  {
  $clone = clone $this;
  $clone->ciphers = $ciphers;
@@ -194,7 +194,7 @@ public function getCiphers(): string
  *
  * @return self Cloned, modified instance.
  */
- public function withCaFile(string $cafile = null): self
+ public function withCaFile(?string $cafile = null): self
  {
  $clone = clone $this;
  $clone->caFile = $cafile;
@@ -217,7 +217,7 @@ public function getCaFile(): ?string
  *
  * @return self Cloned, modified instance.
  */
- public function withCaPath(string $capath = null): self
+ public function withCaPath(?string $capath = null): self
  {
  $clone = clone $this;
  $clone->caPath = $capath;
@@ -276,7 +276,7 @@ public function hasPeerCapturing(): bool
  *
  * @return self Cloned, modified instance.
  */
- public function withDefaultCertificate(Certificate $defaultCertificate = null): self
+ public function withDefaultCertificate(?Certificate $defaultCertificate = null): self
  {
  $clone = clone $this;
  $clone->defaultCertificate = $defaultCertificate;

src/SocketPool.php

@@ -33,8 +33,8 @@ interface SocketPool
  */
  public function checkout(
  string $uri,
- ConnectContext $context = null,
- CancellationToken $token = null
+ ?ConnectContext $context = null,
+ ?CancellationToken $token = null
  ): Promise;
 
  /**

src/UnlimitedSocketPool.php

@@ -42,8 +42,8 @@ public function __construct(int $idleTimeout = 10000, ?Connector $connector = nu
  /** @inheritdoc */
  public function checkout(
  string $uri,
- ConnectContext $context = null,
- CancellationToken $token = null
+ ?ConnectContext $context = null,
+ ?CancellationToken $token = null
  ): Promise {
  // A request might already be cancelled before we reach the checkout, so do not even attempt to checkout in that
  // case. The weird logic is required to throw the token's exception instead of creating a new one.
@@ -203,8 +203,8 @@ private function normalizeUri(string $uri): array
  private function checkoutNewSocket(
  string $uri,
  string $cacheKey,
- ConnectContext $connectContext = null,
- CancellationToken $token = null
+ ?ConnectContext $connectContext = null,
+ ?CancellationToken $token = null
  ): Promise {
  return call(function () use ($uri, $cacheKey, $connectContext, $token) {
  $this->pendingCount[$uri] = ($this->pendingCount[$uri] ?? 0) + 1;

src/functions.php

@@ -37,7 +37,7 @@ function listen(string $uri, ?BindContext $context = null): Server
  *
  * @return Connector
  */
-function connector(Connector $connector = null): Connector
+function connector(?Connector $connector = null): Connector
 {
  if ($connector === null) {
  if ($connector = Loop::getState(LOOP_CONNECTOR_IDENTIFIER)) {
@@ -64,7 +64,7 @@ function connector(Connector $connector = null): Connector
  * @throws ConnectException
  * @throws CancelledException
  */
-function connect(string $uri, ConnectContext $context = null, CancellationToken $token = null): Promise
+function connect(string $uri, ?ConnectContext $context = null, ?CancellationToken $token = null): Promise
 {
  return connector()->connect($uri, $context, $token);
 }