Skip to content
Permalink
Browse files

Fix detected errors manually that could not be auto-fixed.

  • Loading branch information...
dereuromark committed Feb 2, 2016
1 parent 72f5332 commit 587fb54f0a2c530fa3499ba05bcfa5eb6d913c0f
@@ -236,8 +236,8 @@ public function sql(ValueBinder $generator = null)
* }, ['select', 'from']);
* ```
*
* @param callable $visitor a function or callable to be executed for each part
* @param array $parts the query clauses to traverse
* @param callable $visitor A function or callable to be executed for each part
* @param array $parts The query clauses to traverse
* @return $this
*/
public function traverse(callable $visitor, array $parts = [])
@@ -789,7 +789,7 @@ protected function _makeJoin($table, $conditions, $type)
* If you use string conditions make sure that your values are correctly quoted.
* The safest thing you can do is to never use string conditions.
*
* @param string|array|\Cake\Database\ExpressionInterface|callback|null $conditions The conditions to filter on.
* @param string|array|\Cake\Database\ExpressionInterface|callable|null $conditions The conditions to filter on.
* @param array $types associative array of type names used to bind values to query
* @param bool $overwrite whether to reset conditions with passed list or not
* @see \Cake\Database\Type
@@ -855,7 +855,7 @@ public function where($conditions = null, $types = [], $overwrite = false)
*
* `WHERE (title = 'Foo') AND (author_id = 1 OR author_id = 2)`
*
* @param string|array|\Cake\Database\ExpressionInterface|callback $conditions The conditions to add with AND.
* @param string|array|\Cake\Database\ExpressionInterface|callable $conditions The conditions to add with AND.
* @param array $types associative array of type names used to bind values to query
* @see \Cake\Database\Query::where()
* @see \Cake\Database\Type
@@ -917,7 +917,7 @@ public function andWhere($conditions, $types = [])
*
* `WHERE (title = 'Foo') OR (author_id = 1 OR author_id = 2)`
*
* @param string|array|\Cake\Database\ExpressionInterface|callback $conditions The conditions to add with OR.
* @param string|array|\Cake\Database\ExpressionInterface|callable $conditions The conditions to add with OR.
* @param array $types associative array of type names used to bind values to query
* @see \Cake\Database\Query::where()
* @see \Cake\Database\Type
@@ -1088,7 +1088,7 @@ public function group($fields, $overwrite = false)
* does. Please refer to its documentation for an insight on how to using each
* parameter.
*
* @param string|array|\Cake\Database\ExpressionInterface|callback $conditions The having conditions.
* @param string|array|\Cake\Database\ExpressionInterface|callable $conditions The having conditions.
* @param array $types associative array of type names used to bind values to query
* @param bool $overwrite whether to reset conditions with passed list or not
* @see \Cake\Database\Query::where()
@@ -1109,7 +1109,7 @@ public function having($conditions = null, $types = [], $overwrite = false)
* the same way as the method `andWhere()` does. Please refer to its
* documentation for an insight on how to using each parameter.
*
* @param string|array|\Cake\Database\ExpressionInterface|callback $conditions The AND conditions for HAVING.
* @param string|array|\Cake\Database\ExpressionInterface|callable $conditions The AND conditions for HAVING.
* @param array $types associative array of type names used to bind values to query
* @see \Cake\Database\Query::andWhere()
* @return $this
@@ -1126,7 +1126,7 @@ public function andHaving($conditions, $types = [])
* the same way as the method `orWhere()` does. Please refer to its
* documentation for an insight on how to using each parameter.
*
* @param string|array|\Cake\Database\ExpressionInterface|callback $conditions The OR conditions for HAVING.
* @param string|array|\Cake\Database\ExpressionInterface|callable $conditions The OR conditions for HAVING.
* @param array $types associative array of type names used to bind values to query.
* @see \Cake\Database\Query::orWhere()
* @return $this
@@ -1622,7 +1622,7 @@ public function clause($name)
* });
* ```
*
* @param null|callable $callback The callback to invoke when results are fetched.
* @param callable|null $callback The callback to invoke when results are fetched.
* @param bool $overwrite Whether or not this should append or replace all existing decorators.
* @return $this
*/
@@ -1786,7 +1786,7 @@ protected function _decorateStatement($statement)
* Helper function used to build conditions by composing QueryExpression objects.
*
* @param string $part Name of the query part to append the new part to
* @param string|null|array|\Cake\Database\ExpressionInterface|callback $append Expression or builder function to append.
* @param string|null|array|\Cake\Database\ExpressionInterface|callable $append Expression or builder function to append.
* @param string $conjunction type of conjunction to be used to operate part
* @param array $types associative array of type names used to bind values to query
* @return void
@@ -366,7 +366,7 @@ public function repository(RepositoryInterface $repository = null);
* If you use string conditions make sure that your values are correctly quoted.
* The safest thing you can do is to never use string conditions.
*
* @param string|array|callback|null $conditions The conditions to filter on.
* @param string|array|callable|null $conditions The conditions to filter on.
* @param array $types associative array of type names used to bind values to query
* @param bool $overwrite whether to reset conditions with passed list or not
* @return $this
@@ -26,14 +26,14 @@ class PHP7ErrorException extends Exception
/**
* The wrapped error object
*
* @var Error
* @var \Error
*/
protected $_error;
/**
* Wraps the passed Error class
*
* @param Error $error the Error object
* @param \Error $error the Error object
*/
public function __construct($error)
{
@@ -46,7 +46,7 @@ public function __construct($error)
/**
* Returns the wrapped error object
*
* @return Error
* @return \Error
*/
public function getError()
{
@@ -205,7 +205,7 @@ protected function _attachSubscriber(EventListenerInterface $subscriber)
*
* @param array $function the array taken from a handler definition for an event
* @param \Cake\Event\EventListenerInterface $object The handler object
* @return callback
* @return callable
*/
protected function _extractCallable($function, $object)
{
@@ -221,7 +221,7 @@ protected function _extractCallable($function, $object)
/**
* Removes a listener from the active listeners.
*
* @param callback|\Cake\Event\EventListenerInterface $callable any valid PHP callback type or an instance of EventListenerInterface
* @param callable|\Cake\Event\EventListenerInterface $callable any valid PHP callback type or an instance of EventListenerInterface
* @param string|null $eventKey The event unique identifier name with which the callback has been associated
* @return void
* @deprecated 3.0.0 Use off() instead.
@@ -264,7 +264,7 @@ public function detach($callable, $eventKey = null)
*
* @param string|\Cake\Event\EventListenerInterface $eventKey The event unique identifier name
* with which the callback has been associated, or the $listener you want to remove.
* @param callback $callable The callback you want to detach.
* @param callable $callable The callback you want to detach.
* @return void
*/
public function off($eventKey, $callable = null)
@@ -421,7 +421,7 @@ public static function popRequest()
* Get the current request object, or the first one.
*
* @param bool $current True to get the current request, or false to get the first one.
* @return \Cake\Network\Request|null.
* @return \Cake\Network\Request|null
*/
public static function getRequest($current = false)
{
@@ -84,7 +84,7 @@ public static function encrypt($plain, $key)
* @param string $cipher The ciphertext to decrypt.
* @param string $key The 256 bit/32 byte key to use as a cipher key.
* @return string Decrypted data. Any trailing null bytes will be removed.
* @throws InvalidArgumentException On invalid data or key.
* @throws \InvalidArgumentException On invalid data or key.
*/
public static function decrypt($cipher, $key)
{

0 comments on commit 587fb54

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