Merge pull request #11 from dotCMS/twig-property-access-for-contentlet

Got Claude to add some "magic methods" to fix Symfony bug

Author: fmontes

examples/dotcms-symfony/composer.json

@@ -35,11 +35,11 @@
         "symfony/runtime": "7.2.*",
         "symfony/security-bundle": "7.2.*",
         "symfony/serializer": "7.2.*",
-        "symfony/stimulus-bundle": "^2.25.2",
+        "symfony/stimulus-bundle": "^2.26.1",
         "symfony/string": "7.2.*",
         "symfony/translation": "7.2.*",
         "symfony/twig-bundle": "7.2.*",
-        "symfony/ux-turbo": "^2.25.2",
+        "symfony/ux-turbo": "^2.26.1",
         "symfony/validator": "7.2.*",
         "symfony/web-link": "7.2.*",
         "symfony/yaml": "7.2.*",

examples/dotcms-symfony/composer.lock

@@ -8,8 +8,8 @@
 <article>
     {{ imageHtml|default('')|raw }}
     {% if content.title %}<h2>{{ content.title }}</h2>{% endif %}
-    {% if content.caption %}<p>{{ content.caption }}</p>{% endif %}
-    {% if content.buttonText %}
+    {% if content.caption|default('') %}<p>{{ content.caption }}</p>{% endif %}
+    {% if content.buttonText|default('') %}
         <a href="{{ content.link|default('#') }}">{{ content.buttonText }}</a>
     {% endif %}
 </article> 

examples/dotcms-symfony/templates/dotcms/content-types/banner.twig

@@ -55,6 +55,30 @@ protected function has(string $name): bool
         return property_exists($this, $name) || isset($this->additionalProperties[$name]);
     }
 
+    /**
+     * Magic method to get property values
+     * This enables property access syntax (e.g., $obj->propertyName) for additional properties
+     *
+     * @param string $name Property name
+     * @return mixed Property value or null if not found
+     */
+    public function __get(string $name): mixed
+    {
+        return $this->get($name);
+    }
+
+    /**
+     * Magic method to check if a property exists
+     * This enables isset() checks on additional properties
+     *
+     * @param string $name Property name
+     * @return bool True if the property exists
+     */
+    public function __isset(string $name): bool
+    {
+        return $this->has($name);
+    }
+
     /**
      * @inheritDoc
      */

src/Model/Core/AbstractModel.php

@@ -109,6 +109,40 @@ public function testJsonSerialize(): void
         // Test JSON encoding
         $this->assertEquals(json_encode($expected), json_encode($model));
     }
+
+    public function testMagicGetMethod(): void
+    {
+        $additionalProps = ['buttonText' => 'Click Me', 'caption' => 'Test Caption'];
+        $model = $this->createConcreteModel($additionalProps);
+
+        // Test accessing existing properties
+        $this->assertEquals('test-id', $model->identifier);
+        $this->assertEquals('Test Title', $model->title);
+
+        // Test accessing additional properties via magic __get
+        $this->assertEquals('Click Me', $model->buttonText);
+        $this->assertEquals('Test Caption', $model->caption);
+
+        // Test accessing non-existent property
+        $this->assertNull($model->nonExistentProp);
+    }
+
+    public function testMagicIssetMethod(): void
+    {
+        $additionalProps = ['buttonText' => 'Click Me', 'emptyProp' => ''];
+        $model = $this->createConcreteModel($additionalProps);
+
+        // Test isset on existing properties
+        $this->assertTrue(isset($model->identifier));
+        $this->assertTrue(isset($model->title));
+
+        // Test isset on additional properties
+        $this->assertTrue(isset($model->buttonText));
+        $this->assertTrue(isset($model->emptyProp)); // Even empty string should return true for isset
+
+        // Test isset on non-existent property
+        $this->assertFalse(isset($model->nonExistentProp));
+    }
 }
 
 /**