diff --git a/src/Database/Connection.php b/src/Database/Connection.php
index f1018581fd7..999fb327146 100644
--- a/src/Database/Connection.php
+++ b/src/Database/Connection.php
@@ -134,11 +134,11 @@ public function configName() {
  *
  * If no params are passed it will return the current driver instance.
  *
- * @param string|Driver $driver
+ * @param string|Driver $driver The driver instance to use.
  * @param array|null $config Either config for a new driver or null.
  * @throws \Cake\Database\Error\MissingDriverException When a driver class is missing.
  * @throws \Cake\Database\Error\MissingExtensionException When a driver's PHP extension is missing.
- * @return Driver
+ * @return \Cake\Database\Driver
  */
 	public function driver($driver = null, $config = null) {
 		if ($driver === null) {
@@ -192,7 +192,7 @@ public function isConnected() {
 /**
  * Prepares a SQL statement to be executed.
  *
- * @param string|\Cake\Database\Query $sql
+ * @param string|\Cake\Database\Query $sql The SQL to convert into a prepared statement.
  * @return \Cake\Database\StatementInterface
  */
 	public function prepare($sql) {
@@ -259,7 +259,7 @@ public function run(Query $query) {
 /**
  * Executes a SQL statement and returns the Statement object as result.
  *
- * @param string $sql
+ * @param string $sql The SQL query to execute.
  * @return \Cake\Database\StatementInterface
  */
 	public function query($sql) {
@@ -271,7 +271,7 @@ public function query($sql) {
 /**
  * Create a new Query instance for this connection.
  *
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function newQuery() {
 		return new Query($this);
@@ -422,7 +422,7 @@ public function rollback() {
  * `$connection->useSavePoints(false)` Disables usage of savepoints and returns false
  * `$connection->useSavePoints()` Returns current status
  *
- * @param bool|null $enable
+ * @param bool|null $enable Whether or not save points should be used.
  * @return bool true if enabled, false otherwise
  */
 	public function useSavePoints($enable = null) {
@@ -440,7 +440,7 @@ public function useSavePoints($enable = null) {
 /**
  * Creates a new save point for nested transactions.
  *
- * @param string $name
+ * @param string $name The save point name.
  * @return void
  */
 	public function createSavePoint($name) {
@@ -450,7 +450,7 @@ public function createSavePoint($name) {
 /**
  * Releases a save point by its name.
  *
- * @param string $name
+ * @param string $name The save point name.
  * @return void
  */
 	public function releaseSavePoint($name) {
@@ -460,7 +460,7 @@ public function releaseSavePoint($name) {
 /**
  * Rollback a save point by its name.
  *
- * @param string $name
+ * @param string $name The save point name.
  * @return void
  */
 	public function rollbackSavepoint($name) {
@@ -480,7 +480,7 @@ public function rollbackSavepoint($name) {
  *
  * {{{
  * $connection->transactional(function($connection) {
- *	$connection->newQuery()->delete('users')->execute();
+ *   $connection->newQuery()->delete('users')->execute();
  * });
  * }}}
  *
@@ -511,7 +511,7 @@ public function transactional(callable $callback) {
 /**
  * Quotes value to be used safely in database query.
  *
- * @param mixed $value
+ * @param mixed $value The value to quote.
  * @param string $type Type to be used for determining kind of quoting to perform
  * @return mixed quoted value
  */
@@ -533,7 +533,7 @@ public function supportsQuoting() {
  * Quotes a database identifier (a column name, table name, etc..) to
  * be used safely in queries without the risk of using reserved words.
  *
- * @param string $identifier
+ * @param string $identifier The identifier to quote.
  * @return string
  */
 	public function quoteIdentifier($identifier) {
diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
index 0cb118fa49b..e8372e2890b 100644
--- a/src/Database/Driver/PDODriverTrait.php
+++ b/src/Database/Driver/PDODriverTrait.php
@@ -52,7 +52,7 @@ protected function _connect(array $config) {
  * If first argument is passed, it will set internal conenction object or
  * result to the value passed
  *
- * @param null|PDO instance $connection
+ * @param null|PDO instance $connection The PDO connection instance.
  * @return mixed connection object used internally
  */
 	public function connection($connection = null) {
@@ -74,7 +74,7 @@ public function disconnect() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string|\Cake\Database\Query $query
+ * @param string|\Cake\Database\Query $query The query to turn into a prepared statement.
  * @return \Cake\Database\StatementInterface
  */
 	public function prepare($query) {
@@ -124,7 +124,7 @@ public function rollbackTransaction() {
 /**
  * Returns a value in a safe representation to be used in a query string
  *
- * @param mixed $value
+ * @param mixed $value The value to quote.
  * @param string $type Type to be used for determining kind of quoting to perform
  * @return string
  */
diff --git a/src/Database/Driver/Postgres.php b/src/Database/Driver/Postgres.php
index c18e07e95df..d1ea73bbe69 100644
--- a/src/Database/Driver/Postgres.php
+++ b/src/Database/Driver/Postgres.php
@@ -94,7 +94,7 @@ public function enabled() {
 /**
  * Sets connection encoding
  *
- * @param string $encoding
+ * @param string $encoding The encoding to use.
  * @return void
  */
 	public function setEncoding($encoding) {
@@ -106,7 +106,7 @@ public function setEncoding($encoding) {
  * Sets connection default schema, if any relation defined in a query is not fully qualified
  * postgres will fallback to looking the relation into defined default schema
  *
- * @param string $schema
+ * @param string $schema The schema names to set `search_path` to.
  * @return void
  */
 	public function setSchema($schema) {
diff --git a/src/Database/Driver/Sqlite.php b/src/Database/Driver/Sqlite.php
index b4c706f899f..96284df8e23 100644
--- a/src/Database/Driver/Sqlite.php
+++ b/src/Database/Driver/Sqlite.php
@@ -83,7 +83,7 @@ public function enabled() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string|\Cake\Database\Query $query
+ * @param string|\Cake\Database\Query $query The query to prepare.
  * @return \Cake\Database\StatementInterface
  */
 	public function prepare($query) {
diff --git a/src/Database/Driver/Sqlserver.php b/src/Database/Driver/Sqlserver.php
index 6dc2ca73abf..eb0d59d9b3e 100644
--- a/src/Database/Driver/Sqlserver.php
+++ b/src/Database/Driver/Sqlserver.php
@@ -94,7 +94,7 @@ public function enabled() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string|\Cake\Database\Query $query
+ * @param string|\Cake\Database\Query $query The query to prepare.
  * @return \Cake\Database\StatementInterface
  */
 	public function prepare($query) {
diff --git a/src/Database/Query.php b/src/Database/Query.php
index 8078f363e16..09dda120b55 100644
--- a/src/Database/Query.php
+++ b/src/Database/Query.php
@@ -278,19 +278,19 @@ public function select($fields = [], $overwrite = false) {
  * ##Examples:
  *
  * {{{
- *  // Filters products with the same name and city
- *	$query->select(['name', 'city'])->from('products')->distinct();
+ * // Filters products with the same name and city
+ * $query->select(['name', 'city'])->from('products')->distinct();
  *
- *  // Filters products in the same city
- *	$query->distinct(['city']);
+ * // Filters products in the same city
+ * $query->distinct(['city']);
  *
- *  // Filter products with the same name
- *	$query->distinct(['name'], true);
+ * // Filter products with the same name
+ * $query->distinct(['name'], true);
  * }}}
  *
- * @param array|ExpressionInterface fields to be filtered on
+ * @param array|ExpressionInterface $on fields to be filtered on
  * @param bool $overwrite whether to reset fields with passed list or not
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function distinct($on = [], $overwrite = false) {
 		if ($on === []) {
@@ -319,18 +319,18 @@ public function distinct($on = [], $overwrite = false) {
  * ### Example:
  *
  * {{{
- *  // Ignore cache query in MySQL
- *	$query->select(['name', 'city'])->from('products')->modifier('SQL_NO_CACHE');
- *	// It will produce the SQL: SELECT SQL_NO_CACHE name, city FROM products
+ * // Ignore cache query in MySQL
+ * $query->select(['name', 'city'])->from('products')->modifier('SQL_NO_CACHE');
+ * // It will produce the SQL: SELECT SQL_NO_CACHE name, city FROM products
  *
- *  // Or with multiple modifiers
- *	$query->select(['name', 'city'])->from('products')->modifier(['HIGH_PRIORITY', 'SQL_NO_CACHE']);
- *	// It will produce the SQL: SELECT HIGH_PRIORITY SQL_NO_CACHE name, city FROM products
+ * // Or with multiple modifiers
+ * $query->select(['name', 'city'])->from('products')->modifier(['HIGH_PRIORITY', 'SQL_NO_CACHE']);
+ * // It will produce the SQL: SELECT HIGH_PRIORITY SQL_NO_CACHE name, city FROM products
  * }}}
  *
  * @param array|ExpressionInterface|string $modifiers modifiers to be applied to the query
  * @param bool $overwrite whether to reset order with field list or not
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function modifier($modifiers, $overwrite = false) {
 		$this->_dirty();
@@ -612,12 +612,12 @@ public function join($tables = null, $types = [], $overwrite = false) {
  * 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|ExpressionInterface|callback $conditions
+ * @param string|array|ExpressionInterface|callback $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
  * @see \Cake\Database\QueryExpression
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function where($conditions = null, $types = [], $overwrite = false) {
 		if ($overwrite) {
@@ -646,7 +646,7 @@ public function where($conditions = null, $types = [], $overwrite = false) {
  * ##Examples:
  *
  * {{{
- *	$query->where(['title' => 'Hello World')->andWhere(['author_id' => 1]);
+ * $query->where(['title' => 'Hello World')->andWhere(['author_id' => 1]);
  * }}}
  *
  * Will produce:
@@ -654,9 +654,9 @@ public function where($conditions = null, $types = [], $overwrite = false) {
  * ``WHERE title = 'Hello World' AND author_id = 1``
  *
  * {{{
- *	$query
- *		->where(['OR' => ['published' => false, 'published is NULL']])
- *		->andWhere(['author_id' => 1, 'comments_count >' => 10])
+ * $query
+ *   ->where(['OR' => ['published' => false, 'published is NULL']])
+ *   ->andWhere(['author_id' => 1, 'comments_count >' => 10])
  * }}}
  *
  * Produces:
@@ -664,24 +664,24 @@ public function where($conditions = null, $types = [], $overwrite = false) {
  * ``WHERE (published = 0 OR published IS NULL) AND author_id = 1 AND comments_count > 10``
  *
  * {{{
- *	$query
- *		->where(['title' => 'Foo'])
- *		->andWhere(function($exp, $query) {
- *			return $exp
- *			->add(['author_id' => 1])
- *			->or_(['author_id' => 2]);
- *		});
+ * $query
+ *   ->where(['title' => 'Foo'])
+ *   ->andWhere(function($exp, $query) {
+ *     return $exp
+ *       ->add(['author_id' => 1])
+ *       ->or_(['author_id' => 2]);
+ *   });
  * }}}
  *
  * Generates the following conditions:
  *
  * ``WHERE (title = 'Foo') AND (author_id = 1 OR author_id = 2)``
  *
- * @param string|array|ExpressionInterface|callback $conditions
+ * @param string|array|ExpressionInterface|callback $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
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function andWhere($conditions, $types = []) {
 		$this->_conjugate('where', $conditions, 'AND', $types);
@@ -707,7 +707,7 @@ public function andWhere($conditions, $types = []) {
  * ##Examples:
  *
  * {{{
- *	$query->where(['title' => 'Hello World')->orWhere(['title' => 'Foo']);
+ * $query->where(['title' => 'Hello World')->orWhere(['title' => 'Foo']);
  * }}}
  *
  * Will produce:
@@ -715,9 +715,9 @@ public function andWhere($conditions, $types = []) {
  * ``WHERE title = 'Hello World' OR title = 'Foo'``
  *
  * {{{
- *	$query
- *		->where(['OR' => ['published' => false, 'published is NULL']])
- *		->orWhere(['author_id' => 1, 'comments_count >' => 10])
+ * $query
+ *   ->where(['OR' => ['published' => false, 'published is NULL']])
+ *   ->orWhere(['author_id' => 1, 'comments_count >' => 10])
  * }}}
  *
  * Produces:
@@ -725,24 +725,24 @@ public function andWhere($conditions, $types = []) {
  * ``WHERE (published = 0 OR published IS NULL) OR (author_id = 1 AND comments_count > 10)``
  *
  * {{{
- *	$query
- *		->where(['title' => 'Foo'])
- *		->orWhere(function($exp, $query) {
- *			return $exp
- *			->add(['author_id' => 1])
- *			->or_(['author_id' => 2]);
- *		});
+ * $query
+ *   ->where(['title' => 'Foo'])
+ *   ->orWhere(function($exp, $query) {
+ *     return $exp
+ *       ->add(['author_id' => 1])
+ *       ->or_(['author_id' => 2]);
+ *   });
  * }}}
  *
  * Generates the following conditions:
  *
  * ``WHERE (title = 'Foo') OR (author_id = 1 OR author_id = 2)``
  *
- * @param string|array|ExpressionInterface|callback $conditions
+ * @param string|array|ExpressionInterface|callback $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
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function orWhere($conditions, $types = []) {
 		$this->_conjugate('where', $conditions, 'OR', $types);
@@ -765,7 +765,7 @@ public function orWhere($conditions, $types = []) {
  * ##Examples:
  *
  * {{{
- *	$query->order(['title' => 'DESC', 'author_id' => 'ASC']);
+ * $query->order(['title' => 'DESC', 'author_id' => 'ASC']);
  * }}}
  *
  * Produces:
@@ -773,7 +773,7 @@ public function orWhere($conditions, $types = []) {
  * ``ORDER BY title DESC, author_id ASC``
  *
  * {{{
- *	$query->order(['title' => 'DESC NULLS FIRST'])->order('author_id');
+ * $query->order(['title' => 'DESC NULLS FIRST'])->order('author_id');
  * }}}
  *
  * Will generate:
@@ -781,17 +781,17 @@ public function orWhere($conditions, $types = []) {
  * ``ORDER BY title DESC NULLS FIRST, author_id``
  *
  * {{{
- *	$expression = $query->newExpr()->add(['id % 2 = 0']);
- *	$query->order($expression)->order(['title' => 'ASC']);
+ * $expression = $query->newExpr()->add(['id % 2 = 0']);
+ * $query->order($expression)->order(['title' => 'ASC']);
  * }}}
  *
  * Will become:
  *
  * ``ORDER BY (id %2 = 0), title ASC``
  *
- * @param array|ExpressionInterface|string $fields fields to be added to the list
+ * @param array|\Cake\Database\ExpressionInterface|string $fields fields to be added to the list
  * @param bool $overwrite whether to reset order with field list or not
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function order($fields, $overwrite = false) {
 		if ($overwrite) {
@@ -820,13 +820,16 @@ public function order($fields, $overwrite = false) {
  * ##Examples:
  *
  * {{{
- *	$query->group(['id', 'title']); // Produces GROUP BY id, title
- *	$query->group('title'); // Produces GROUP BY title
+ * // Produces GROUP BY id, title
+ * $query->group(['id', 'title']);
+ *
+ * // Produces GROUP BY title
+ * $query->group('title');
  * }}}
  *
  * @param array|ExpressionInterface|string $fields fields to be added to the list
  * @param bool $overwrite whether to reset fields with passed list or not
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function group($fields, $overwrite = false) {
 		if ($overwrite) {
@@ -844,15 +847,15 @@ public function group($fields, $overwrite = false) {
 
 /**
  * Adds a condition or set of conditions to be used in the HAVING clause for this
- * query. This method operates in exactly the same way as the method ``where()``
+ * query. This method operates in exactly the same way as the method `where()`
  * does. Please refer to its documentation for an insight on how to using each
  * parameter.
  *
- * @param string|array|ExpressionInterface|callback $conditions
+ * @param string|array|ExpressionInterface|callback $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()
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function having($conditions = null, $types = [], $overwrite = false) {
 		if ($overwrite) {
@@ -868,10 +871,10 @@ 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|ExpressionInterface|callback $conditions
+ * @param string|array|ExpressionInterface|callback $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 Query
+ * @return \Cake\Database\Query
  */
 	public function andHaving($conditions, $types = []) {
 		$this->_conjugate('having', $conditions, 'AND', $types);
@@ -884,10 +887,10 @@ 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|ExpressionInterface|callback $conditions
- * @param array $types associative array of type names used to bind values to query
+ * @param string|array|ExpressionInterface|callback $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 Query
+ * @return \Cake\Database\Query
  */
 	public function orHaving($conditions, $types = []) {
 		$this->_conjugate('having', $conditions, 'OR', $types);
@@ -904,7 +907,7 @@ public function orHaving($conditions, $types = []) {
  * Pages should start at 1.
  *
  * @param int $num The page number you want.
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function page($num) {
 		$limit = $this->clause('limit');
@@ -929,12 +932,12 @@ public function page($num) {
  * ## Examples
  *
  * {{{
- *	$query->limit(10) // generates LIMIT 10
- *	$query->limit($query->newExpr()->add(['1 + 1'])); // LIMIT (1 + 1)
+ * $query->limit(10) // generates LIMIT 10
+ * $query->limit($query->newExpr()->add(['1 + 1'])); // LIMIT (1 + 1)
  * }}}
  *
  * @param int|ExpressionInterface $num number of records to be returned
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function limit($num) {
 		$this->_dirty();
@@ -1183,13 +1186,13 @@ public function delete($table = null) {
  * {{{
  * $query->select('id')->where(['author_id' => 1])->epilog('FOR UPDATE');
  * $query
- *	->insert('articles', ['title'])
- *	->values(['author_id' => 1])
- *	->epilog('RETURNING id');
+ *  ->insert('articles', ['title'])
+ *  ->values(['author_id' => 1])
+ *  ->epilog('RETURNING id');
  * }}}
  *
- * @param string|QueryExpression the expression to be appended
- * @return Query
+ * @param string|\Cake\Database\QueryExpression $expression The expression to be appended
+ * @return \Cake\Database\Query
  */
 	public function epilog($expression = null) {
 		$this->_dirty();
@@ -1212,7 +1215,7 @@ public function type() {
  * this function in subclasses to use a more specialized QueryExpression class
  * if required.
  *
- * @return QueryExpression
+ * @return \Cake\Database\QueryExpression
  */
 	public function newExpr() {
 		return new QueryExpression([], $this->typeMap());
@@ -1229,7 +1232,7 @@ public function newExpr() {
  * $query->func()->dateDiff(['2012-01-05', '2012-01-02'])
  * }}}
  *
- * @return FunctionsBuilder
+ * @return \Cake\Database\FunctionsBuilder
  */
 	public function func() {
 		if (empty($this->_functionsBuilder)) {
@@ -1306,15 +1309,15 @@ public function clause($name) {
  * ## Example
  *
  * {{{
- *	$query->decorateResults(function($row) {
- *		$row['order_total'] = $row['subtotal'] + ($row['subtotal'] * $row['tax']);
- *		return $row;
- *	});
+ * $query->decorateResults(function($row) {
+ *   $row['order_total'] = $row['subtotal'] + ($row['subtotal'] * $row['tax']);
+ *    return $row;
+ * });
  * }}}
  *
- * @param null|callable $callback
- * @param bool $overwrite
- * @return Query
+ * @param null|callable $callback The callback to invoke when results are fetched.
+ * @param bool $overwrite Whether or not this should append or replace all existing decorators.
+ * @return \Cake\Database\Query
  */
 	public function decorateResults($callback, $overwrite = false) {
 		if ($overwrite) {
@@ -1338,7 +1341,7 @@ public function decorateResults($callback, $overwrite = false) {
  *
  * @param callable $callback the function to be executed for each ExpressionInterface
  *   found inside this query.
- * @return Query
+ * @return \Cake\Database\Query
  */
 	public function traverseExpressions(callable $callback) {
 		$visitor = function($expression) use (&$visitor, $callback) {
@@ -1369,11 +1372,11 @@ public function traverseExpressions(callable $callback) {
  * will create several placeholders of type string.
  *
  * @param string|int $param placeholder to be replaced with quoted version
- * of $value
+ *   of $value
  * @param mixed $value The value to be bound
  * @param string|int $type the mapped type name, used for casting when sending
- * to database
- * @return Query
+ *   to database
+ * @return \Cake\Database\Query
  */
 	public function bind($param, $value, $type = 'string') {
 		$this->valueBinder()->bind($param, $value, $type);
@@ -1388,9 +1391,9 @@ public function bind($param, $value, $type = 'string') {
  * associate values to those placeholders so that they can be passed correctly
  * statement object.
  *
- * @param ValueBinder $binder new instance to be set. If no value is passed the
- * default one will be returned
- * @return Query|\Cake\Database\ValueBinder
+ * @param \Cake\Database\ValueBinder $binder new instance to be set. If no value is passed the
+ *   default one will be returned
+ * @return \Cake\Database\Query|\Cake\Database\ValueBinder
  */
 	public function valueBinder($binder = null) {
 		if ($binder === null) {
diff --git a/src/Database/TypeConverterTrait.php b/src/Database/TypeConverterTrait.php
index c633db9ea00..5223eb61173 100644
--- a/src/Database/TypeConverterTrait.php
+++ b/src/Database/TypeConverterTrait.php
@@ -23,8 +23,8 @@ trait TypeConverterTrait {
  * Converts a give value to a suitable database value based on type
  * and return relevant internal statement type
  *
- * @param mixed $value
- * @param string $type
+ * @param mixed $value The value to cast
+ * @param \Cake\Database\Type|string $type The type name or type instance to use.
  * @return array list containing converted value and internal type
  */
 	public function cast($value, $type) {