Skip to content

Commit a311598

Browse files
author
CrashSensei
committed
Activity Class refrence fixes
1 parent 357ed39 commit a311598

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

README.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ to
1212
composer require linearsoft/laravel-activitylog
1313
```
1414

15+
For your convenience the Activity facade infrastructure has been restored in this backport.
16+
All you need to do is register the facade:
17+
18+
```php
19+
// config/app.php
20+
'aliases' => [
21+
...
22+
'Activity' => Spatie\Activitylog\ActivitylogFacade::class,
23+
];
24+
```
25+
1526
### Testing
1627

1728
All testing has been stripped from the backport version.
@@ -126,16 +137,6 @@ Next, you must install the service provider:
126137
];
127138
```
128139

129-
And you must register the facade:
130-
131-
```php
132-
// config/app.php
133-
'aliases' => [
134-
...
135-
'Activity' => Spatie\Activitylog\ActivitylogFacade::class,
136-
];
137-
```
138-
139140
You can publish the migration with:
140141
```bash
141142
php artisan vendor:publish --provider="Spatie\Activitylog\ActivitylogServiceProvider" --tag="migrations"

src/ActivitylogServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function register()
5151
*
5252
* @return \Illuminate\Database\Eloquent\Model
5353
*/
54-
static public function determineActivityModel()
54+
static public function getActivityModelClass()
5555
{
5656
$activityModel = config('laravel-activitylog.activity_model') != null ?
5757
config('laravel-activitylog.activity_model') :
@@ -66,7 +66,7 @@ static public function determineActivityModel()
6666

6767
static public function getActivityModelInstance()
6868
{
69-
$activityModelClassName = self::determineActivityModel();
69+
$activityModelClassName = self::getActivityModelClass();
7070

7171
return new $activityModelClassName();
7272
}

src/CleanActivitylogCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function handle()
3030

3131
$cutOffDate = Carbon::now()->subDays($maxAgeInDays)->format('Y-m-d H:i:s');
3232

33-
$amountDeleted = Activity::where('created_at', '<', $cutOffDate)->delete();
33+
$amountDeleted = (ActivitylogServiceProvider::getActivityModelClass())::where('created_at', '<', $cutOffDate)->delete();
3434

3535
$this->info("Deleted {$amountDeleted} record(s) from the activity log.");
3636

src/Traits/CausesActivity.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Spatie\Activitylog\Traits;
44

55
use Illuminate\Database\Eloquent\Relations\MorphMany;
6+
use Spatie\Activitylog\ActivitylogServiceProvider;
67
use Spatie\Activitylog\Models\Activity;
78

89
trait CausesActivity
@@ -12,7 +13,7 @@ trait CausesActivity
1213
*/
1314
public function activity()
1415
{
15-
return $this->morphMany(Activity::class, 'causer');
16+
return $this->morphMany(ActivitylogServiceProvider::getActivityModelClass(), 'causer');
1617
}
1718

1819
/**

src/Traits/LogsActivity.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Illuminate\Database\Eloquent\Relations\MorphMany;
77
use Illuminate\Support\Collection;
88
use Spatie\Activitylog\ActivityLogger;
9+
use Spatie\Activitylog\ActivitylogServiceProvider;
910
use Spatie\Activitylog\Models\Activity;
1011

1112
trait LogsActivity
@@ -42,7 +43,7 @@ protected static function bootLogsActivity()
4243
*/
4344
public function activity()
4445
{
45-
return $this->morphMany(Activity::class, 'subject');
46+
return $this->morphMany(ActivitylogServiceProvider::getActivityModelClass(), 'subject');
4647
}
4748

4849
/**

0 commit comments

Comments
 (0)