Do not mix void with other return types

Inspired by #7527
This commit is contained in:
Marc Würth 2015-10-10 15:49:00 +02:00
parent f50efd7595
commit ed410dd12c
4 changed files with 7 additions and 7 deletions

View file

@ -155,7 +155,7 @@ class Component extends Object {
* @param string|array $url Either the string or URL array that is being redirected to.
* @param int $status The status code of the redirect
* @param bool $exit Will the script exit.
* @return array|void Either an array or null.
* @return array|null Either an array or null.
* @link http://book.cakephp.org/2.0/en/controllers/components.html#Component::beforeRedirect
*/
public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) {

View file

@ -3209,7 +3209,7 @@ class DboSource extends DataSource {
*
* @param string $table The name of the table to update.
* @param string $column The column to use when resetting the sequence value.
* @return bool|void success.
* @return bool Success.
*/
public function resetSequence($table, $column) {
}

View file

@ -207,8 +207,8 @@ class Router {
/**
* Set the default route class to use or return the current one
*
* @param string $routeClass to set as default
* @return mixed void|string
* @param string $routeClass The route class to set as default.
* @return string|null The default route class.
* @throws RouterException
*/
public static function defaultRouteClass($routeClass = null) {

View file

@ -980,10 +980,10 @@ class PaginatorHelper extends AppHelper {
* ### Options:
*
* - `model` The model to use defaults to PaginatorHelper::defaultModel()
* - `block` The block name to append the output to, or false/absenst to return as a string
* - `block` The block name to append the output to, or false/absent to return as a string
*
* @param array $options Array of options
* @return string|void Meta links
* @param array $options Array of options.
* @return string|null Meta links.
*/
public function meta($options = array()) {
$model = isset($options['model']) ? $options['model'] : null;