Fix many problems

phpstan.neon.dist

@@ -7,7 +7,8 @@ parameters:
     paths:
         - src/
         - config/
-        - database/
+# TODO
+#        - database/
         - routes/
     level: 5
     checkAlwaysTrueCheckTypeFunctionCall: true
@@ -23,8 +24,11 @@ parameters:
     checkInternalClassCaseSensitivity: true
     ignoreErrors:
         - '#^Unsafe usage of new static#'
+        # --- TODO-s ---
         # Tricky readonlys
         - '#Assign it in the constructor\.$#'
         - '#is assigned outside of the constructor\.$#'
-        # View vs. View contract
-        - '#render\(\) should return Illuminate\\View\\View but#'
+        # X vs. X contract
+        - '#but returns Illuminate\\Contracts\\#'
+        # SoftDeletes
+        - '#(\$forceDeleting|::withTrashed|::onlyTrashed|::trashed|::restore)#'

src/Fields/BelongsTo.php

@@ -6,6 +6,10 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo as EloquentRelation;
 use Illuminate\Http\Request;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\BelongsTo
+ * @extends \Cone\Root\Fields\Relation<TRelation>
+ */
 class BelongsTo extends Relation
 {
     /**

src/Fields/BelongsToMany.php

@@ -9,6 +9,10 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\BelongsToMany
+ * @extends \Cone\Root\Fields\Relation<TRelation>
+ */
 class BelongsToMany extends Relation
 {
     use ResolvesFields;

src/Fields/Boolean.php

@@ -27,7 +27,7 @@ public function __construct(string $label, string $modelAttribute = null)
      */
     public function getValueForHydrate(Request $request): mixed
     {
-        return $request->boolean([$this->getRequestKey()]);
+        return $request->boolean($this->getRequestKey());
     }
 
     /**

src/Fields/Fieldset.php

@@ -31,8 +31,8 @@ protected function resolveField(Request $request, Field $field): void
      */
     public function persist(Request $request, Model $model, mixed $value): void
     {
-        $this->resolveFields($request)->each(static function (Field $field) use ($request): void {
-            $field->persist($request, $field->getValueForHydrate($request));
+        $this->resolveFields($request)->each(static function (Field $field) use ($request, $model): void {
+            $field->persist($request, $model, $field->getValueForHydrate($request));
         });
     }
 
@@ -41,8 +41,8 @@ public function persist(Request $request, Model $model, mixed $value): void
      */
     public function resolveHydrate(Request $request, Model $model, mixed $value): void
     {
-        $this->resolveFields($request)->each(static function (Field $field) use ($request): void {
-            $field->resolveHydrate($request, $field->getValueForHydrate($request));
+        $this->resolveFields($request)->each(static function (Field $field) use ($request, $model): void {
+            $field->resolveHydrate($request, $model, $field->getValueForHydrate($request));
         });
     }
 
@@ -77,7 +77,7 @@ public function toValidate(Request $request, Model $model): array
     {
         return array_merge(
             parent::toValidate($request, $model),
-            $this->resolveFields($request)->mapToValidate($request)
+            $this->resolveFields($request)->mapToValidate($request, $model)
         );
     }
 }

src/Fields/HasMany.php

@@ -6,6 +6,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany as EloquentRelation;
 
+/**
+ * @extends \Cone\Root\Fields\HasOneOrMany<\Illuminate\Database\Eloquent\Relations\HasMany>
+ */
 class HasMany extends HasOneOrMany
 {
     /**

src/Fields/HasOne.php

@@ -5,6 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne as EloquentRelation;
 
+/**
+ * @extends \Cone\Root\Fields\HasOneOrMany<\Illuminate\Database\Eloquent\Relations\HasOne>
+ */
 class HasOne extends HasOneOrMany
 {
     /**

src/Fields/HasOneOrMany.php

@@ -7,6 +7,10 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\HasOneOrMany
+ * @extends \Cone\Root\Fields\Relation<TRelation>
+ */
 abstract class HasOneOrMany extends Relation
 {
     /**

src/Fields/Meta.php

@@ -9,6 +9,9 @@
 use Illuminate\Database\Eloquent\Relations\MorphOne as EloquentRelation;
 use Illuminate\Http\Request;
 
+/**
+ * @extends \Cone\Root\Fields\MorphOne<\Illuminate\Database\Eloquent\Relations\MorphOne>
+ */
 class Meta extends MorphOne
 {
     /**

src/Fields/MorphMany.php

@@ -5,6 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany as EloquentRelation;
 
+/**
+ * @extends \Cone\Root\Fields\MorphOneOrMany<\Illuminate\Database\Eloquent\Relations\MorphMany>
+ */
 class MorphMany extends MorphOneOrMany
 {
     /**

src/Fields/MorphOne.php

@@ -5,6 +5,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphOne as EloquentRelation;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\MorphOne
+ * @extends \Cone\Root\Fields\MorphOneOrMany<TRelation>
+ */
 class MorphOne extends MorphOneOrMany
 {
     /**

src/Fields/MorphOneOrMany.php

@@ -5,6 +5,10 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphOneOrMany as EloquentRelation;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\MorphOneOrMany
+ * @extends \Cone\Root\Fields\HasOneOrMany<TRelation>
+ */
 abstract class MorphOneOrMany extends HasOneOrMany
 {
     /**

src/Fields/MorphTo.php

@@ -5,6 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo as EloquentRelation;
 
+/**
+ * @extends \Cone\Root\Fields\BelongsTo<\Illuminate\Database\Eloquent\Relations\MorphTo>
+ */
 class MorphTo extends BelongsTo
 {
     /**

src/Fields/MorphToMany.php

@@ -5,6 +5,9 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphToMany as EloquentRelation;
 
+/**
+ * @extends \Cone\Root\Fields\BelongsToMany<\Illuminate\Database\Eloquent\Relations\MorphToMany>
+ */
 class MorphToMany extends BelongsToMany
 {
     /**

src/Fields/Relation.php

@@ -10,6 +10,9 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
+/**
+ * @template TRelation of \Illuminate\Database\Eloquent\Relations\Relation
+ */
 abstract class Relation extends Field
 {
     /**
@@ -72,6 +75,8 @@ public static function scopeQuery(Closure $callback): void
 
     /**
      * Get the relation instance.
+     *
+     * @phpstan-return TRelation
      */
     public function getRelation(Model $model): EloquentRelation
     {

src/Resources/Resources.php

@@ -9,6 +9,9 @@
 use Illuminate\Support\Traits\ForwardsCalls;
 use Throwable;
 
+/**
+ * @mixin \Illuminate\Support\Collection
+ */
 class Resources
 {
     use ForwardsCalls;

src/Support/Slug.php

@@ -152,7 +152,7 @@ static function (Builder $query): Builder {
         $value = is_null($match) ? $value : preg_replace_callback(
             sprintf('/%s([\d]+)?$/', preg_quote($this->separator)),
             static function (array $match): string {
-                return str_replace($match[1], ((int) $match[1]) + 1, $match[0]);
+                return str_replace($match[1], (string)(((int) $match[1]) + 1), $match[0]);
             },
             $match
         );