Adding error to find(threaded).

When the model has no parent_id trigger a warning about the impending failure and return an empty result. Fixes #2341
cakephp · Jan 2, 2012 · b4faa00 · ceeram · Jan 2, 2012 · renan
1 parent 81d7ef4
commit b4faa00
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
@@ -2818,6 +2818,13 @@ protected function _findThreaded($state, $query, $results = array()) {
 			foreach ($results as $result) {
 				$result['children'] = array();
 				$id = $result[$this->alias][$this->primaryKey];
+				if (!isset($result[$this->alias]['parent_id'])) {
+					trigger_error(
+						__d('cake_dev', 'You cannot use find("threaded") on models without a "parent_id" field.'),
+						E_USER_WARNING
+					);
+					return $return;
+				}
 				$parentId = $result[$this->alias]['parent_id'];
 				if (isset($idMap[$id]['children'])) {
 					$idMap[$id] = array_merge($result, (array)$idMap[$id]);

diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -2987,13 +2987,21 @@ public function testSelfAssociationAfterFind() {
 		$noAfterFindData = $noAfterFindModel->find('all');
 
 		$this->assertFalse($afterFindModel == $noAfterFindModel);
-		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
-		if (PHP_VERSION === '5.1.6') {
-			$this->assertFalse($afterFindModel != $duplicateModel);
-		}
 		$this->assertEquals($afterFindData, $noAfterFindData);
 	}
 
+/**
+ * find(threaded) should trigger errors whne there is no parent_id field.
+ *
+ * @expectedException PHPUnit_Framework_Error_Warning
+ * @return void
+ */
+	public function testFindThreadedError() {
+		$this->loadFixtures('Apple', 'Sample');
+		$Apple = new Apple();
+		$Apple->find('threaded');
+	}
+
 /**
  * testFindAllThreaded method
  *