Skip to content

Commit

Permalink
Re-add some docblock-tag namespace fixes that got lost due to rebasing
Browse files Browse the repository at this point in the history
  • Loading branch information
ndm2 committed Feb 22, 2014
1 parent 3e034ab commit 05cdcc0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/Datasource/QueryCacher.php
Expand Up @@ -24,7 +24,7 @@
*
* Used by Cake\Datasource\QueryTrait internally.
*
* @see Cake\Datasource\QueryTrait::cache() for the public interface.
* @see \Cake\Datasource\QueryTrait::cache() for the public interface.
*/
class QueryCacher {

Expand Down
20 changes: 10 additions & 10 deletions src/Datasource/QueryTrait.php
Expand Up @@ -63,7 +63,7 @@ trait QueryTrait {
/**
* A query cacher instance if this query has caching enabled.
*
* @var Cake\Datasource\QueryCacher
* @var \Cake\Datasource\QueryCacher
*/
protected $_cache;

Expand Down Expand Up @@ -102,8 +102,8 @@ public function repository(RepositoryInterface $table = null) {
*
* This method is most useful when combined with results stored in a persistent cache.
*
* @param Cake\ORM\ResultSet $results The results this query should return.
* @return Query The query instance.
* @param \Cake\ORM\ResultSet $results The results this query should return.
* @return \Cake\ORM\Query The query instance.
*/
public function setResult($results) {
$this->_results = $results;
Expand All @@ -116,7 +116,7 @@ public function setResult($results) {
* iterated without having to call execute() manually, thus making it look like
* a result set instead of the query itself.
*
* @return Iterator
* @return \Iterator
*/
public function getIterator() {
return $this->all();
Expand Down Expand Up @@ -157,7 +157,7 @@ public function getIterator() {
* When using a function, this query instance will be supplied as an argument.
* @param string|CacheEngine $config Either the name of the cache config to use, or
* a cache config instance.
* @return QueryTrait This same object
* @return \Cake\Datasource\QueryTrait This same object
*/
public function cache($key, $config = 'default') {
if ($key === false) {
Expand All @@ -177,7 +177,7 @@ public function cache($key, $config = 'default') {
* ResultSetDecorator is a travesable object that implements the methods found
* on Cake\Collection\Collection.
*
* @return Cake\ORM\ResultSetDecorator
* @return \Cake\ORM\ResultSetDecorator
*/
public function all() {
if (isset($this->_results)) {
Expand Down Expand Up @@ -230,8 +230,8 @@ public function toArray() {
* @param callable $mapper
* @param callable $reducer
* @param boolean $overwrite
* @return Cake\Datasource\QueryTrait|array
* @see Cake\Collection\Iterator\MapReduce for details on how to use emit data to the map reducer.
* @return \Cake\Datasource\QueryTrait|array
* @see \Cake\Collection\Iterator\MapReduce for details on how to use emit data to the map reducer.
*/
public function mapReduce(callable $mapper = null, callable $reducer = null, $overwrite = false) {
if ($overwrite) {
Expand Down Expand Up @@ -281,7 +281,7 @@ public function mapReduce(callable $mapper = null, callable $reducer = null, $ov
*
* @param callable $formatter
* @param boolean|integer $mode
* @return Cake\Datasource\QueryTrait|array
* @return \Cake\Datasource\QueryTrait|array
*/
public function formatResults(callable $formatter = null, $mode = self::APPEND) {
if ($mode === self::OVERWRITE) {
Expand Down Expand Up @@ -360,7 +360,7 @@ public function __call($method, $arguments) {
* This is handy for passing all query clauses at once.
*
* @param array $options the options to be applied
* @return Cake\Datasource\QueryTrait this object
* @return \Cake\Datasource\QueryTrait this object
*/
abstract public function applyOptions(array $options);

Expand Down

0 comments on commit 05cdcc0

Please sign in to comment.