fix: remove php 8.4 deprecation notices

lindyhopchris · lindyhopchris · commit 9d27d3298077 · 2024-11-29T15:36:36.000Z
diff --git a/src/Contracts/Spec/ResourceDocumentComplianceChecker.php b/src/Contracts/Spec/ResourceDocumentComplianceChecker.php
@@ -24,7 +24,7 @@ interface ResourceDocumentComplianceChecker
      * @param ResourceId|string|null $id
      * @return $this
      */
-    public function mustSee(ResourceType|string $type, ResourceId|string $id = null): static;
+    public function mustSee(ResourceType|string $type, ResourceId|string|null $id = null): static;
 
     /**
      * Check whether the provided content passes compliance with the JSON:API spec.
diff --git a/src/Core/Auth/Container.php b/src/Core/Auth/Container.php
@@ -64,7 +64,7 @@ public static function resolver(): callable
     public function __construct(
         private readonly ContainerResolver $container,
         private readonly SchemaContainer $schemas,
-        callable $resolver = null
+        ?callable $resolver = null
     ) {
         $this->resolver = $resolver ?? self::resolver();
     }
diff --git a/src/Core/Bus/Commands/Result.php b/src/Core/Bus/Commands/Result.php
@@ -29,7 +29,7 @@ class Result implements ResultContract
      * @param Payload|null $payload
      * @return self
      */
-    public static function ok(Payload $payload = null): self
+    public static function ok(?Payload $payload = null): self
     {
         return new self(true, $payload ?? new Payload(null, false));
     }
