* Ensures PHP Code Sniffs continue to pass.
* Fixes all code base issues to pass a level 5 PHP static analysis.
* Updates PHPStan configurations to use a level 5 baseline.
@ -311,8 +311,8 @@ class OpenID_Connect_Generic_Client_Wrapper {
/**
/**
* Modify outgoing requests according to settings.
* Modify outgoing requests according to settings.
*
*
* @param array $request The outgoing request array.
* @param array<mixed> $request The outgoing request array.
* @param string $operation The request operation name.
* @param string $operation The request operation name.
*
*
* @return mixed
* @return mixed
*/
*/
@ -429,7 +429,7 @@ class OpenID_Connect_Generic_Client_Wrapper {
$this->error_redirect( $user );
$this->error_redirect( $user );
}
}
} else {
} else {
$this->error_redirect( new WP_Error( 'identity-not-map-existing-user', __( 'User identity is not link to an existing WordPress user' ), $user_claim ) );
$this->error_redirect( new WP_Error( 'identity-not-map-existing-user', __( 'User identity is not linked to an existing WordPress user' ), $user_claim ) );
}
}
} else {
} else {
// Allow plugins / themes to take action using current claims on existing user (e.g. update role).
// Allow plugins / themes to take action using current claims on existing user (e.g. update role).
@ -468,7 +468,7 @@ class OpenID_Connect_Generic_Client_Wrapper {
/**
/**
* Validate the potential WP_User.
* Validate the potential WP_User.
*
*
* @param WP_User $user The user object.
* @param WP_User|WP_Error|false $user The user object.
*
*
* @return true|WP_Error
* @return true|WP_Error
*/
*/
@ -514,9 +514,9 @@ class OpenID_Connect_Generic_Client_Wrapper {
/**
/**
* Save refresh token to WP session tokens
* Save refresh token to WP session tokens
*
*
* @param WP_Session_Tokens $manager A user session tokens manager.
* @param WP_Session_Tokens $manager A user session tokens manager.
* @param string $token The current users session token.
* @param string $token The current users session token.
* @param array $token_response The authentication token response.
* @param array|WP_Error|null $token_response The authentication token response.
*/
*/
function save_refresh_token( $manager, $token, $token_response ) {
function save_refresh_token( $manager, $token, $token_response ) {
if ( ! $this->settings->token_refresh_enable ) {
if ( ! $this->settings->token_refresh_enable ) {
@ -578,6 +578,10 @@ class OpenID_Connect_Generic_Client_Wrapper {
* @return string|WP_Error|null
* @return string|WP_Error|null
*/
*/
private function get_username_from_claim( $user_claim ) {
private function get_username_from_claim( $user_claim ) {
return new WP_Error( 'username-transliteration-failed', printf( __( 'Username %1$s could not be transliterated' ), $desired_username ), $desired_username );
return new WP_Error( 'username-transliteration-failed', sprintf( __( 'Username %1$s could not be transliterated' ), $desired_username ), $desired_username );
return new WP_Error( 'username-normalization-failed', printf( __( 'Username %1$s could not be normalized' ), $transliterated_username ), $transliterated_username );
return new WP_Error( 'username-normalization-failed', sprintf( __( 'Username %1$s could not be normalized' ), $transliterated_username ), $transliterated_username );
}
}
// Copy the username for incrementing.
// Copy the username for incrementing.
@ -623,7 +628,7 @@ class OpenID_Connect_Generic_Client_Wrapper {
*
*
* @param array $user_claim The IDP authenticated user claim data.
* @param array $user_claim The IDP authenticated user claim data.
*
*
* @return string|null
* @return string|WP_Error|null
*/
*/
private function get_nickname_from_claim( $user_claim ) {
private function get_nickname_from_claim( $user_claim ) {
$desired_nickname = null;
$desired_nickname = null;
@ -631,6 +636,11 @@ class OpenID_Connect_Generic_Client_Wrapper {
return new WP_Error( 'no-nickname', sprintf( __( 'No nickname found in user claim using key: %1$s.' ), $this->settings->nickname_key ), $this->settings->nickname_key );
Tim Nolte
5 years ago