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

Jump to bottom

fix: [Model] casting causes TypeError when finding no record #8871

Merged
merged 3 commits into from
May 10, 2024
Merged

fix: [Model] casting causes TypeError when finding no record #8871

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
1969472
test: add test cases for finding returns null
kenjis May 8, 2024
5c05447
Fix bug #8806
avegacms Apr 19, 2024
4639608
Update Model.php
avegacms Apr 19, 2024
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
4 changes: 2 additions & 2 deletions system/Model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ protected function doFind(bool $singleton, $id = null)
$row = $builder->get()->getResult($this->tempReturnType);
}

if ($useCast) {
if ($useCast && $row !== null) {
$row = $this->convertToReturnType($row, $returnType);

$this->tempReturnType = $returnType;
Expand Down Expand Up @@ -318,7 +318,7 @@ protected function doFirst()

$row = $builder->limit(1, 0)->get()->getFirstRow($this->tempReturnType);

if ($useCast) {
if ($useCast && $row !== null) {
$row = $this->convertToReturnType($row, $returnType);

$this->tempReturnType = $returnType;
Expand Down
30 changes: 30 additions & 0 deletions tests/system/Models/DataConverterModelTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,16 @@ public function testFindAsArray(): void
$this->seeInDatabase('user', ['name' => 'Sm9obiBTbWl0aA==']);
}

public function testFindAsArrayReturnsNull(): void
{
$this->createModel(UserCastsTimestampModel::class);
$this->db->table('user')->truncate();

$user = $this->model->find(1);

$this->assertNull($user);
}

/**
* @return int|string Insert ID
*/
Expand Down Expand Up @@ -102,6 +112,16 @@ public function testFindAllAsArray(): void
$this->assertInstanceOf(Time::class, $users[1]['created_at']);
}

public function testFindAllAsArrayReturnsNull(): void
{
$this->createModel(UserCastsTimestampModel::class);
$this->db->table('user')->truncate();

$users = $this->model->findAll();

$this->assertSame([], $users);
}

private function prepareTwoRecords(): void
{
$this->prepareOneRecord();
Expand Down Expand Up @@ -170,6 +190,16 @@ public function testFirstAsArray(): void
$this->assertInstanceOf(Time::class, $user['created_at']);
}

public function testFirstAsArrayReturnsNull(): void
{
$this->createModel(UserCastsTimestampModel::class);
$this->db->table('user')->truncate();

$user = $this->model->first();

$this->assertNull($user);
}

public function testFirstAsObject(): void
{
$this->prepareTwoRecords();
Expand Down
Loading