adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9998 from xavier83ar/2.next.fix-phpdoc

Browse source 
Wrong return type hint in Controller::redirect #9987
This commit is contained in:
ADmad 2017-01-09 16:56:53 +05:30 • committed by GitHub
commit a641d6a1eb
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Controller/Controller.php
View file

@ -754,7 +754,7 @@ class Controller extends CakeObject implements CakeEventListener {
* or an absolute URL * or an absolute URL
* @param int|array|null $status HTTP status code (eg: 301). Defaults to 302 when null is passed. * @param int|array|null $status HTTP status code (eg: 301). Defaults to 302 when null is passed.
* @param bool $exit If true, exit() will be called after the redirect * @param bool $exit If true, exit() will be called after the redirect
* @return \Cake\Network\Response|null * @return CakeResponse|null
* @triggers Controller.beforeRedirect $this, array($url, $status, $exit) * @triggers Controller.beforeRedirect $this, array($url, $status, $exit)
* @link http://book.cakephp.org/2.0/en/controllers.html#Controller::redirect * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::redirect
*/ */

2
lib/Cake/Controller/Scaffold.php
View file

@ -324,7 +324,7 @@ class Scaffold {
* *
* @param string $message Message to display * @param string $message Message to display
* @param string $element Flash template to use * @param string $element Flash template to use
* @return \Cake\Network\Response|null * @return CakeResponse|null
*/ */
protected function _sendMessage($message, $element = 'default') { protected function _sendMessage($message, $element = 'default') {
if ($this->_validSession) { if ($this->_validSession) {