Support PHP 8.4+

ICanBoogie · Nov 2, 2024 · 64ee73c · 64ee73c
1 parent 77cc0f3
commit 64ee73c
Show file tree

Hide file tree

Showing 21 changed files with 28 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -43,6 +43,11 @@ test-container-83:
 	@-docker-compose run --rm app83 bash
 	@docker-compose down -v
 
+.PHONY: test-container-84
+test-container-84:
+	@-docker-compose run --rm app84 bash
+	@docker-compose down -v
+
 .PHONY: lint
 lint:
 	@XDEBUG_MODE=off phpcs -s

diff --git a/lib/AuthenticationRequired.php b/lib/AuthenticationRequired.php
@@ -28,7 +28,7 @@ class AuthenticationRequired extends ClientError implements SecurityError
     public function __construct(
         string $message = self::DEFAULT_MESSAGE,
         int $code = ResponseStatus::STATUS_UNAUTHORIZED,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/ClientError.php b/lib/ClientError.php
@@ -24,9 +24,9 @@ class ClientError extends \Exception implements Exception
      * @inheritdoc
      */
     public function __construct(
-        string $message = null,
+        ?string $message = null,
         int $code = ResponseStatus::STATUS_BAD_REQUEST,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/FileInfo.php b/lib/FileInfo.php
@@ -64,7 +64,7 @@ class FileInfo
      * @return string The MIME type of the file, or `application/octet-stream` if it could not
      * be determined.
      */
-    public static function resolve_type(string $pathname, string &$extension = null): string
+    public static function resolve_type(string $pathname, ?string &$extension = null): string
     {
         $extension = '.' . \strtolower(\pathinfo($pathname, PATHINFO_EXTENSION));
         $types = self::TYPES;

diff --git a/lib/ForceRedirect.php b/lib/ForceRedirect.php
@@ -25,7 +25,7 @@ class ForceRedirect extends \Exception implements Exception
     public function __construct(
         public readonly string $location,
         int $code = ResponseStatus::STATUS_FOUND,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($this->format_message($location), $code, $previous);
     }

diff --git a/lib/Headers/CacheControl.php b/lib/Headers/CacheControl.php
@@ -290,7 +290,7 @@ private function set_cacheable(bool|string|null $value): void
     /**
      * If they are defined, the object is initialized with the cache directives.
      */
-    public function __construct(string $cache_directives = null)
+    public function __construct(?string $cache_directives = null)
     {
         if ($cache_directives) {
             $this->modify($cache_directives);

diff --git a/lib/Headers/ContentDisposition.php b/lib/Headers/ContentDisposition.php
@@ -41,7 +41,7 @@ class ContentDisposition extends Header
      *
      * @inheritdoc
      */
-    public function __construct(string $value = null, array $attributes = [])
+    public function __construct(?string $value = null, array $attributes = [])
     {
         $this->parameters['filename'] = new HeaderParameter('filename');
 

diff --git a/lib/Headers/ContentType.php b/lib/Headers/ContentType.php
@@ -43,7 +43,7 @@ class ContentType extends Header
      *
      * @inheritdoc
      */
-    public function __construct(string $value = null, array $attributes = [])
+    public function __construct(?string $value = null, array $attributes = [])
     {
         $this->parameters['charset'] = new HeaderParameter('charset');
 

diff --git a/lib/MethodNotAllowed.php b/lib/MethodNotAllowed.php
@@ -20,7 +20,7 @@ class MethodNotAllowed extends ClientError implements Exception
 {
     public function __construct(
         public readonly string $method,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct(
             "Method not allowed: $method.",

diff --git a/lib/NotFound.php b/lib/NotFound.php
@@ -26,7 +26,7 @@ class NotFound extends ClientError implements Exception
     public function __construct(
         string $message = self::DEFAULT_MESSAGE,
         int $code = ResponseStatus::STATUS_NOT_FOUND,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/PermissionRequired.php b/lib/PermissionRequired.php
@@ -26,7 +26,7 @@ class PermissionRequired extends ClientError implements SecurityError
     public function __construct(
         string $message = self::DEFAULT_MESSAGE,
         int $code = ResponseStatus::STATUS_UNAUTHORIZED,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/RecoverEvent.php b/lib/RecoverEvent.php
@@ -25,7 +25,7 @@ class RecoverEvent extends Event
     public function __construct(
         Throwable &$sender,
         public readonly Request $request,
-        Response &$response = null
+        ?Response &$response = null
     ) {
         $this->response = &$response;
         $this->exception = &$sender;

diff --git a/lib/Responder/WithEvent/BeforeRespondEvent.php b/lib/Responder/WithEvent/BeforeRespondEvent.php
@@ -24,7 +24,7 @@ class BeforeRespondEvent extends Event
 
     public function __construct(
         public readonly Request $request,
-        Response &$response = null
+        ?Response &$response = null
     ) {
         $this->response = &$response;
 

diff --git a/lib/Responder/WithEvent/RespondEvent.php b/lib/Responder/WithEvent/RespondEvent.php
@@ -24,7 +24,7 @@ class RespondEvent extends Event
 
     public function __construct(
         public readonly Request $request,
-        Response &$response = null
+        ?Response &$response = null
     ) {
         $this->response = &$response;
 

diff --git a/lib/ServerError.php b/lib/ServerError.php
@@ -24,9 +24,9 @@ class ServerError extends \Exception implements Exception
      * @inheritdoc
      */
     public function __construct(
-        string $message = null,
+        ?string $message = null,
         int $code = ResponseStatus::STATUS_INTERNAL_SERVER_ERROR,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/ServiceUnavailable.php b/lib/ServiceUnavailable.php
@@ -28,7 +28,7 @@ class ServiceUnavailable extends ServerError implements Exception
     public function __construct(
         string $message = self::DEFAULT_MESSAGE,
         int $code = ResponseStatus::STATUS_SERVICE_UNAVAILABLE,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/lib/Status.php b/lib/Status.php
@@ -521,7 +521,7 @@ protected function get_message(): string
         return $message;
     }
 
-    public function __construct(int $code = ResponseStatus::STATUS_OK, string $message = null)
+    public function __construct(int $code = ResponseStatus::STATUS_OK, ?string $message = null)
     {
         self::assert_code_is_valid($code);
 

diff --git a/lib/StatusCodeNotValid.php b/lib/StatusCodeNotValid.php
@@ -23,9 +23,9 @@ class StatusCodeNotValid extends InvalidArgumentException implements Exception
 {
     public function __construct(
         public readonly int $status_code,
-        string $message = null,
+        ?string $message = null,
         int $code = ResponseStatus::STATUS_INTERNAL_SERVER_ERROR,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message ?: $this->format_message($status_code), $code, $previous);
     }

diff --git a/tests/FileResponseTest.php b/tests/FileResponseTest.php
@@ -259,7 +259,7 @@ public function test_get_is_modified(
         bool $expected,
         array $request_headers,
         false|int $modified_time = false,
-        string $etag = null
+        ?string $etag = null
     ): void {
         $file = create_file();
         if ($modified_time) {

diff --git a/tests/Headers/HeaderTest.php b/tests/Headers/HeaderTest.php
@@ -152,7 +152,7 @@ class A extends Header
 {
     public const VALUE_ALIAS = 'type';
 
-    public function __construct($value = null, array $attributes = [])
+    public function __construct(mixed $value = null, array $attributes = [])
     {
         $this->parameters['p'] = new HeaderParameter('p');
 

diff --git a/tests/ResponderProvider/ChainTest.php b/tests/ResponderProvider/ChainTest.php
@@ -47,7 +47,7 @@ public function test_chain_with_no_match(): void
         $this->assertNull($chain->responder_for_request(Request::from()));
     }
 
-    public function makeProvider(Responder $responder = null, bool $shouldNotBeCalled = false): ResponderProvider
+    public function makeProvider(?Responder $responder = null, bool $shouldNotBeCalled = false): ResponderProvider
     {
         $provider = $this->createMock(ResponderProvider::class);
         $provider