adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not mix void with other return types

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Component.php
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 string|array $url Either the string or URL array that is being redirected to.
* @param int $status The status code of the redirect * @param int $status The status code of the redirect
* @param bool $exit Will the script exit. * @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 * @link http://book.cakephp.org/2.0/en/controllers/components.html#Component::beforeRedirect
*/ */
public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) { public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) {

2
lib/Cake/Model/Datasource/DboSource.php
View file

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

4
lib/Cake/Routing/Router.php
View file

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

6
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -980,10 +980,10 @@ class PaginatorHelper extends AppHelper {
* ### Options: * ### Options:
* *
* - `model` The model to use defaults to PaginatorHelper::defaultModel() * - `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 * @param array $options Array of options.
* @return string|void Meta links * @return string|null Meta links.
*/ */
public function meta($options = array()) { public function meta($options = array()) {
$model = isset($options['model']) ? $options['model'] : null; $model = isset($options['model']) ? $options['model'] : null;