Fixed: PHP 8.4 compatibility

src/Client/lib/Api/DefaultApi.php

@@ -121,9 +121,9 @@ class DefaultApi {
 	 * @param int             $hostIndex (Optional) host index to select the list of hosts if defined in the OpenAPI spec
 	 */
 	public function __construct(
-		ClientInterface $client = null,
-		Configuration $config = null,
-		HeaderSelector $selector = null,
+		?ClientInterface $client = null,
+		?Configuration $config = null,
+		?HeaderSelector $selector = null,
 		$hostIndex = 0
 	) {
 		$this->client         = $client ?: new Client();

src/Client/lib/Configuration.php

@@ -467,7 +467,7 @@ public function getHostFromSettings( $index, $variables = null ) {
 	 *
 	 * @return string URL based on host settings
 	 */
-	public static function getHostString( array $hostsSettings, $hostIndex, array $variables = null ) {
+	public static function getHostString( array $hostsSettings, $hostIndex, ?array $variables = null ) {
 		if ( null === $variables ) {
 			$variables = [];
 		}

src/Client/lib/Lib/GuzzleHttp/BodySummarizer.php

@@ -11,7 +11,7 @@ final class BodySummarizer implements BodySummarizerInterface
      */
     private $truncateAt;
 
-    public function __construct(int $truncateAt = null)
+    public function __construct(?int $truncateAt = null)
     {
         $this->truncateAt = $truncateAt;
     }

src/Client/lib/Lib/GuzzleHttp/Client.php

@@ -447,7 +447,7 @@ public function sendRequest( RequestInterface $request ): ResponseInterface {
 	 * @return mixed
 	 * @deprecated Client::getConfig will be removed in Plausible\Analytics\WP\Client\Lib\GuzzleHttp/guzzle:8.0.
 	 */
-	public function getConfig( string $option = null ) {
+	public function getConfig( ?string $option = null ) {
 		return $option === null ? $this->config : ( $this->config[ $option ] ?? null );
 	}
 }

src/Client/lib/Lib/GuzzleHttp/ClientInterface.php

@@ -80,5 +80,5 @@ public function requestAsync(string $method, $uri, array $options = []): Promise
      *
      * @deprecated ClientInterface::getConfig will be removed in Plausible\Analytics\WP\Client\Lib\GuzzleHttp/guzzle:8.0.
      */
-    public function getConfig(string $option = null);
+    public function getConfig(?string $option = null);
 }

src/Client/lib/Lib/GuzzleHttp/Cookie/CookieJar.php

@@ -103,7 +103,7 @@ public function toArray(): array
         }, $this->getIterator()->getArrayCopy());
     }
 
-    public function clear(string $domain = null, string $path = null, string $name = null): void
+	public function clear( ?string $domain = null, ?string $path = null, ?string $name = null ): void
     {
         if (!$domain) {
             $this->cookies = [];

src/Client/lib/Lib/GuzzleHttp/Cookie/CookieJarInterface.php

@@ -62,7 +62,7 @@ public function setCookie(SetCookie $cookie): bool;
      * @param string|null $path   Clears cookies matching a domain and path
      * @param string|null $name   Clears cookies matching a domain, path, and name
      */
-    public function clear(string $domain = null, string $path = null, string $name = null): void;
+	public function clear( ?string $domain = null, ?string $path = null, ?string $name = null ): void;
 
     /**
      * Discard all sessions cookies.

src/Client/lib/Lib/GuzzleHttp/Exception/BadResponseException.php

@@ -14,7 +14,7 @@ public function __construct(
         string $message,
         RequestInterface $request,
         ResponseInterface $response,
-        \Throwable $previous = null,
+	    ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         parent::__construct($message, $request, $response, $previous, $handlerContext);

src/Client/lib/Lib/GuzzleHttp/Exception/ConnectException.php

@@ -25,7 +25,7 @@ class ConnectException extends TransferException implements NetworkExceptionInte
     public function __construct(
         string $message,
         RequestInterface $request,
-        \Throwable $previous = null,
+	    ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         parent::__construct($message, 0, $previous);

src/Client/lib/Lib/GuzzleHttp/Exception/RequestException.php

@@ -32,8 +32,8 @@ class RequestException extends TransferException implements RequestExceptionInte
     public function __construct(
         string $message,
         RequestInterface $request,
-        ResponseInterface $response = null,
-        \Throwable $previous = null,
+	    ?ResponseInterface $response = null,
+	    ?\Throwable $previous = null,
         array $handlerContext = []
     ) {
         // Set the code of the exception if the response is set and not future.
@@ -63,10 +63,10 @@ public static function wrapException(RequestInterface $request, \Throwable $e):
      */
     public static function create(
         RequestInterface $request,
-        ResponseInterface $response = null,
-        \Throwable $previous = null,
+	    ?ResponseInterface $response = null,
+	    ?\Throwable $previous = null,
         array $handlerContext = [],
-        BodySummarizerInterface $bodySummarizer = null
+	    ?BodySummarizerInterface $bodySummarizer = null
     ): self {
         if (!$response) {
             return new self(

src/Client/lib/Lib/GuzzleHttp/Handler/MockHandler.php

@@ -52,7 +52,7 @@ class MockHandler implements \Countable
      * @param callable|null $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null $onRejected  Callback to invoke when the return value is rejected.
      */
-    public static function createWithMiddleware(array $queue = null, callable $onFulfilled = null, callable $onRejected = null): HandlerStack
+	public static function createWithMiddleware( ?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null ): HandlerStack
     {
         return HandlerStack::create(new self($queue, $onFulfilled, $onRejected));
     }
@@ -66,7 +66,7 @@ public static function createWithMiddleware(array $queue = null, callable $onFul
      * @param callable|null          $onFulfilled Callback to invoke when the return value is fulfilled.
      * @param callable|null          $onRejected  Callback to invoke when the return value is rejected.
      */
-    public function __construct(array $queue = null, callable $onFulfilled = null, callable $onRejected = null)
+	public function __construct( ?array $queue = null, ?callable $onFulfilled = null, ?callable $onRejected = null )
     {
         $this->onFulfilled = $onFulfilled;
         $this->onRejected = $onRejected;
@@ -200,7 +200,7 @@ public function reset(): void
     private function invokeStats(
         RequestInterface $request,
         array $options,
-        ResponseInterface $response = null,
+	    ?ResponseInterface $response = null,
         $reason = null
     ): void {
         if (isset($options['on_stats'])) {

src/Client/lib/Lib/GuzzleHttp/Handler/StreamHandler.php

@@ -83,8 +83,8 @@ private function invokeStats(
         array $options,
         RequestInterface $request,
         ?float $startTime,
-        ResponseInterface $response = null,
-        \Throwable $error = null
+	    ?ResponseInterface $response = null,
+	    ?\Throwable $error = null
     ): void {
         if (isset($options['on_stats'])) {
             $stats = new TransferStats($request, $response, Utils::currentTime() - $startTime, $error, []);

src/Client/lib/Lib/GuzzleHttp/HandlerStack.php

@@ -44,7 +44,7 @@ class HandlerStack
      *                                                                            handler is provided, the best handler for your
      *                                                                            system will be utilized.
      */
-    public static function create(callable $handler = null): self
+	public static function create( ?callable $handler = null ): self
     {
         $stack = new self($handler ?: Utils::chooseHandler());
         $stack->push(Middleware::httpErrors(), 'http_errors');
@@ -58,7 +58,7 @@ public static function create(callable $handler = null): self
     /**
      * @param (callable(RequestInterface, array): PromiseInterface)|null $handler Underlying HTTP handler.
      */
-    public function __construct(callable $handler = null)
+	public function __construct( ?callable $handler = null )
     {
         $this->handler = $handler;
     }
@@ -131,7 +131,7 @@ public function hasHandler(): bool
      * @param callable(callable): callable $middleware Middleware function
      * @param string                       $name       Name to register for this middleware.
      */
-    public function unshift(callable $middleware, string $name = null): void
+	public function unshift( callable $middleware, ?string $name = null ): void
     {
         \array_unshift($this->stack, [$middleware, $name]);
         $this->cached = null;

src/Client/lib/Lib/GuzzleHttp/MessageFormatter.php

@@ -68,7 +68,7 @@ public function __construct(?string $template = self::CLF)
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string
+	public function format( RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null ): string
     {
         $cache = [];
 

src/Client/lib/Lib/GuzzleHttp/MessageFormatterInterface.php

@@ -14,5 +14,5 @@ interface MessageFormatterInterface
      * @param ResponseInterface|null $response Response that was received
      * @param \Throwable|null        $error    Exception that was received
      */
-    public function format(RequestInterface $request, ResponseInterface $response = null, \Throwable $error = null): string;
+	public function format( RequestInterface $request, ?ResponseInterface $response = null, ?\Throwable $error = null ): string;
 }

src/Client/lib/Lib/GuzzleHttp/Middleware.php

@@ -55,7 +55,7 @@ static function (ResponseInterface $response) use ($cookieJar, $request): Respon
      *
      * @return callable(callable): callable Returns a function that accepts the next handler.
      */
-    public static function httpErrors(BodySummarizerInterface $bodySummarizer = null): callable
+	public static function httpErrors( ?BodySummarizerInterface $bodySummarizer = null ): callable
     {
         return static function (callable $handler) use ($bodySummarizer): callable {
             return static function ($request, array $options) use ($handler, $bodySummarizer) {
@@ -132,7 +132,7 @@ static function ($reason) use ($request, &$container, $options) {
      *
      * @return callable Returns a function that accepts the next handler.
      */
-    public static function tap(callable $before = null, callable $after = null): callable
+	public static function tap( ?callable $before = null, ?callable $after = null ): callable
     {
         return static function (callable $handler) use ($before, $after): callable {
             return static function (RequestInterface $request, array $options) use ($handler, $before, $after) {
@@ -176,7 +176,7 @@ public static function redirect(): callable
      *
      * @return callable Returns a function that accepts the next handler.
      */
-    public static function retry(callable $decider, callable $delay = null): callable
+	public static function retry( callable $decider, ?callable $delay = null ): callable
     {
         return static function (callable $handler) use ($decider, $delay): RetryMiddleware {
             return new RetryMiddleware($decider, $handler, $delay);

src/Client/lib/Lib/GuzzleHttp/Promise/Coroutine.php

@@ -84,8 +84,8 @@ public static function of(callable $generatorFn): self
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         return $this->result->then($onFulfilled, $onRejected);
     }

src/Client/lib/Lib/GuzzleHttp/Promise/Each.php

@@ -25,8 +25,8 @@ final class Each
      */
     public static function of(
         $iterable,
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         return (new EachPromise($iterable, [
             'fulfilled' => $onFulfilled,
@@ -50,8 +50,8 @@ public static function of(
     public static function ofLimit(
         $iterable,
         $concurrency,
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         return (new EachPromise($iterable, [
             'fulfilled' => $onFulfilled,
@@ -72,7 +72,7 @@ public static function ofLimit(
     public static function ofLimitAll(
         $iterable,
         $concurrency,
-        callable $onFulfilled = null
+	    ?callable $onFulfilled = null
     ): PromiseInterface {
         return self::ofLimit(
             $iterable,

src/Client/lib/Lib/GuzzleHttp/Promise/FulfilledPromise.php

@@ -31,8 +31,8 @@ public function __construct($value)
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         // Return itself if there is no onFulfilled function.
         if (!$onFulfilled) {

src/Client/lib/Lib/GuzzleHttp/Promise/Promise.php

@@ -25,16 +25,16 @@ class Promise implements PromiseInterface
      * @param callable $cancelFn Fn that when invoked cancels the promise.
      */
     public function __construct(
-        callable $waitFn = null,
-        callable $cancelFn = null
+	    ?callable $waitFn = null,
+	    ?callable $cancelFn = null
     ) {
         $this->waitFn = $waitFn;
         $this->cancelFn = $cancelFn;
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         if ($this->state === self::PENDING) {
             $p = new Promise(null, [$this, 'cancel']);

src/Client/lib/Lib/GuzzleHttp/Promise/PromiseInterface.php

@@ -27,8 +27,8 @@ interface PromiseInterface
      * @param callable $onRejected  Invoked when the promise is rejected.
      */
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface;
 
     /**

src/Client/lib/Lib/GuzzleHttp/Promise/RejectedPromise.php

@@ -31,8 +31,8 @@ public function __construct($reason)
     }
 
     public function then(
-        callable $onFulfilled = null,
-        callable $onRejected = null
+	    ?callable $onFulfilled = null,
+	    ?callable $onRejected = null
     ): PromiseInterface {
         // If there's no onRejected callback then just return self.
         if (!$onRejected) {

src/Client/lib/Lib/GuzzleHttp/Promise/Utils.php

@@ -21,7 +21,7 @@ final class Utils
      *
      * @param TaskQueueInterface|null $assign Optionally specify a new queue instance.
      */
-    public static function queue(TaskQueueInterface $assign = null): TaskQueueInterface
+    public static function queue(?TaskQueueInterface $assign = null): TaskQueueInterface
     {
         static $queue;
 

src/Client/lib/Lib/GuzzleHttp/Psr7/CachingStream.php

@@ -33,7 +33,7 @@ final class CachingStream implements StreamInterface
      */
     public function __construct(
         StreamInterface $stream,
-        StreamInterface $target = null
+	    ?StreamInterface $target = null
     ) {
         $this->remoteStream = $stream;
         $this->stream = $target ?: new Stream(Utils::tryFopen('php://temp', 'r+'));

src/Client/lib/Lib/GuzzleHttp/Psr7/HttpFactory.php

@@ -27,10 +27,10 @@ final class HttpFactory implements RequestFactoryInterface, ResponseFactoryInter
 {
     public function createUploadedFile(
         StreamInterface $stream,
-        int $size = null,
+	    ?int $size = null,
         int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
+	    ?string $clientFilename = null,
+	    ?string $clientMediaType = null
     ): UploadedFileInterface {
         if ($size === null) {
             $size = $stream->getSize();

src/Client/lib/Lib/GuzzleHttp/Psr7/MultipartStream.php

@@ -32,7 +32,7 @@ final class MultipartStream implements StreamInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(array $elements = [], string $boundary = null)
+	public function __construct( array $elements = [], ?string $boundary = null )
     {
         $this->boundary = $boundary ?: bin2hex(random_bytes(20));
         $this->stream = $this->createStream($elements);

src/Client/lib/Lib/GuzzleHttp/Psr7/Response.php

@@ -96,7 +96,7 @@ public function __construct(
         array $headers = [],
         $body = null,
         string $version = '1.1',
-        string $reason = null
+	    ?string $reason = null
     ) {
         $this->assertStatusCodeRange($status);
 

src/Client/lib/Lib/GuzzleHttp/Psr7/StreamWrapper.php

@@ -69,7 +69,7 @@ public static function register(): void
         }
     }
 
-    public function stream_open(string $path, string $mode, int $options, string &$opened_path = null): bool
+	public function stream_open( string $path, string $mode, int $options, ?string &$opened_path = null ): bool
     {
         $options = stream_context_get_options($this->context);
 

src/Client/lib/Lib/GuzzleHttp/Psr7/UploadedFile.php

@@ -64,8 +64,8 @@ public function __construct(
         $streamOrFile,
         ?int $size,
         int $errorStatus,
-        string $clientFilename = null,
-        string $clientMediaType = null
+	    ?string $clientFilename = null,
+	    ?string $clientMediaType = null
     ) {
         $this->setError($errorStatus);
         $this->size = $size;

src/Client/lib/Lib/GuzzleHttp/Psr7/Uri.php

@@ -279,7 +279,7 @@ public static function isRelativePathReference(UriInterface $uri): bool
      *
      * @see https://tools.ietf.org/html/rfc3986#section-4.4
      */
-    public static function isSameDocumentReference(UriInterface $uri, UriInterface $base = null): bool
+	public static function isSameDocumentReference( UriInterface $uri, ?UriInterface $base = null ): bool
     {
         if ($base !== null) {
             $uri = UriResolver::resolve($base, $uri);

src/Client/lib/Lib/GuzzleHttp/Psr7/Utils.php

@@ -231,7 +231,7 @@ public static function modifyRequest(RequestInterface $request, array $changes):
      * @param StreamInterface $stream    Stream to read from
      * @param int|null        $maxLength Maximum buffer length
      */
-    public static function readLine(StreamInterface $stream, int $maxLength = null): string
+	public static function readLine( StreamInterface $stream, ?int $maxLength = null ): string
     {
         $buffer = '';
         $size = 0;