Merge pull request #8223 from garas/2.8-AuthComponent-user

Use mixed return type for AuthComponent::user()
This commit is contained in:
Mark S 2016-02-09 23:54:03 +01:00
commit 6413610e76

View file

@ -655,7 +655,7 @@ class AuthComponent extends Component {
* cookies + sessions will be used. * cookies + sessions will be used.
* *
* @param string|null $key field to retrieve. Leave null to get entire User record * @param string|null $key field to retrieve. Leave null to get entire User record
* @return array|null User record. or null if no user is logged in. * @return mixed|null User record. or null if no user is logged in.
* @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user
*/ */
public static function user($key = null) { public static function user($key = null) {