PHP 8.4 compatibility: explicit nullables

Author: milo

src/Github/Api.php

@@ -27,13 +27,13 @@ class Api
 	private ?OAuth\Token $token = null;
 
 
-	public function __construct(Http\IClient $client = null)
+	public function __construct(?Http\IClient $client = null)
 	{
 		$this->client = $client ?: Helpers::createDefaultClient();
 	}
 
 
-	public function setToken(OAuth\Token $token = null): static
+	public function setToken(?OAuth\Token $token = null): static
 	{
 		$this->token = $token;
 		return $this;
@@ -46,7 +46,7 @@ public function getToken(): ?OAuth\Token
 	}
 
 
-	public function setDefaultParameters(array $defaults = null): static
+	public function setDefaultParameters(?array $defaults = null): static
 	{
 		$this->defaultParameters = $defaults ?: [];
 		return $this;
@@ -189,7 +189,7 @@ public function request(Http\Request $request): Http\Response
 	 * @throws MissingParameterException  when substitution is used in URL but parameter is missing
 	 * @throws JsonException  when encoding to JSON fails
 	 */
-	public function createRequest(string $method, string $urlPath, array $parameters = [], array $headers = [], string|array|object $content = null): Http\Request
+	public function createRequest(string $method, string $urlPath, array $parameters = [], array $headers = [], string|array|object|null $content = null): Http\Request
 	{
 		if (stripos($urlPath, $this->url) === 0) {  # Allows non-HTTPS URLs
 			$baseUrl = $this->url;
@@ -225,7 +225,7 @@ public function createRequest(string $method, string $urlPath, array $parameters
 	 *
 	 * @throws ApiException
 	 */
-	public function decode(Http\Response $response, array $okCodes = null): mixed
+	public function decode(Http\Response $response, ?array $okCodes = null): mixed
 	{
 		$content = $response->getContent();
 		if (preg_match('~application/json~i', $response->getHeader('Content-Type', ''))) {
@@ -460,7 +460,7 @@ private function prefix(array $flags, string $name, string $value): string
 	}
 
 
-	private function escape(array $flags, string|int|false $value, int $maxLength = null): string
+	private function escape(array $flags, string|int|false $value, ?int $maxLength = null): string
 	{
 		$value = (string) $value;
 

src/Github/Http/CachedClient.php

@@ -28,7 +28,7 @@ class CachedClient implements IClient
 	 */
 	public function __construct(
 		private Storages\ICache $cache,
-		IClient $client = null,
+		?IClient $client = null,
 		private bool $forbidRecheck = false,
 	) {
 		$this->client = $client ?: Github\Helpers::createDefaultClient();

src/Github/Http/Message.php

@@ -35,7 +35,7 @@ public function hasHeader(string $name): bool
 	}
 
 
-	public function getHeader(string $name, string $default = null): ?string
+	public function getHeader(string $name, ?string $default = null): ?string
 	{
 		$name = strtolower($name);
 		return array_key_exists($name, $this->headers)

src/Github/Http/Request.php

@@ -26,7 +26,7 @@ public function __construct(
 		private string $method,
 		private string $url,
 		array $headers = [],
-		string $content = null
+		?string $content = null
 	) {
 		parent::__construct($headers, $content);
 	}

src/Github/Http/Response.php

@@ -63,7 +63,7 @@ public function getPrevious(): ?Response
 	/**
 	 * @throws Github\LogicException
 	 */
-	public function setPrevious(Response $previous = null): static
+	public function setPrevious(?Response $previous = null): static
 	{
 		if ($this->previous) {
 			throw new Github\LogicException('Previous response is already set.');

src/Github/OAuth/Login.php

@@ -29,8 +29,8 @@ class Login
 
 	public function __construct(
 		private Configuration $conf,
-		Storages\ISessionStorage $storage = null,
-		Http\IClient $client = null
+		?Storages\ISessionStorage $storage = null,
+		?Http\IClient $client = null
 	) {
 		$this->storage = $storage ?: new Storages\SessionStorage;
 		$this->client = $client ?: Github\Helpers::createDefaultClient();
@@ -47,7 +47,7 @@ public function getClient(): Http\IClient
 	 * @param  string $backUrl  URL to redirect back from GitHub when user approves the permissions request
 	 * @param  ?callable $redirectCb  makes HTTP redirect to GitHub
 	 */
-	public function askPermissions(string $backUrl, callable $redirectCb = null): void
+	public function askPermissions(string $backUrl, ?callable $redirectCb = null): void
 	{
 		/** @todo Something more safe? */
 		$state = sha1(uniqid((string) microtime(true), true));

src/Github/exceptions.php

@@ -49,7 +49,7 @@ abstract class ApiException extends RuntimeException
 		private ?Http\Response $response;
 
 
-		public function __construct(string $message = '', int $code = 0, \Exception $previous = null, Http\Response $response = null)
+		public function __construct(string $message = '', int $code = 0, ?\Exception $previous = null, ?Http\Response $response = null)
 		{
 			parent::__construct($message, $code, $previous);
 			$this->response = clone $response;