Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions src/ActivityLogger.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ public function by(Model | int | string | null $modelOrId): static

public function causedByAnonymous(): static
{
$this->activity->causer_id = null;
$this->activity->causer_type = null;
$activity = $this->getActivity();

$activity->causer_id = null;
$activity->causer_type = null;

return $this;
}
Expand All @@ -95,7 +97,7 @@ public function event(string $event): static

public function setEvent(string $event): static
{
$this->activity->event = $event;
$this->getActivity()->event = $event;

return $this;
}
Expand Down Expand Up @@ -160,7 +162,7 @@ public function log(string $description): ?ActivityContract
return null;
}

$activity = $this->activity;
$activity = $this->getActivity();

$activity->description = $this->replacePlaceholders(
$activity->description ?? $description,
Expand Down
2 changes: 2 additions & 0 deletions src/Facades/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
*/
class Activity extends Facade
{
protected static $cached = false;

protected static function getFacadeAccessor(): string
{
return PendingActivityLog::class;
Expand Down
20 changes: 20 additions & 0 deletions tests/ActivityLoggerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,26 @@
expect($this->getLastActivity()->description)->toEqual($this->activityDescription);
});

it('will return a new instance of PendingActivityLog through the facade', function () {
$instance1 = ActivityFacade::log($this->activityDescription);
$instance2 = ActivityFacade::log($this->activityDescription);

expect($instance1)->not->toBe($instance2);
});

it('can log multiple consecutive activities', function () {
ActivityFacade::log($this->activityDescription);

ActivityFacade::causedByAnonymous()
->event('created')
->log($this->activityDescription);

expect($this->getLastActivity()->description)->toEqual($this->activityDescription);
expect($this->getLastActivity()->event)->toEqual('created');
expect($this->getLastActivity()->causer_id)->toBeNull();
expect($this->getLastActivity()->causer_type)->toBeNull();
});

it('will not log an activity when the log is not enabled', function () {
config(['activitylog.enabled' => false]);

Expand Down
Loading