Skip to content

[13.x] Allow assertDatabase has & missing to accept arrays #59752

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

Merged
taylorotwell merged 6 commits into from
Apr 18, 2026
+46 −0
Merged

[13.x] Allow assertDatabase has & missing to accept arrays #59752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b03193
apply logic
jackbayliss Apr 17, 2026
8f7f227
tests
jackbayliss Apr 17, 2026
67e363d
use brain
jackbayliss Apr 17, 2026
8510154
be explicit fam
jackbayliss Apr 17, 2026
d5be031
drop count
jackbayliss Apr 17, 2026
0e1f863
suPp0rtsssss
jackbayliss Apr 17, 2026
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
16 changes: 16 additions & 0 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 @@ -33,6 +33,14 @@ protected function assertDatabaseHas($table, array $data = [], $connection = nul
return $this;
}

if (array_is_list($data) && array_all($data, fn ($row) => is_array($row))) {
Copy link
Copy Markdown
Contributor

@ghabriel25 ghabriel25 Apr 18, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

array_all was introduced in php 8.4 while Laravel 13 minimum requirement is php 8.3. Correct me if I'm wrong about this

Copy link
Copy Markdown
Contributor Author

@jackbayliss jackbayliss Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's poly filled and used in the framework already😉

Copy link
Copy Markdown
Contributor

@ghabriel25 ghabriel25 Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks for the information 👍

Copy link
Copy Markdown
Contributor Author

@jackbayliss jackbayliss Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No probs man! Thanks for asking

foreach ($data as $row) {
$this->assertDatabaseHas($table, $row, $connection);
}

return $this;
}

if ($table instanceof Model) {
$data = [
$table->getKeyName() => $table->getKey(),
Expand Down Expand Up @@ -65,6 +73,14 @@ protected function assertDatabaseMissing($table, array $data = [], $connection =
return $this;
}

if (array_is_list($data) && array_all($data, fn ($row) => is_array($row))) {
foreach ($data as $row) {
$this->assertDatabaseMissing($table, $row, $connection);
}

return $this;
}

if ($table instanceof Model) {
$data = [
$table->getKeyName() => $table->getKey(),
Expand Down
30 changes: 30 additions & 0 deletions tests/Foundation/FoundationInteractsWithDatabaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,21 @@ public function testAssertDatabaseHasConstrainsToModel()
$this->assertDatabaseHas(new ProductStub(['id' => 1]), $data);
}

public function testAssertDatabaseSupportsArrays()
{
$builder = m::mock(Builder::class);
$builder->shouldReceive('where')->with(['title' => 'Spark', 'name' => 'Laravel'])->once()->andReturnSelf();
$builder->shouldReceive('where')->with(['title' => 'Forge', 'name' => 'Laravel'])->once()->andReturnSelf();
$builder->shouldReceive('exists')->twice()->andReturn(true);

$this->connection->shouldReceive('table')->with($this->table)->andReturn($builder);

$this->assertDatabaseHas($this->table, [
['title' => 'Spark', 'name' => 'Laravel'],
['title' => 'Forge', 'name' => 'Laravel'],
]);
}

public function testSeeInDatabaseDoesNotFindResults()
{
$this->expectException(ExpectationFailedException::class);
Expand Down Expand Up @@ -103,6 +118,21 @@ public function testSeeInDatabaseFindsManyNotMatchingResults()
$this->assertDatabaseHas($this->table, $this->data);
}

public function testAssertDatabaseMissingSupportsArrays()
{
$builder = m::mock(Builder::class);
$builder->shouldReceive('where')->with(['title' => 'Spark', 'name' => 'Laravel'])->once()->andReturnSelf();
$builder->shouldReceive('where')->with(['title' => 'Forge', 'name' => 'Laravel'])->once()->andReturnSelf();
$builder->shouldReceive('exists')->twice()->andReturn(false);

$this->connection->shouldReceive('table')->with($this->table)->andReturn($builder);

$this->assertDatabaseMissing($this->table, [
['title' => 'Spark', 'name' => 'Laravel'],
['title' => 'Forge', 'name' => 'Laravel'],
]);
}

public function testDontSeeInDatabaseDoesNotFindResults()
{
$this->mockCountBuilder(false);
Expand Down
Loading