Skip to content
Permalink
Browse files

Fix more doc blocks.

  • Loading branch information...
dereuromark committed Nov 20, 2017
1 parent f8cfd91 commit 35d5e8d30ad823db8a94839a8a5d0a90d9d5a6a6
@@ -156,7 +156,7 @@ class Paginator implements PaginatorInterface
* @param array $params Request params
* @param array $settings The settings/configuration used for pagination.
* @return \Cake\Datasource\ResultSetInterface Query results
* @throws \Cake\ORM\Exception\PageOutOfBoundsException
* @throws \Cake\Datasource\Exception\PageOutOfBoundsException
*/
public function paginate($object, array $params = [], array $settings = [])
{
@@ -22,10 +22,10 @@ interface PaginatorInterface
/**
* Handles pagination of datasource records.
*
* @param mixed $object The repository or query to paginate.
* @param \Cake\Datasource\RepositoryInterface|\Cake\Datasource\QueryInterface $object The repository or query to paginate.
* @param array $params Request params
* @param array $settings The settings/configuration used for pagination.
* @return mixed Query results
* @return \Cake\Datasource\ResultSetInterface Query results
*/
public function paginate($object, array $params = [], array $settings = []);
@@ -163,6 +163,7 @@ protected function _buildQuery($options)
$options['fields'] = [];
}
/* @var \Cake\ORM\Query $query */
$query = $finder();
if (isset($options['finder'])) {
list($finderName, $opts) = $this->_extractFinder($options['finder']);
@@ -275,7 +276,7 @@ protected function _assertFieldsPresent($fetchQuery, $key)
* filtering needs to be done using a subquery.
*
* @param \Cake\ORM\Query $query Target table's query
* @param string $key the fields that should be used for filtering
* @param string|array $key the fields that should be used for filtering
* @param \Cake\ORM\Query $subquery The Subquery to use for filtering
* @return \Cake\ORM\Query
*/
@@ -312,8 +313,8 @@ protected function _addFilteringJoin($query, $key, $subquery)
* target table query given a filter key and some filtering values.
*
* @param \Cake\ORM\Query $query Target table's query
* @param string|array $key the fields that should be used for filtering
* @param mixed $filter the value that should be used to match for $key
* @param string|array $key The fields that should be used for filtering
* @param mixed $filter The value that should be used to match for $key
* @return \Cake\ORM\Query
*/
protected function _addFilteringCondition($query, $key, $filter)
@@ -48,7 +48,7 @@ class SelectWithPivotLoader extends SelectLoader
/**
* Custom conditions for the junction association
*
* @var mixed
* @var string|array|\Cake\Database\ExpressionInterface|callable|null
*/
protected $junctionConditions;
@@ -111,7 +111,7 @@ protected function _buildQuery($options)
}
$query
->where($this->junctionConditions)
->where($this->junctionConditions)
->select($joinFields);
$query
@@ -133,7 +133,7 @@ protected function _buildQuery($options)
* which the filter should be applied
*
* @param array $options the options to use for getting the link field.
* @return string
* @return array|string
*/
protected function _linkField($options)
{
@@ -491,7 +491,7 @@ protected function _fetchResult()
/**
* Correctly nests results keys including those coming from associations
*
* @param mixed $row Array containing columns and values or false if there is no results
* @param array $row Array containing columns and values or false if there is no results
* @return array Results
*/
protected function _groupResult($row)

0 comments on commit 35d5e8d

Please sign in to comment.
You can’t perform that action at this time.