Increase PHPStan level

src/Eloquent/Relations/Traits/IsCustomizable.php

@@ -25,7 +25,7 @@ trait IsCustomizable
     /**
      * The custom constraints callback for an eager load of the relation.
      *
-     * @var callable(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, array<int, TDeclaringModel>): void
+     * @var callable(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, array<int, \Illuminate\Database\Eloquent\Model>): void
      */
     protected $customEagerConstraintsCallback = null;
 
@@ -65,7 +65,7 @@ public function withCustomThroughKeyCallback(callable $callback): static
     /**
      * Set the custom constraints callback for an eager load of the relation.
      *
-     * @param callable(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, array<int, TDeclaringModel>): void $callback
+     * @param callable(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, array<int, \Illuminate\Database\Eloquent\Model>): void $callback
      * @return $this
      */
     public function withCustomEagerConstraintsCallback(callable $callback): static

src/Eloquent/Relations/Traits/RetrievesIntermediateTables.php

@@ -15,7 +15,10 @@ trait RetrievesIntermediateTables
     /**
      * The intermediate tables to retrieve.
      *
-     * @var array<string, array{table: string, columns: array<string>, class: class-string<\Illuminate\Database\Eloquent\Model>, postProcessor: callable|null}>
+     * @var array<string, array{table: string,
+     *     columns: array<int, string>,
+     *     class: class-string<\Illuminate\Database\Eloquent\Model>,
+     *     postProcessor: callable(\Illuminate\Database\Eloquent\Model, array<string, mixed>): array<string, mixed>|null}>
      */
     protected $intermediateTables = [];
 
@@ -44,7 +47,7 @@ public function withIntermediate($class, array $columns = ['*'], $accessor = nul
      * @param list<string> $columns
      * @param class-string<\Illuminate\Database\Eloquent\Model> $class
      * @param string|null $accessor
-     * @param callable|null $postProcessor
+     * @param callable(\Illuminate\Database\Eloquent\Model, array<string, mixed>): array<string, mixed>|null $postProcessor
      * @return $this
      */
     public function withPivot(
@@ -58,6 +61,7 @@ public function withPivot(
             /** @var \Illuminate\Database\Connection $connection */
             $connection = $this->query->getConnection();
 
+            /** @var array<int, string> $columns */
             $columns = $connection->getSchemaBuilder()->getColumnListing($table);
         }
 
@@ -75,7 +79,7 @@ public function withPivot(
     /**
      * Get the intermediate columns for the relation.
      *
-     * @return array<string>
+     * @return array<int, string>
      */
     protected function intermediateColumns()
     {
@@ -131,7 +135,10 @@ protected function hydrateIntermediateRelations(array $models)
      * Get the intermediate relationship from the query.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
-     * @param array{table: string, columns: array<string>, class: class-string<\Illuminate\Database\Eloquent\Model>, postProcessor: callable|null} $intermediateTable
+     * @param array{table: string,
+     *     columns: array<int, string>,
+     *     class: class-string<\Illuminate\Database\Eloquent\Model>,
+     *     postProcessor: callable(\Illuminate\Database\Eloquent\Model, array<string, mixed>): array<string, mixed>|null} $intermediateTable
      * @param string $prefix
      * @return \Illuminate\Database\Eloquent\Model
      */
@@ -195,7 +202,7 @@ protected function prefix($accessor)
     /**
      * Get the intermediate tables.
      *
-     * @return array<string, array{table: string, columns: array<string>, class: class-string<\Illuminate\Database\Eloquent\Model>, postProcessor: callable|null}>
+     * @return array<string, array{table: string, columns: array<int, string>, class: class-string<\Illuminate\Database\Eloquent\Model>, postProcessor: callable|null}>
      */
     public function getIntermediateTables(): array
     {

src/Eloquent/Relations/Traits/SupportsCompositeKeys.php

@@ -51,7 +51,7 @@ protected function addConstraintsWithCompositeKey(): void
     /**
      * Set the constraints for an eager load of the relation for a leading composite key.
      *
-     * @param array<\Illuminate\Database\Eloquent\Model> $models
+     * @param array<int, \Illuminate\Database\Eloquent\Model> $models
      * @return void
      */
     protected function addEagerConstraintsWithCompositeKey(array $models): void
@@ -159,7 +159,7 @@ protected function buildDictionaryWithCompositeKey(Collection $results): array
     /**
      * Get the columns to select for a leading composite key.
      *
-     * @return array<string>
+     * @return array<int, string>
      */
     protected function shouldSelectWithCompositeKey(): array
     {

src/HasManyDeep.php

@@ -144,7 +144,7 @@ protected function performJoin(?Builder $query = null)
      * Set the select clause for the relation query.
      *
      * @param list<string> $columns
-     * @return array<string>
+     * @return array<int, string>
      */
     protected function shouldSelect(array $columns = ['*'])
     {