Fix ArrayList canFilterBy to work with ArrayData (#10915)

silverstripe · Aug 14, 2023 · c7cd262 · c7cd262
1 parent cdbc50c
commit c7cd262
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/ORM/ArrayList.php b/src/ORM/ArrayList.php
@@ -604,7 +604,15 @@ public function canFilterBy($by)
 
         $firstRecord = $this->first();
 
-        return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($firstRecord, $by ?? '');
+        if (is_array($firstRecord)) {
+            return array_key_exists($by, $firstRecord);
+        }
+
+        if ($firstRecord instanceof ViewableData) {
+            return $firstRecord->hasField($by);
+        }
+
+        return property_exists($firstRecord, $by ?? '');
     }
 
     /**

diff --git a/tests/php/ORM/ArrayListTest.php b/tests/php/ORM/ArrayListTest.php
@@ -7,6 +7,7 @@
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\Filterable;
+use SilverStripe\View\ArrayData;
 use stdClass;
 
 class ArrayListTest extends SapphireTest
@@ -1174,6 +1175,20 @@ public function testCanFilterBy()
         $this->assertFalse($list->canFilterBy('Age'));
     }
 
+    public function testCanFilterByArrayData()
+    {
+        $list = new ArrayList(
+            [
+                new ArrayData(['Name' => 'Steve']),
+                new ArrayData(['Name' => 'Bob']),
+                new ArrayData(['Name' => 'John'])
+            ]
+        );
+
+        $this->assertTrue($list->canFilterBy('Name'));
+        $this->assertFalse($list->canFilterBy('Age'));
+    }
+
     public function testCanFilterByEmpty()
     {
         $list = new ArrayList();