get dynamic properties first, otherwise get the attribute

wintercms · Jan 31, 2024 · abc4de2 · abc4de2
1 parent 8faea4a
commit abc4de2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Halcyon/Model.php b/src/Halcyon/Model.php
@@ -1611,7 +1611,7 @@ public static function cacheMutatedAttributes($class)
      */
     public function __get($key)
     {
-        return $this->getAttribute($key);
+        return $this->extendableGet($key) ?? $this->getAttribute($key);
     }
 
     /**

diff --git a/tests/Halcyon/HalcyonModelTest.php b/tests/Halcyon/HalcyonModelTest.php
@@ -348,6 +348,17 @@ public function testPageQueryListFileName()
         $this->assertEquals(['about.htm', 'home.htm'], $files);
     }
 
+    public function testAddDynamicPoperty()
+    {
+        $page = HalcyonTestPage::find('home');
+
+        $page->addDynamicProperty('myDynamicProperty', 'myDynamicPropertyValue');
+        $this->assertEquals('myDynamicPropertyValue', $page->myDynamicProperty);
+
+        // Dynamic properties should not be saved to DB layer
+        $this->assertArrayNotHasKey('myDynamicProperty', $page->attributes);
+    }
+
     //
     // House keeping
     //
-Original file line number
+Diff line change
@@ Expand Up / @@ -1611,7 +1611,7 @@ public static function cacheMutatedAttributes($class) @@
          */
         public function __get($key)
         {
-            return $this->getAttribute($key);
+            return $this->extendableGet($key) ?? $this->getAttribute($key);
         }
         /**
@@ Expand Down @@