enhance the serializer tests (#597)

* fix: enhance the serializer tests

* Fix styling

* fix: wip

---------

Co-authored-by: binaryk <binaryk@users.noreply.github.com>

pint.json

@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "nullable_type_declaration_for_default_null_value": false
+    }
+}

src/Bootstrap/RoutesDefinition.php

@@ -13,7 +13,7 @@ class RoutesDefinition
 {
     private array $excludedMiddleware = [];
 
-    public function __invoke(string $uriKey = null)
+    public function __invoke(?string $uriKey = null)
     {
         $prefix = $uriKey ?: '{repository}';
 

src/Commands/PublishAuthCommand.php

@@ -149,7 +149,7 @@ protected function getRouteStubs(): string
         return $routeStubs;
     }
 
-    protected function getRemainingActionsString(array $actions = null): string
+    protected function getRemainingActionsString(?array $actions = null): string
     {
         $allActions = ['login', 'register', 'resetPassword', 'forgotPassword', 'verifyEmail'];
 

src/Eager/Related.php

@@ -39,7 +39,7 @@ class Related implements JsonSerializable
 
     public ?RelatedQuery $relatedQuery = null;
 
-    public function __construct(string $relation, EagerField $field = null)
+    public function __construct(string $relation, ?EagerField $field = null)
     {
         $this->relation = $relation;
         $this->field = $field;

src/Exceptions/RepositoryException.php

@@ -11,14 +11,14 @@ public static function missingKey(string $class = 'Repository key missing.'): se
         return new self($class);
     }
 
-    public static function unauthorized(string $class = null): self
+    public static function unauthorized(?string $class = null): self
     {
         return new self(__('Unauthorized to view repository :name. Check "allowRestify" policy.', [
             'name' => $class,
         ]), code: 403);
     }
 
-    public static function routeUnauthorized(string $uri = null): self
+    public static function routeUnauthorized(?string $uri = null): self
     {
         return new self(__('Unauthorized to use the route :name. Check prefix.', [
             'name' => $uri,

src/Fields/BelongsTo.php

@@ -16,7 +16,7 @@ class BelongsTo extends EagerField implements Sortable
 
     public ?array $searchablesAttributes = null;
 
-    public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
+    public function fillAttribute(RestifyRequest $request, $model, ?int $bulkRow = null)
     {
         /** * @var Model $relatedModel */
         $relatedModel = $model->{$this->relation}()->getModel();

src/Fields/BelongsToMany.php

@@ -29,7 +29,7 @@ class BelongsToMany extends EagerField
      */
     public $detachCallback;
 
-    public function __construct($relation, string $parentRepository = null)
+    public function __construct($relation, ?string $parentRepository = null)
     {
         parent::__construct($relation, $parentRepository);
 

src/Fields/EagerField.php

@@ -28,7 +28,7 @@ class EagerField extends Field
 
     private RelatedQuery $relatedQuery;
 
-    public function __construct($attribute, string $parentRepository = null)
+    public function __construct($attribute, ?string $parentRepository = null)
     {
         parent::__construct(attribute: $attribute);
 
@@ -101,7 +101,7 @@ public function resolve($repository, $attribute = null)
     }
 
     public function getRelation(
-        Repository $repository = null
+        ?Repository $repository = null
     ): Relation {
         $repository = $repository ?? $this->parentRepository;
 

src/Fields/Field.php

@@ -133,7 +133,7 @@ class Field extends OrganicField implements JsonSerializable
      * @param  string|callable|null  $attribute
      * @param  callable|null  $resolveCallback
      */
-    public function __construct($attribute, callable|Closure $resolveCallback = null)
+    public function __construct($attribute, callable|Closure|null $resolveCallback = null)
     {
         $this->attribute = $attribute;
 
@@ -210,7 +210,7 @@ public function fillCallback(callable|Closure $callback)
      *
      * @return mixed|void
      */
-    public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
+    public function fillAttribute(RestifyRequest $request, $model, ?int $bulkRow = null)
     {
         $this->resolveValueBeforeUpdate($request, $model);
 
@@ -258,7 +258,7 @@ public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = nu
     /**
      * Fill the model with value from the request.
      */
-    protected function fillAttributeFromRequest(RestifyRequest $request, $model, $attribute, int $bulkRow = null)
+    protected function fillAttributeFromRequest(RestifyRequest $request, $model, $attribute, ?int $bulkRow = null)
     {
         $attribute = is_null($bulkRow)
             ? $attribute
@@ -279,7 +279,7 @@ protected function fillAttributeFromRequest(RestifyRequest $request, $model, $at
     /**
      * Fill the model with value from the callback.
      */
-    protected function fillAttributeFromCallback(RestifyRequest $request, $model, $attribute, int $bulkRow = null)
+    protected function fillAttributeFromCallback(RestifyRequest $request, $model, $attribute, ?int $bulkRow = null)
     {
         if (is_callable($cb = $this->guessBeforeFillableCallable($request))) {
             $value = $request->input($attribute ?? $this->attribute);

src/Fields/File.php

@@ -48,7 +48,7 @@ class File extends Field implements DeletableContract, StorableContract
      */
     public $storageCallback;
 
-    public function __construct($attribute, callable $resolveCallback = null)
+    public function __construct($attribute, ?callable $resolveCallback = null)
     {
         parent::__construct($attribute, $resolveCallback);
 
@@ -81,7 +81,7 @@ public function storeAs($storeAs): self
      *
      * @return $this
      */
-    public function resolveUsingTemporaryUrl(bool $resolveTemporaryUrl = true, CarbonInterface $expiration = null, array $options = []): self
+    public function resolveUsingTemporaryUrl(bool $resolveTemporaryUrl = true, ?CarbonInterface $expiration = null, array $options = []): self
     {
         if (! $resolveTemporaryUrl) {
             return $this;
@@ -126,7 +126,7 @@ public function resolveUsingFullUrl(): self
     /**
      * Prepare the storage callback.
      */
-    protected function prepareStorageCallback(callable $storageCallback = null): void
+    protected function prepareStorageCallback(?callable $storageCallback = null): void
     {
         $this->storageCallback = $storageCallback ?? function ($request, $model) {
             return $this->mergeExtraStorageColumns($request, [
@@ -227,7 +227,7 @@ protected function columnsThatShouldBeDeleted(): array
         return $attributes;
     }
 
-    public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
+    public function fillAttribute(RestifyRequest $request, $model, ?int $bulkRow = null)
     {
         if (is_null($file = $request->file($this->attribute)) || ! $file->isValid()) {
             return $this;

src/Fields/HasMany.php

@@ -12,7 +12,7 @@ class HasMany extends EagerField
 {
     protected $canEnableRelationshipCallback;
 
-    public function __construct($relation, string $parentRepository = null)
+    public function __construct($relation, ?string $parentRepository = null)
     {
         parent::__construct($relation, $parentRepository);
 
@@ -48,7 +48,7 @@ public function resolve($repository, $attribute = null)
         return $this;
     }
 
-    public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
+    public function fillAttribute(RestifyRequest $request, $model, ?int $bulkRow = null)
     {
         //
     }

src/Fields/HasOne.php

@@ -10,7 +10,7 @@ class HasOne extends EagerField implements Sortable
 {
     use CanSort;
 
-    public function fillAttribute(RestifyRequest $request, $model, int $bulkRow = null)
+    public function fillAttribute(RestifyRequest $request, $model, ?int $bulkRow = null)
     {
         //
     }

src/Fields/Image.php

@@ -7,7 +7,7 @@
 
 class Image extends File
 {
-    public function __construct($attribute, callable $resolveCallback = null)
+    public function __construct($attribute, ?callable $resolveCallback = null)
     {
         parent::__construct($attribute, $resolveCallback);
 

src/Filters/AdvancedFilter.php

@@ -32,7 +32,7 @@ public function validatePayload(RestifyRequest $request, AdvancedFilterPayloadDa
         return $this;
     }
 
-    protected function input(string $key = null, $default = null)
+    protected function input(?string $key = null, $default = null)
     {
         return data_get($this->dataObject->value, $key, $default);
     }

src/Filters/RelatedDto.php

@@ -21,7 +21,7 @@ class RelatedDto
     public string $rootKey = '';
 
     public function __construct(
-        RelatedQueryCollection $related = null,
+        ?RelatedQueryCollection $related = null,
     ) {
         $this->related = $related ?? RelatedQueryCollection::make([]);
     }

src/Filters/RelatedQuery.php

@@ -14,7 +14,7 @@ public function __construct(
         public string $relation,
         public bool $loaded = false,
         public array $columns = ['*'],
-        RelatedQueryCollection $nested = null,
+        ?RelatedQueryCollection $nested = null,
     ) {
         $this->nested = $nested ?? RelatedQueryCollection::make([]);
         $this->tree = $relation;

src/Filters/SortableFilter.php

@@ -131,7 +131,7 @@ public function resolveFrontendColumn(): self
         return $this;
     }
 
-    public function syncDirection(string $direction = null): self
+    public function syncDirection(?string $direction = null): self
     {
         if (! is_null($direction) && in_array($direction, ['asc', 'desc'])) {
             $this->direction = $direction;

src/Http/Requests/Concerns/InteractWithRepositories.php

@@ -60,21 +60,21 @@ public function repository($key = null): Repository
         }
     }
 
-    public function repositoryWith(Model $model, string $uriKey = null): Repository
+    public function repositoryWith(Model $model, ?string $uriKey = null): Repository
     {
         $repository = $this->repository($uriKey);
 
         return $repository::resolveWith($model);
     }
 
-    public function model(string $uriKey = null): Model
+    public function model(?string $uriKey = null): Model
     {
         $repository = $this->repository($uriKey);
 
         return $repository::newModel();
     }
 
-    public function newQuery(string $uriKey = null): Builder|Relation
+    public function newQuery(?string $uriKey = null): Builder|Relation
     {
         if (! $this->isViaRepository()) {
             return $this->model($uriKey)->newQuery();
@@ -88,7 +88,7 @@ public function viaQuery(): Relation
         return $this->relatedEagerField()->getRelation();
     }
 
-    public function modelQuery(string $repositoryId = null, string $uriKey = null): Builder|Relation
+    public function modelQuery(?string $repositoryId = null, ?string $uriKey = null): Builder|Relation
     {
         return $this->newQuery($uriKey)->whereKey(
             $repositoryId ?? $this->route('repositoryId')

src/Models/ActionLog.php

@@ -47,7 +47,7 @@ class ActionLog extends Model
 
     public const ACTION_DELETED = 'Deleted';
 
-    public static function forRepositoryStored(Model $model, Authenticatable $user = null, array $dirty = null): self
+    public static function forRepositoryStored(Model $model, ?Authenticatable $user = null, ?array $dirty = null): self
     {
         return new static([
             'batch_id' => (string) Str::uuid(),
@@ -69,7 +69,7 @@ public static function forRepositoryStored(Model $model, Authenticatable $user =
         ]);
     }
 
-    public static function forRepositoryUpdated(Model $model, Authenticatable $user = null): self
+    public static function forRepositoryUpdated(Model $model, ?Authenticatable $user = null): self
     {
         return new static([
             'batch_id' => (string) Str::uuid(),
@@ -91,7 +91,7 @@ public static function forRepositoryUpdated(Model $model, Authenticatable $user
         ]);
     }
 
-    public static function forRepositoryDestroy(Model $model, Authenticatable $user = null): self
+    public static function forRepositoryDestroy(Model $model, ?Authenticatable $user = null): self
     {
         return new static([
             'batch_id' => (string) Str::uuid(),
@@ -113,7 +113,7 @@ public static function forRepositoryDestroy(Model $model, Authenticatable $user
         ]);
     }
 
-    public static function forRepositoryAction(Action $action, Model $model, Authenticatable $user = null): self
+    public static function forRepositoryAction(Action $action, Model $model, ?Authenticatable $user = null): self
     {
         return new static([
             'batch_id' => (string) Str::uuid(),
@@ -139,7 +139,7 @@ public static function register(
         string $name,
         Model $actionable,
         array $attributes = [],
-        Authenticatable $user = null
+        ?Authenticatable $user = null
     ): self {
         return new static(array_merge([
             'batch_id' => (string) Str::uuid(),

src/Repositories/Concerns/Testing.php

@@ -16,9 +16,9 @@
 trait Testing
 {
     public static function route(
-        string|Model $path = null,
+        string|Model|null $path = null,
         array $query = [],
-        Action|callable $action = null,
+        Action|callable|null $action = null,
     ): string {
         if ($path instanceof Model) {
             $path = $path->getKey();
@@ -47,19 +47,19 @@ public static function route(
     /**
      * @param  Action  $action
      */
-    public static function action(string $action, string|int $key = null): string
+    public static function action(string $action, string|int|null $key = null): string
     {
         return static::route($key, action: app($action));
     }
 
-    public static function getter(string $getter, string|int $key = null): string
+    public static function getter(string $getter, string|int|null $key = null): string
     {
         $path = $key ? "$key/getters" : 'getters';
 
         return static::route($path.'/'.Getter::guessUriKey(app($getter)));
     }
 
-    public function dd(string $prop = null): void
+    public function dd(?string $prop = null): void
     {
         if (is_null($prop)) {
             dd($this);

src/Repositories/Repository.php

@@ -1052,7 +1052,7 @@ public function jsonSerialize()
         return $this->serializeForShow(app(RestifyRequest::class));
     }
 
-    private function modelAttributes(Request $request = null): Collection
+    private function modelAttributes(?Request $request = null): Collection
     {
         return collect(method_exists($this->resource, 'toArray') ? $this->resource->toArray() : []);
     }
@@ -1071,7 +1071,7 @@ protected static function fillBulkFields(
         RestifyRequest $request,
         Model $model,
         Collection $fields,
-        int $bulkRow = null
+        ?int $bulkRow = null
     ) {
         return $fields->map(function (Field $field) use ($request, $model, $bulkRow) {
             return $field->fillAttribute($request, $model, $bulkRow);
@@ -1098,7 +1098,7 @@ public static function getDetachers(): array
         return static::$detachers;
     }
 
-    public function eager(EagerField $field = null): Repository
+    public function eager(?EagerField $field = null): Repository
     {
         if (! $field) {
             $this->eagerState = false;

src/Repositories/Serializer.php

@@ -133,7 +133,7 @@ public function jsonSerialize(): mixed
         ]);
     }
 
-    private function request(string $class = null): RestifyRequest
+    private function request(?string $class = null): RestifyRequest
     {
         /**
          * @var RestifyRequest $request