refs #2923 Allow mutation elocument model on getContent

orchidsoftware · Nov 19, 2024 · 19dbc19 · 19dbc19
1 parent 0b14b8b
commit 19dbc19
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/src/Screen/AsSource.php b/src/Screen/AsSource.php
@@ -32,6 +32,6 @@ public function getContent(string $field): mixed
 
         return $this->getAttribute($field) // Try to get the field value from the object's attributes.
             ?? Arr::get($this->getRelations(), $field) // Try to get the field value from the object's relations.
-            ?? Arr::get($this, $field); // Try to get the field value from the object's array representation.
+            ?? Arr::get($this->attributesToArray(), $field); // Try to get the field value from the object's array representation.
     }
 }
diff --git a/tests/Unit/Screen/SourceTest.php b/tests/Unit/Screen/SourceTest.php
@@ -24,14 +24,20 @@ protected function setUp(): void
         {
             use AsSource;
 
+            protected $attributes = [
+                'preferences' => '{"theme":"dark","notifications":{"email":true,"sms":false}}',
+            ];
+
             protected $fillable = [
                 'id',
                 'name',
                 'options',
+                'preferences',
             ];
 
             protected $casts = [
-                'options' => 'array',
+                'options'     => 'array',
+                'preferences' => 'json',
             ];
 
             public function getGreetingAttribute()
@@ -81,6 +87,17 @@ public function testGetArrayAttribute(): void
         $this->assertTrue($this->model->getContent('options.skills.php'));
     }
 
+    public function testGetJsonAttribute(): void
+    {
+        $this->assertIsArray($this->model->getContent('preferences.notifications'));
+        $this->assertArrayHasKey('email', $this->model->getContent('preferences.notifications'));
+        $this->assertTrue($this->model->getContent('preferences.notifications.email'));
+        $this->assertFalse($this->model->getContent('preferences.notifications.sms'));
+
+        $this->assertIsString($this->model->getContent('preferences.theme'));
+        $this->assertSame('dark', $this->model->getContent('preferences.theme'));
+    }
+
     public function testGetRelation(): void
     {
         $this->assertIsInt($this->model->getContent('many.three'));