diff --git a/src/Core/Http/Actions/AttachRelationship/AttachRelationshipActionInput.php b/src/Core/Http/Actions/AttachRelationship/AttachRelationshipActionInput.php
@@ -48,7 +48,7 @@ public function __construct(
         ResourceType $type,
         ResourceId $id,
         string $fieldName,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/Destroy/DestroyActionInput.php b/src/Core/Http/Actions/Destroy/DestroyActionInput.php
@@ -40,7 +40,7 @@ public function __construct(
         Request $request,
         ResourceType $type,
         ResourceId $id,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/DetachRelationship/DetachRelationshipActionInput.php b/src/Core/Http/Actions/DetachRelationship/DetachRelationshipActionInput.php
@@ -48,7 +48,7 @@ public function __construct(
         ResourceType $type,
         ResourceId $id,
         string $fieldName,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/FetchOne/FetchOneActionInput.php b/src/Core/Http/Actions/FetchOne/FetchOneActionInput.php
@@ -40,7 +40,7 @@ public function __construct(
         Request $request,
         ResourceType $type,
         ResourceId $id,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/FetchRelated/FetchRelatedActionInput.php b/src/Core/Http/Actions/FetchRelated/FetchRelatedActionInput.php
@@ -42,7 +42,7 @@ public function __construct(
         ResourceType $type,
         ResourceId $id,
         string $fieldName,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/FetchRelationship/FetchRelationshipActionInput.php b/src/Core/Http/Actions/FetchRelationship/FetchRelationshipActionInput.php
@@ -42,7 +42,7 @@ public function __construct(
         ResourceType $type,
         ResourceId $id,
         string $fieldName,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/Update/UpdateActionInput.php b/src/Core/Http/Actions/Update/UpdateActionInput.php
@@ -46,7 +46,7 @@ public function __construct(
         Request $request,
         ResourceType $type,
         ResourceId $id,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Actions/UpdateRelationship/UpdateRelationshipActionInput.php b/src/Core/Http/Actions/UpdateRelationship/UpdateRelationshipActionInput.php
@@ -49,7 +49,7 @@ public function __construct(
         ResourceType $type,
         ResourceId $id,
         string $fieldName,
-        object $model = null,
+        ?object $model = null,
     ) {
         parent::__construct($request, $type);
         $this->id = $id;
diff --git a/src/Core/Http/Exceptions/HttpNotAcceptableException.php b/src/Core/Http/Exceptions/HttpNotAcceptableException.php
@@ -27,7 +27,7 @@ class HttpNotAcceptableException extends HttpException
      */
     public function __construct(
         string $message = '',
-        Throwable $previous = null,
+        ?Throwable $previous = null,
         array $headers = [],
         int $code = 0
     ) {
diff --git a/src/Core/Http/Exceptions/HttpUnsupportedMediaTypeException.php b/src/Core/Http/Exceptions/HttpUnsupportedMediaTypeException.php
@@ -27,7 +27,7 @@ class HttpUnsupportedMediaTypeException extends HttpException
      */
     public function __construct(
         string $message = '',
-        Throwable $previous = null,
+        ?Throwable $previous = null,
         array $headers = [],
         int $code = 0
     ) {
diff --git a/src/Core/Responses/Concerns/HasHeaders.php b/src/Core/Responses/Concerns/HasHeaders.php
@@ -25,7 +25,7 @@ trait HasHeaders
      * @param string|null $value
      * @return $this
      */
-    public function withHeader(string $name, string $value = null): static
+    public function withHeader(string $name, ?string $value = null): static
     {
         $this->headers[$name] = $value;
 
diff --git a/src/Core/Schema/Schema.php b/src/Core/Schema/Schema.php
@@ -125,7 +125,7 @@ public function getIterator(): Traversable
     /**
      * @inheritDoc
      */
-    public function url($extra = [], bool $secure = null): string
+    public function url($extra = [], ?bool $secure = null): string
     {
         $extra = Arr::wrap($extra);
 
diff --git a/tests/Integration/Http/Actions/UpdateTest.php b/tests/Integration/Http/Actions/UpdateTest.php
@@ -500,7 +500,7 @@ private function willValidateOperation(object $model, ResourceObject $resource,
      * @param object|null $model
      * @return stdClass
      */
-    private function willStore(string $type, array $validated, object $model = null): object
+    private function willStore(string $type, array $validated, ?object $model = null): object
     {
         $model = $model ?? new \stdClass();
 
diff --git a/tests/Unit/Bus/Commands/Middleware/ValidateRelationshipCommandTest.php b/tests/Unit/Bus/Commands/Middleware/ValidateRelationshipCommandTest.php
@@ -95,7 +95,7 @@ public static function commandProvider(): array
     {
         return [
             'update' => [
-                function (ResourceType $type, Request $request = null): UpdateRelationshipCommand {
+                function (ResourceType $type, ?Request $request = null): UpdateRelationshipCommand {
                     $operation = new UpdateToOne(
                         new Ref(type: $type, id: new ResourceId('123'), relationship: 'author'),
                         new ResourceIdentifier(new ResourceType('users'), new ResourceId('456')),
@@ -105,7 +105,7 @@ function (ResourceType $type, Request $request = null): UpdateRelationshipComman
                 },
             ],
             'attach' => [
-                function (ResourceType $type, Request $request = null): AttachRelationshipCommand {
+                function (ResourceType $type, ?Request $request = null): AttachRelationshipCommand {
                     $operation = new UpdateToMany(
                         OpCodeEnum::Add,
                         new Ref(type: $type, id: new ResourceId('123'), relationship: 'tags'),
@@ -116,7 +116,7 @@ function (ResourceType $type, Request $request = null): AttachRelationshipComman
                 },
             ],
             'detach' => [
-                function (ResourceType $type, Request $request = null): DetachRelationshipCommand {
+                function (ResourceType $type, ?Request $request = null): DetachRelationshipCommand {
                     $operation = new UpdateToMany(
                         OpCodeEnum::Remove,
                         new Ref(type: $type, id: new ResourceId('123'), relationship: 'tags'),
diff --git a/tests/Unit/Bus/Queries/FetchRelated/Middleware/AuthorizeFetchRelatedQueryTest.php b/tests/Unit/Bus/Queries/FetchRelated/Middleware/AuthorizeFetchRelatedQueryTest.php
@@ -199,7 +199,7 @@ private function willAuthorize(
         ?Request $request,
         object $model,
         string $fieldName,
-        ErrorList $expected = null
+        ?ErrorList $expected = null
     ): void
     {
         $this->authorizerFactory
diff --git a/tests/Unit/Bus/Queries/FetchRelationship/Middleware/AuthorizeFetchRelationshipQueryTest.php b/tests/Unit/Bus/Queries/FetchRelationship/Middleware/AuthorizeFetchRelationshipQueryTest.php
@@ -199,7 +199,7 @@ private function willAuthorize(
         ?Request $request,
         object $model,
         string $fieldName,
-        ErrorList $expected = null
+        ?ErrorList $expected = null
     ): void
     {
         $this->authorizerFactory
diff --git a/tests/Unit/Extensions/Atomic/Parsers/HrefParserTest.php b/tests/Unit/Extensions/Atomic/Parsers/HrefParserTest.php
@@ -184,7 +184,7 @@ public function testItParsesHrefAndConvertsUriSegmentsToExpectedValues(ParsedHre
      * @param string|null $relationship
      * @return void
      */
-    private function withSchema(ParsedHref $expected, ResourceType $type = null, string $relationship = null): void
+    private function withSchema(ParsedHref $expected, ?ResourceType $type = null, ?string $relationship = null): void
     {
         $type = $type ?? $expected->type;
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public static function resolver(): callable`
`64`	`64`	`public function __construct(`
`65`	`65`	`private readonly ContainerResolver $container,`
`66`	`66`	`private readonly SchemaContainer $schemas,`
`67`		`- callable $resolver = null`
	`67`	`+ ?callable $resolver = null`
`68`	`68`	`) {`
`69`	`69`	`$this->resolver = $resolver ?? self::resolver();`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Result implements ResultContract`
`29`	`29`	`* @param Payload\|null $payload`
`30`	`30`	`* @return self`
`31`	`31`	`*/`
`32`		`- public static function ok(Payload $payload = null): self`
	`32`	`+ public static function ok(?Payload $payload = null): self`
`33`	`33`	`{`
`34`	`34`	`return new self(true, $payload ?? new Payload(null, false));`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ trait HasHeaders`
`25`	`25`	`* @param string\|null $value`
`26`	`26`	`* @return $this`
`27`	`27`	`*/`
`28`		`- public function withHeader(string $name, string $value = null): static`
	`28`	`+ public function withHeader(string $name, ?string $value = null): static`
`29`	`29`	`{`
`30`	`30`	`$this->headers[$name] = $value;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function getIterator(): Traversable`
`125`	`125`	`/**`
`126`	`126`	`* @inheritDoc`
`127`	`127`	`*/`
`128`		`- public function url($extra = [], bool $secure = null): string`
	`128`	`+ public function url($extra = [], ?bool $secure = null): string`
`129`	`129`	`{`
`130`	`130`	`$extra = Arr::wrap($extra);`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ private function willValidateOperation(object $model, ResourceObject $resource,`
`500`	`500`	`* @param object\|null $model`
`501`	`501`	`* @return stdClass`
`502`	`502`	`*/`
`503`		`- private function willStore(string $type, array $validated, object $model = null): object`
	`503`	`+ private function willStore(string $type, array $validated, ?object $model = null): object`
`504`	`504`	`{`
`505`	`505`	`$model = $model ?? new \stdClass();`
`506`	`506`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ private function willAuthorize(`
`199`	`199`	`?Request $request,`
`200`	`200`	`object $model,`
`201`	`201`	`string $fieldName,`
`202`		`- ErrorList $expected = null`
	`202`	`+ ?ErrorList $expected = null`
`203`	`203`	`): void`
`204`	`204`	`{`
`205`	`205`	`$this->authorizerFactory`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public function testItParsesHrefAndConvertsUriSegmentsToExpectedValues(ParsedHre`
`184`	`184`	`* @param string\|null $relationship`
`185`	`185`	`* @return void`
`186`	`186`	`*/`
`187`		`- private function withSchema(ParsedHref $expected, ResourceType $type = null, string $relationship = null): void`
	`187`	`+ private function withSchema(ParsedHref $expected, ?ResourceType $type = null, ?string $relationship = null): void`
`188`	`188`	`{`
`189`	`189`	`$type = $type ?? $expected->type;`
`190`	`190`