diff --git a/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php index 7e07925e6..90ba20f1c 100644 --- a/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthenticate.php @@ -151,7 +151,7 @@ abstract class BaseAuthenticate { * @param CakeRequest $request Request object. * @return mixed Either false or an array of user information */ - public function getUser($request) { + public function getUser(CakeRequest $request) { return false; } diff --git a/lib/Cake/Controller/Component/Auth/BaseAuthorize.php b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php index 72001e794..2f3f7faef 100644 --- a/lib/Cake/Controller/Component/Auth/BaseAuthorize.php +++ b/lib/Cake/Controller/Component/Auth/BaseAuthorize.php @@ -109,7 +109,7 @@ abstract class BaseAuthorize { * @param string $path * @return string the action path for the given request. */ - public function action($request, $path = '/:plugin/:controller/:action') { + public function action(CakeRequest $request, $path = '/:plugin/:controller/:action') { $plugin = empty($request['plugin']) ? null : Inflector::camelize($request['plugin']) . '/'; $path = str_replace( array(':controller', ':action', ':plugin/'), diff --git a/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php index 940c1900c..e78eccd18 100644 --- a/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/BasicAuthenticate.php @@ -107,7 +107,7 @@ class BasicAuthenticate extends BaseAuthenticate { * @param CakeRequest $request Request object. * @return mixed Either false or an array of user information */ - public function getUser($request) { + public function getUser(CakeRequest $request) { $username = env('PHP_AUTH_USER'); $pass = env('PHP_AUTH_PW'); diff --git a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php index de2eb9d80..7cbd9db71 100644 --- a/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php +++ b/lib/Cake/Controller/Component/Auth/DigestAuthenticate.php @@ -134,7 +134,7 @@ class DigestAuthenticate extends BaseAuthenticate { * @param CakeRequest $request Request object. * @return mixed Either false or an array of user information */ - public function getUser($request) { + public function getUser(CakeRequest $request) { $digest = $this->_getDigest(); if (empty($digest)) { return false; diff --git a/lib/Cake/Controller/Component/AuthComponent.php b/lib/Cake/Controller/Component/AuthComponent.php index cb7cba8a3..f614e4731 100644 --- a/lib/Cake/Controller/Component/AuthComponent.php +++ b/lib/Cake/Controller/Component/AuthComponent.php @@ -393,7 +393,7 @@ class AuthComponent extends Component { * @param CakeRequest $request The request to authenticate for. If empty, the current request will be used. * @return boolean True if $user is authorized, otherwise false */ - public function isAuthorized($user = null, $request = null) { + public function isAuthorized($user = null, CakeRequest $request = null) { if (empty($user) && !$this->user()) { return false; }