Skip to content

Commit

Permalink
Updating doc blocks for ModelBehavior so they better reflect the actu…
Browse files Browse the repository at this point in the history
…al behaviour of the methods.

Removing unused variable assignment.
Fixes #810
  • Loading branch information
markstory committed Jun 10, 2010
1 parent 9ee4a12 commit ec5ad93
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions cake/libs/model/model_behavior.php
Expand Up @@ -81,7 +81,7 @@ function cleanup(&$model) {
*
* @param object $model Model using this behavior
* @param array $queryData Data used to execute this query, i.e. conditions, order, etc.
* @return boolean True if the operation should continue, false if it should abort
* @return mixed False if the operation should abort. Any other result will continue.
* @access public
*/
function beforeFind(&$model, $query) { }
Expand All @@ -101,7 +101,7 @@ function afterFind(&$model, $results, $primary) { }
* Before validate callback
*
* @param object $model Model using this behavior
* @return boolean True if validate operation should continue, false to abort
* @return mixed False if the operation should abort. Any other result will continue.
* @access public
*/
function beforeValidate(&$model) { }
Expand All @@ -110,7 +110,7 @@ function beforeValidate(&$model) { }
* Before save callback
*
* @param object $model Model using this behavior
* @return boolean True if the operation should continue, false if it should abort
* @return mixed False if the operation should abort. Any other result will continue.
* @access public
*/
function beforeSave(&$model) { }
Expand All @@ -129,7 +129,7 @@ function afterSave(&$model, $created) { }
*
* @param object $model Model using this behavior
* @param boolean $cascade If true records that depend on this record will also be deleted
* @return boolean True if the operation should continue, false if it should abort
* @return mixed False if the operation should abort. Any other result will continue.
* @access public
*/
function beforeDelete(&$model, $cascade = true) { }
Expand Down Expand Up @@ -483,7 +483,6 @@ function trigger(&$model, $callback, $params = array(), $options = array()) {
if (empty($this->_attached)) {
return true;
}
$_params = $params;
$options = array_merge(array('break' => false, 'breakOn' => array(null, false), 'modParams' => false), $options);
$count = count($this->_attached);

Expand Down

0 comments on commit ec5ad93

Please sign in to comment.