Skip to content

fix(AuditModel): cast auditable_id to integer #448

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
merged 2 commits into from
Oct 11, 2018
Merged

fix(AuditModel): cast auditable_id to integer #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
958330a
fix(AuditableModel): cast auditable_id to integer
tiagojpdias Oct 2, 2018
506dd2e
test(AuditModel): tested casted auditable_id
tiagojpdias Oct 10, 2018
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
5 changes: 3 additions & 2 deletions src/Models/Audit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class Audit extends Model implements \OwenIt\Auditing\Contracts\Audit
* {@inheritdoc}
*/
protected $casts = [
'old_values' => 'json',
'new_values' => 'json',
'old_values' => 'json',
'new_values' => 'json',
'auditable_id' => 'integer',
];
}
46 changes: 46 additions & 0 deletions tests/Unit/AuditableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use OwenIt\Auditing\Redactors\RightRedactor;
use OwenIt\Auditing\Tests\Models\Article;
use OwenIt\Auditing\Tests\Models\User;
use ReflectionClass;

class AuditableTest extends AuditingTestCase
{
Expand Down Expand Up @@ -951,6 +952,51 @@ public function itFailsToTransitionWhenTheAuditAuditableIdDoesNotMatchTheModelId
$secondModel->transitionTo($firstAudit);
}

/**
* @group Auditable::transitionTo
* @test
*/
public function itFailsToTransitionWhenTheAuditAuditableIdTypeDoesNotMatchTheModelIdType()
{
$this->expectException(AuditableTransitionException::class);
$this->expectExceptionMessage('Expected Auditable id 1, got 1 instead');

$model = factory(Article::class)->create();

$audit = factory(Audit::class)->create([
'auditable_type' => Article::class,
'auditable_id' => (string) $model->id,
]);

// Make sure the auditable_id isn't being cast
$auditReflection = new ReflectionClass($audit);

$auditCastsProperty = $auditReflection->getProperty('casts');
$auditCastsProperty->setAccessible(true);
$auditCastsProperty->setValue($audit, [
'old_values' => 'json',
'new_values' => 'json',
]);

$model->transitionTo($audit);
}

/**
* @group Auditable::transitionTo
* @test
*/
public function itTransitionsWhenTheAuditAuditableIdTypeDoesNotMatchTheModelIdType()
{
$model = factory(Article::class)->create();

$audit = factory(Audit::class)->create([
'auditable_type' => Article::class,
'auditable_id' => (string) $model->id,
]);

$this->assertInstanceOf(Auditable::class, $model->transitionTo($audit));
}

/**
* @group Auditable::transitionTo
* @test
Expand Down