Making ResultSet::first() return the first result if it was buffered, it

makes no sense to return null if we have the value already
cakephp · Dec 28, 2013 · a8b1048 · a8b1048
1 parent b2d204e
commit a8b1048
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Cake/ORM/ResultSet.php b/Cake/ORM/ResultSet.php
@@ -214,6 +214,10 @@ public function valid() {
  * @return array|object
  */
 	public function first() {
+		if (isset($this->_results[0])) {
+			return $this->_results[0];
+		}
+
 		if ($this->valid()) {
 			if ($this->_statement) {
 				$this->_statement->closeCursor();

diff --git a/Cake/Test/TestCase/ORM/ResultSetTest.php b/Cake/Test/TestCase/ORM/ResultSetTest.php
@@ -182,8 +182,8 @@ public function testFirstAfterSerialize() {
 		$row = $results->first();
 		$this->assertEquals($this->fixtureData[0], $row);
 
-		$this->assertNull($results->first(), 'No more rows.');
-		$this->assertNull($results->first(), 'No more rows.');
+		$this->assertSame($row, $results->first());
+		$this->assertSame($row, $results->first());
 	}
 
 /**