allow callable scope

cakephp · Mar 29, 2014 · fe05b8d · fe05b8d
1 parent 2de96b1
commit fe05b8d
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/Model/Behavior/TreeBehavior.php b/src/Model/Behavior/TreeBehavior.php
@@ -103,17 +103,12 @@ protected function _scope($query) {
 
 		if (empty($config['scope'])) {
 			return $query;
-		}
-
-		if (!is_string($config['scope'])) {
+		} elseif (is_array($config['scope'])) {
 			return $query->where($config['scope']);
+		} elseif (is_callable($config['scope'])) {
+			return $config['scope']($query);
 		}
 
-		$association = $this->_table->association($query['scope']);
-		if (!$association) {
-			throw new \InvalidArgumentException("Invalid association name for 'scope'");
-		}
-
-		return $query->matching($association->name());
+		return $query;
 	}
 }