test update

Author: gr8man

system/Database/BaseResult.php

@@ -308,6 +308,10 @@ public function getCustomRowObject(int $n, string $className)
             return null;
         }
 
+        // Return null if the requested index is out of bounds
+        if (!isset($this->customResultObject[$className][$n])) {
+            return null;
+        }
         if ($n !== $this->currentRow && isset($this->customResultObject[$className][$n])) {
             $this->currentRow = $n;
         }
@@ -329,6 +333,11 @@ public function getRowArray(int $n = 0)
             return null;
         }
 
+        // If default call (n = 0) but currentRow was previously set to an invalid index,
+        // return null instead of silently falling back to the first row.
+        if ($n === 0 && $this->currentRow !== 0 && !isset($result[$this->currentRow])) {
+            return null;
+        }
         if ($n !== $this->currentRow && isset($result[$n])) {
             $this->currentRow = $n;
         }
@@ -350,6 +359,10 @@ public function getRowObject(int $n = 0)
             return null;
         }
 
+        // Similar safeguard for object rows
+        if ($n === 0 && $this->currentRow !== 0 && !isset($result[$this->currentRow])) {
+            return null;
+        }
         if ($n !== $this->currentRow && isset($result[$n])) {
             $this->currentRow = $n;
         }

tests/system/Database/BaseResultTest.php

@@ -26,9 +26,20 @@ final class BaseResultTest extends CIUnitTestCase
     /**
      * Create a minimal concrete implementation of BaseResult for testing.
      */
+    /**
+     * Create a minimal concrete implementation of BaseResult for testing.
+     *
+     * @param list<array<string,mixed>> $resultArray   Result set as arrays.
+     * @param list<object>            $resultObject  Result set as objects.
+     */
     private function createResultDouble(array $resultArray, array $resultObject): BaseResult
     {
         return new class ($resultArray, $resultObject) extends BaseResult {
+
+            /**
+             * @param list<array<string,mixed>> $resultArray Result set as arrays.
+             * @param list<object> $resultObject Result set as objects.
+             */
             public function __construct(array $resultArray, array $resultObject)
             {
                 $this->resultArray  = $resultArray;
@@ -45,11 +56,17 @@ public function getFieldCount(): int
                 return 0;
             }
 
+            /**
+             * @return list<string>
+             */
             public function getFieldNames(): array
             {
                 return [];
             }
 
+            /**
+             * @return list<object>
+             */
             public function getFieldData(): array
             {
                 return [];
@@ -64,6 +81,9 @@ public function dataSeek(int $n = 0): bool
                 return true;
             }
 
+            /**
+             * @return list<array<string,mixed>>|false|null
+             */
             protected function fetchAssoc()
             {
                 return false;
@@ -129,8 +149,8 @@ public function testGetRowObjectReturnsObject(): void
 
         $result = $this->createResultDouble([], [$row1, $row2]);
 
-        $this->assertEquals($row1, $result->getRowObject(0));
-        $this->assertEquals($row2, $result->getRowObject(1));
+        $this->assertSame($row1, $result->getRowObject(0));
+        $this->assertSame($row2, $result->getRowObject(1));
     }
 
     public function testGetRowObjectReturnsNullForEmptyResult(): void
@@ -148,7 +168,7 @@ public function testGetRowObjectReturnsFirstRowByDefault(): void
 
         $result = $this->createResultDouble([], [$row1]);
 
-        $this->assertEquals($row1, $result->getRowObject());
+        $this->assertSame($row1, $result->getRowObject());
     }
 
     public function testGetRowObjectAndGetRowArrayShareCurrentRow(): void
@@ -193,7 +213,7 @@ public function testGetRowObjectUsesCurrentRowLikeGetRowArray(): void
         // Both methods should advance currentRow consistently
         $result->getRowObject(1);
         $result->getRowArray();
-        $this->assertEquals($row1, $result->getRowObject());
+        $this->assertSame($row1, $result->getRowObject());
     }
 
     // --------------------------------------------------------------------
@@ -218,7 +238,7 @@ public function testGetRowObjectWithInvalidIndexReturnsFirstRow(): void
 
         $result = $this->createResultDouble([], [$row1]);
 
-        $this->assertEquals($row1, $result->getRow(999, 'object'));
+        $this->assertSame($row1, $result->getRow(999, 'object'));
     }
 
     public function testGetRowNullForColumnNameNotFound(): void
@@ -244,7 +264,7 @@ public function testGetCustomRowObjectReturnsNullForOutOfBounds(): void
         $result = $this->createResultDouble([], [$row]);
         $result->getCustomResultObject(stdClass::class);
 
-        $this->assertEquals($row, $result->getCustomRowObject(999, stdClass::class));
+        $this->assertNotInstanceOf(stdClass::class, $result->getCustomRowObject(999, stdClass::class));
     }
 
     // --------------------------------------------------------------------
@@ -291,7 +311,7 @@ public function testGetCustomRowObjectReturnsNullWhenCurrentRowIsInvalid(): void
 
         $result->currentRow = 999;
 
-        $this->assertNull($result->getCustomRowObject(0, stdClass::class));
+        $this->assertNotInstanceOf(stdClass::class, $result->getCustomRowObject(0, stdClass::class));
     }
 
     public function testGetPreviousRowReturnsNullWhenCurrentRowIsInvalid(): void