Skip to content

Commit

Permalink
Still more documentation.
Browse files Browse the repository at this point in the history
  • Loading branch information
bar committed Dec 21, 2013
1 parent 09188cc commit 5860cd4
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions lib/Cake/Model/Datasource/DboSource.php
Expand Up @@ -1197,13 +1197,13 @@ protected function _filterResults(&$results, Model $Model, $filtered = array())
*
* @param Model $Model Primary Model object.
* @param Model $LinkModel Linked model object.
* @param string $type Association type, one of the model association types ie. hasMany
* @param string $type Association type, one of the model association types ie. hasMany.
* @param string $association Association name.
* @param array $assocData Association data.
* @param array $queryData
* @param array $queryData An array of queryData information containing keys similar to Model::find().
* @param boolean $external Whether or not the association query is on an external datasource.
* @param array $resultSet Existing results
* @param integer $recursive Number of levels of association
* @param array $resultSet Existing results.
* @param integer $recursive Number of levels of association.
* @param array $stack
* @return mixed
* @throws CakeException when results cannot be created.
Expand Down Expand Up @@ -1367,10 +1367,10 @@ public function queryAssociation(Model $Model, Model $LinkModel, $type, $associa
/**
* A more efficient way to fetch associations.
*
* @param Model $Model Primary model object
* @param string $query Association query
* @param array $ids Array of IDs of associated records
* @return array Association results
* @param Model $Model Primary model object.
* @param string $query Association query template.
* @param array $ids Array of IDs of associated records.
* @return array Association results.
*/
public function fetchAssociated(Model $Model, $query, $ids) {
$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
Expand All @@ -1383,10 +1383,10 @@ public function fetchAssociated(Model $Model, $query, $ids) {
/**
* Merge the results of hasMany relations.
*
* @param array $resultSet Data to merge into
* @param array $merge Data to merge
* @param string $association Name of Model being Merged
* @param Model $Model Model being merged onto
* @param array $resultSet Data to merge into.
* @param array $merge Data to merge.
* @param string $association Name of Model being merged.
* @param Model $Model Model being merged onto.
* @return void
*/
protected function _mergeHasMany(&$resultSet, $merge, $association, $Model) {
Expand Down Expand Up @@ -1515,7 +1515,7 @@ protected function _mergeAssociation(&$data, &$merge, $association, $type, $self
* When no fields are set, all the $Model fields are returned.
*
* @param Model $Model
* @param array $queryData Query data already processed.
* @param array $queryData An array of queryData information containing keys similar to Model::find().
* @return array Array containing SQL fields.
*/
public function prepareFields(Model $Model, $queryData) {
Expand Down Expand Up @@ -1544,7 +1544,7 @@ public function prepareFields(Model $Model, $queryData) {
* This is merely a convenient wrapper to DboSource::buildStatement().
*
* @param Model $Model
* @param array $queryData Query data already processed.
* @param array $queryData An array of queryData information containing keys similar to Model::find().
* @return string String containing an SQL statement.
* @see DboSource::buildStatement()
*/
Expand Down Expand Up @@ -1574,10 +1574,10 @@ public function buildAssociationQuery(Model $Model, $queryData) {
*
* @param Model $Model Primary Model object.
* @param Model $LinkModel Linked model object.
* @param string $type Association type, one of the model association types ie. hasMany
* @param string $association
* @param string $type Association type, one of the model association types ie. hasMany.
* @param string $association Association name.
* @param array $assocData Association data.
* @param array $queryData Query data already processed.
* @param array $queryData An array of queryData information containing keys similar to Model::find().
* @param boolean $external Whether or not the association query is on an external datasource.
* @return mixed
* String representing a query.
Expand Down Expand Up @@ -1884,7 +1884,7 @@ public function renderStatement($type, $data) {
}

/**
* Merges a mixed set of string/array conditions
* Merges a mixed set of string/array conditions.
*
* @param mixed $query
* @param mixed $assoc
Expand Down

0 comments on commit 5860cd4

Please sign in to comment.