Fix merge conflict issues and failing tests.

cakephp · Dec 30, 2013 · 2af4166 · 2af4166
1 parent c7ef7f5
commit 2af4166
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Cake/ORM/Query.php b/Cake/ORM/Query.php
@@ -651,13 +651,8 @@ public function first() {
 			$this->limit(1);
 		}
 		$this->bufferResults();
-<<<<<<< HEAD
-		$this->_results = $this->execute();
-		return $this->_results->first();
-=======
 		$this->_results = $this->all();
-		return $this->_results->one();
->>>>>>> Separate execute() into 2 methods.
+		return $this->_results->first();
 	}
 
 /**
@@ -1025,8 +1020,8 @@ public function __call($method, $arguments) {
 		if ($this->type() === 'select') {
 			$resultSetClass = __NAMESPACE__ . '\ResultSetDecorator';
 			if (in_array($method, get_class_methods($resultSetClass))) {
-				$object = $this->execute();
-				return call_user_func_array([$object, $method], $arguments);
+				$results = $this->all();
+				return call_user_func_array([$results, $method], $arguments);
 			}
 		}
 

diff --git a/Cake/Test/TestCase/ORM/ResultSetTest.php b/Cake/Test/TestCase/ORM/ResultSetTest.php
@@ -75,7 +75,7 @@ public function testRewind() {
  */
 	public function testRewindStreaming() {
 		$query = $this->table->find('all')->bufferResults(false);
-		$results = $query->execute();
+		$results = $query->all();
 		$first = $second = [];
 		foreach ($results as $result) {
 			$first[] = $result;