From ed410dd12cbb7ede3d0813157a756ba840240486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=BCrth?= <ravage@bluewin.ch>
Date: Sat, 10 Oct 2015 15:49:00 +0200
Subject: [PATCH] Do not mix void with other return types

Inspired by #7527
---
 lib/Cake/Controller/Component.php        | 2 +-
 lib/Cake/Model/Datasource/DboSource.php  | 2 +-
 lib/Cake/Routing/Router.php              | 4 ++--
 lib/Cake/View/Helper/PaginatorHelper.php | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Cake/Controller/Component.php b/lib/Cake/Controller/Component.php
index 4b81d8fe5..e395aded2 100644
--- a/lib/Cake/Controller/Component.php
+++ b/lib/Cake/Controller/Component.php
@@ -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) {
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 3153e851c..75a18dcf4 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -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) {
 	}
diff --git a/lib/Cake/Routing/Router.php b/lib/Cake/Routing/Router.php
index cfc9bbd1c..5575fb6f0 100644
--- a/lib/Cake/Routing/Router.php
+++ b/lib/Cake/Routing/Router.php
@@ -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) {
diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php
index f5e3e72f2..7998a0037 100644
--- a/lib/Cake/View/Helper/PaginatorHelper.php
+++ b/lib/Cake/View/Helper/PaginatorHelper.php
@@ -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;