Skip to content

Commit

Permalink
Do not mix void with other return types
Browse files Browse the repository at this point in the history
Inspired by #7527
  • Loading branch information
ravage84 committed Oct 10, 2015
1 parent f50efd7 commit ed410dd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component.php
Expand Up @@ -155,7 +155,7 @@ public function shutdown(Controller $controller) {
* @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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Model/Datasource/DboSource.php
Expand Up @@ -3209,7 +3209,7 @@ public function insertMulti($table, $fields, $values) {
*
* @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) {
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Routing/Router.php
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/View/Helper/PaginatorHelper.php
Expand Up @@ -980,10 +980,10 @@ public function last($last = 'last >>', $options = array()) {
* ### 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;
Expand Down

0 comments on commit ed410dd

Please sign in to comment.