Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[11x.] Improved typehints for InteractsWithDatabase #54748

Merged
merged 3 commits into from
Feb 23, 2025
Merged

[11x.] Improved typehints for InteractsWithDatabase #54748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a920f8e
InteractsWithDatabase typehints
cosmastech Feb 22, 2025
9560ed1
InteractsWithDatabase typehints for data
cosmastech Feb 22, 2025
8a8ffc9
HasInDatabase typehints
cosmastech Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ trait InteractsWithDatabase
/**
* Assert that a given where condition exists in the database.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param array $data
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param array<string, mixed> $data
* @param string|null $connection
* @return $this
*/
Expand All @@ -43,8 +43,8 @@ protected function assertDatabaseHas($table, array $data = [], $connection = nul
/**
* Assert that a given where condition does not exist in the database.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param array $data
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param array<string, mixed> $data
* @param string|null $connection
* @return $this
*/
Expand All @@ -69,7 +69,7 @@ protected function assertDatabaseMissing($table, array $data = [], $connection =
/**
* Assert the count of table entries.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param int $count
* @param string|null $connection
* @return $this
Expand All @@ -86,7 +86,7 @@ protected function assertDatabaseCount($table, int $count, $connection = null)
/**
* Assert that the given table has no entries.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param string|null $connection
* @return $this
*/
Expand All @@ -102,8 +102,8 @@ protected function assertDatabaseEmpty($table, $connection = null)
/**
* Assert the given record has been "soft deleted".
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param array $data
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param array<string, mixed> $data
* @param string|null $connection
* @param string|null $deletedAtColumn
* @return $this
Expand Down Expand Up @@ -134,8 +134,8 @@ protected function assertSoftDeleted($table, array $data = [], $connection = nul
/**
* Assert the given record has not been "soft deleted".
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param array $data
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param array<string, mixed> $data
* @param string|null $connection
* @param string|null $deletedAtColumn
* @return $this
Expand Down Expand Up @@ -166,7 +166,7 @@ protected function assertNotSoftDeleted($table, array $data = [], $connection =
/**
* Assert the given model exists in the database.
*
* @param \Illuminate\Database\Eloquent\Model $model
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $model
* @return $this
*/
protected function assertModelExists($model)
Expand All @@ -177,7 +177,7 @@ protected function assertModelExists($model)
/**
* Assert the given model does not exist in the database.
*
* @param \Illuminate\Database\Eloquent\Model $model
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $model
* @return $this
*/
protected function assertModelMissing($model)
Expand Down Expand Up @@ -255,7 +255,7 @@ public function castAsJson($value, $connection = null)
* Get the database connection.
*
* @param string|null $connection
* @param string|null $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @return \Illuminate\Database\Connection
*/
protected function getConnection($connection = null, $table = null)
Expand All @@ -270,7 +270,7 @@ protected function getConnection($connection = null, $table = null)
/**
* Get the table name from the given model or string.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @return string
*/
protected function getTable($table)
Expand All @@ -285,7 +285,7 @@ protected function getTable($table)
/**
* Get the table connection specified in the given model.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @return string|null
*/
protected function getTableConnection($table)
Expand All @@ -300,7 +300,7 @@ protected function getTableConnection($table)
/**
* Get the table column name used for soft deletes.
*
* @param string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @param string $defaultColumnName
* @return string
*/
Expand All @@ -312,7 +312,7 @@ protected function getDeletedAtColumn($table, $defaultColumnName = 'deleted_at')
/**
* Get the model entity from the given model or string.
*
* @param \Illuminate\Database\Eloquent\Model|string $table
* @param \Illuminate\Database\Eloquent\Model|class-string<\Illuminate\Database\Eloquent\Model>|string $table
* @return \Illuminate\Database\Eloquent\Model|null
*/
protected function newModelFor($table)
Expand All @@ -323,7 +323,7 @@ protected function newModelFor($table)
/**
* Seed a given database connection.
*
* @param array|string $class
* @param list<string>|class-string<\Illuminate\Database\Seeder>|string $class
* @return $this
*/
public function seed($class = 'Database\\Seeders\\DatabaseSeeder')
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Testing/Constraints/HasInDatabase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ class HasInDatabase extends Constraint
/**
* The data that will be used to narrow the search in the database table.
*
* @var array
* @var array<string, mixed>
*/
protected $data;

/**
* Create a new constraint instance.
*
* @param \Illuminate\Database\Connection $database
* @param array $data
* @param array<string, mixed> $data
* @return void
*/
public function __construct(Connection $database, array $data)
Expand Down
Loading