Merge pull request #11238 from creative-commoners/pulls/5/viewable-sc…

…alar ENH Rendering scalars in ArrayList in templates
silverstripe · May 15, 2024 · 8afe1ad · 8afe1ad
2 parents 4429a49 + 12a741f
commit 8afe1ad
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/View/SSViewer_DataPresenter.php b/src/View/SSViewer_DataPresenter.php
@@ -376,7 +376,7 @@ protected function getValueSource($property)
 
         // Check if the method to-be-called exists on the target object - if so, don't check any further
         // injection locations
-        $on = $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        $on = $this->getItem();
         if (is_object($on) && (isset($on->$property) || method_exists($on, $property ?? ''))) {
             return [];
         }

diff --git a/src/View/SSViewer_Scope.php b/src/View/SSViewer_Scope.php
@@ -5,6 +5,11 @@
 use ArrayIterator;
 use Countable;
 use Iterator;
+use SilverStripe\ORM\FieldType\DBBoolean;
+use SilverStripe\ORM\FieldType\DBText;
+use SilverStripe\ORM\FieldType\DBFloat;
+use SilverStripe\ORM\FieldType\DBInt;
+use SilverStripe\ORM\FieldType\DBField;
 
 /**
  * This tracks the current scope for an SSViewer instance. It has three goals:
@@ -121,7 +126,11 @@ public function __construct($item, SSViewer_Scope $inheritedScope = null)
      */
     public function getItem()
     {
-        return $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        $item = $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        if (is_scalar($item)) {
+            $item = $this->convertScalarToDBField($item);
+        }
+        return $item;
     }
 
     /**
@@ -176,7 +185,7 @@ public function resetLocalScope()
      */
     public function getObj($name, $arguments = [], $cache = false, $cacheName = null)
     {
-        $on = $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        $on = $this->getItem();
         return $on->obj($name, $arguments, $cache, $cacheName);
     }
 
@@ -240,7 +249,7 @@ public function obj($name, $arguments = [], $cache = false, $cacheName = null)
      */
     public function self()
     {
-        $result = $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        $result = $this->getItem();
         $this->resetLocalScope();
 
         return $result;
@@ -338,7 +347,7 @@ public function next()
      */
     public function __call($name, $arguments)
     {
-        $on = $this->itemIterator ? $this->itemIterator->current() : $this->item;
+        $on = $this->getItem();
         $retval = $on ? $on->$name(...$arguments) : null;
 
         $this->resetLocalScope();
@@ -368,4 +377,14 @@ protected function getUpIndex()
     {
         return $this->upIndex;
     }
+
+    private function convertScalarToDBField(bool|string|float|int $value): DBField
+    {
+        return match (gettype($value)) {
+            'boolean' => DBBoolean::create()->setValue($value),
+            'string' => DBText::create()->setValue($value),
+            'double' => DBFloat::create()->setValue($value),
+            'integer' => DBInt::create()->setValue($value),
+        };
+    }
 }
diff --git a/tests/php/View/SSViewerTest.php b/tests/php/View/SSViewerTest.php
@@ -2218,4 +2218,16 @@ public function testFromStringCaching()
         $this->assertTrue(file_exists($cacheFile ?? ''), 'Cache file wasn\'t created when it was meant to');
         unlink($cacheFile ?? '');
     }
+
+    public function testPrimitivesConvertedToDBFields()
+    {
+        $data = new ArrayData([
+            // null value should not be rendered, though should also not throw exception
+            'Foo' => new ArrayList(['hello', true, 456, 7.89, null])
+        ]);
+        $this->assertEqualIgnoringWhitespace(
+            'hello 1 456 7.89',
+            $this->render('<% loop $Foo %>$Me<% end_loop %>', $data)
+        );
+    }
 }