Making sure beforeFind is only triggered once per query

cakephp · Nov 17, 2014 · 9415772 · 9415772
1 parent 649570e
commit 9415772
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/Datasource/QueryTrait.php b/src/Datasource/QueryTrait.php
@@ -203,13 +203,6 @@ public function all() {
 			return $this->_results;
 		}
 
-		$table = $this->repository();
-		$table->dispatchEvent('Model.beforeFind', [$this, $this->_options, !$this->eagerLoaded()]);
-
-		if (isset($this->_results)) {
-			return $this->_results;
-		}
-
 		if ($this->_cache) {
 			$results = $this->_cache->fetch($this);
 		}

diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -644,6 +644,11 @@ public function sql(ValueBinder $binder = null) {
  * @return \Cake\ORM\ResultSet
  */
 	protected function _execute() {
+		$this->triggerBeforeFind();
+		if ($this->_results) {
+			$decorator = $this->_decoratorClass();
+			return new $decorator($this->_results);
+		}
 		$statement = $this->eagerLoader()->loadExternal($this, $this->execute());
 		return new ResultSet($this, $statement);
 	}

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -433,7 +433,7 @@ public function testFindBeforeFindEventOverrideReturn() {
 
 		$query = $table->find('all');
 		$query->limit(1);
-		$this->assertEquals($expected, $query->all());
+		$this->assertEquals($expected, $query->all()->toArray());
 	}
 
 /**