Merge branch '4' into 5.1

silverstripe · Dec 9, 2023 · bf45b0c · bf45b0c
2 parents eb245a1 + f9a6b7d
commit bf45b0c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/ORM/UnsavedRelationList.php b/src/ORM/UnsavedRelationList.php
@@ -237,11 +237,11 @@ public function getIDList()
      */
     public function first()
     {
-        $item = reset($this->items);
+        $item = reset($this->items) ?: null;
         if (is_numeric($item)) {
             $item = DataObject::get_by_id($this->dataClass, $item);
         }
-        if (!empty($this->extraFields[key($this->items)])) {
+        if ($item && !empty($this->extraFields[key($this->items)])) {
             $item->update($this->extraFields[key($this->items)]);
         }
         return $item;
@@ -254,8 +254,11 @@ public function first()
      */
     public function last()
     {
-        $item = end($this->items);
-        if (!empty($this->extraFields[key($this->items)])) {
+        $item = end($this->items) ?: null;
+        if (is_numeric($item)) {
+            $item = DataObject::get_by_id($this->dataClass, $item);
+        }
+        if ($item && !empty($this->extraFields[key($this->items)])) {
             $item->update($this->extraFields[key($this->items)]);
         }
         return $item;

diff --git a/tests/php/ORM/UnsavedRelationListTest.php b/tests/php/ORM/UnsavedRelationListTest.php
@@ -310,4 +310,20 @@ public function testColumn()
             ]
         );
     }
+
+    public function testFirstAndLast()
+    {
+        $object = new UnsavedRelationListTest\TestObject();
+        $children = $object->Children();
+
+        $this->assertNull($children->first(), 'Empty UnsavedRelationList should return null for first item.');
+        $this->assertNull($children->last(), 'Empty UnsavedRelationList should return null for last item.');
+
+        $children->add($firstChild = $this->objFromFixture(UnsavedRelationListTest\TestObject::class, 'ObjectA'));
+        $children->add($this->objFromFixture(UnsavedRelationListTest\TestObject::class, 'ObjectB'));
+        $children->add($lastChild = $this->objFromFixture(UnsavedRelationListTest\TestObject::class, 'ObjectC'));
+
+        $this->assertEquals($firstChild, $children->first(), 'Incorrect first item in UnsavedRelationList.');
+        $this->assertEquals($lastChild, $children->last(), 'Incorrect last item in UnsavedRelationList.');
+    }
 }