Merge pull request spatie#1038 from stevebauman/fix-placeholder-to-array

Use `data_get()` for placeholder replacement instead of `Arr::get()`

Author: Gummibeer

src/ActivityLogger.php

@@ -6,7 +6,6 @@
 use DateTimeInterface;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use Illuminate\Support\Traits\Conditionable;
@@ -213,9 +212,7 @@ protected function replacePlaceholders(string $description, ActivityContract $ac
                 return $match;
             }
 
-            $attributeValue = $attributeValue->toArray();
-
-            return Arr::get($attributeValue, $propertyName, $match);
+            return data_get($attributeValue, $propertyName, $match);
         }, $description);
     }
 

tests/ActivityLoggerTest.php

@@ -227,6 +227,26 @@
     expect($this->getLastActivity()->description)->toEqual($expectedDescription);
 });
 
+it('can replace the placeholders with object properties and accessors', function () {
+    $article = Article::create([
+        'name' => 'article name',
+        'user_id' => User::first()->id,
+    ]);
+
+    $article->foo = new stdClass();
+    $article->foo->bar = new stdClass();
+    $article->foo->bar->baz = 'zal';
+
+    activity()
+        ->performedOn($article)
+        ->withProperties(['key' => 'value', 'key2' => ['subkey' => 'subvalue']])
+        ->log('Subject name is :subject.name, deeply nested property is :subject.foo.bar.baz, accessor property is :subject.owner_name');
+
+    $expectedDescription = 'Subject name is article name, deeply nested property is zal, accessor property is name 1';
+
+    expect($this->getLastActivity()->description)->toEqual($expectedDescription);
+});
+
 it('can log an activity with event', function () {
     $article = Article::create(['name' => 'article name']);
     activity()

tests/Models/Article.php

@@ -10,8 +10,13 @@ class Article extends Model
 
     protected $guarded = [];
 
-    public function User()
+    public function user()
     {
         return $this->belongsTo(User::class);
     }
+
+    public function getOwnerNameAttribute()
+    {
+        return $this->user?->name;
+    }
 }