psr2

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 All Notable changes to `spatie/laravel-activitylog` will be documented in this file
 
+## 1.4.0 - 2016-08-10
+- Added support for soft deletes
+
 ## 1.3.2 - 2016-08-09
 - This version replaces version `1.3.0`
 - Dropped L5.1 compatibility

README.md

@@ -141,7 +141,7 @@ return [
  /**
  * When set to true, the subject returns soft deleted models
  */
- 'subject_withTrashed' => false
+ 'subject_returns_soft_deleted_models' => false
 ];
 ```
 

config/laravel-activitylog.php

@@ -23,5 +23,5 @@
  /**
  * When set to true, the subject returns soft deleted models
  */
- 'subject_withTrashed' => false,
+ 'subject_returns_soft_deleted_models' => false,
 ];

src/Models/Activity.php

@@ -19,8 +19,10 @@ class Activity extends Eloquent
 
  public function subject(): MorphTo
  {
- if (config('laravel-activitylog.subject_withTrashed'))
- return $this->morphTo()->withTrashed(); 
+ if (config('laravel-activitylog.subject_returns_soft_deleted_models')) {
+ return $this->morphTo()->withTrashed();
+ }
+
  return $this->morphTo();
  }
 

tests/LogsActivityTest.php

@@ -77,10 +77,10 @@ public function it_can_fetch_all_activity_for_a_model()
  }
 
  /** @test */
- public function it_can_fetch_all_activity_for_a_deleted_model()
+ public function it_can_fetch_soft_deleted_models()
  {
- $this->app['config']->set('laravel-activitylog.subject_withTrashed', true);
- 
+ $this->app['config']->set('laravel-activitylog.subject_returns_soft_deleted_models', true);
+
  $article = $this->createArticle();
 
  $article->name = 'changed name';

tests/Models/Article.php

@@ -8,7 +8,7 @@
 class Article extends Model
 {
  use SoftDeletes;
- 
+
  protected $table = 'articles';
 
  protected $guarded = [];