Skip to content

Fix incorrect spellings & capitalizations #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect spellings & capitalizations #550

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 18 additions & 41 deletions src/Core/CoreConstants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,15 +336,7 @@ public static function getQuickBooksOnlineAPIEntityRules()
* @return String | null The access token developer provided
*/
public static function getAccessTokenFromArray(array $settings){
if(array_key_exists('accessTokenKey', $settings)){
return $settings['accessTokenKey'];
}else if(array_key_exists('accessToken', $settings)){
return $settings['accessToken'];
} else if(array_key_exists('AccessToken', $settings)){
return $settings['AccessToken'];
} else{
return null;
}
return static::getValueFromArray($settings, ['accessTokenKey','accessToken']);
}

/**
Expand All @@ -353,15 +345,7 @@ public static function getAccessTokenFromArray(array $settings){
* @return String | null The refresh token developer provided
*/
public static function getRefreshTokenFromArray(array $settings){
if(array_key_exists('refreshTokenKey', $settings)){
return $settings['refreshTokenKey'];
}else if(array_key_exists('refreshToken', $settings)){
return $settings['refreshToken'];
} else if(array_key_exists('RefreshToken', $settings)){
return $settings['RefreshToken'];
} else{
return null;
}
return static::getValueFromArray($settings, ['refreshTokenKey','refreshToken']);
}

/**
Expand All @@ -370,30 +354,23 @@ public static function getRefreshTokenFromArray(array $settings){
* @return String | null The redirect url developer provide
*/
public static function getRedirectURL(array $settings){
if(array_key_exists('redirectURL', $settings)){
return $settings['redirectURL'];
}else if(array_key_exists('RedirectUrl', $settings)){
return $settings['RedirectUrl'];
} else if(array_key_exists('redirecturl', $settings)){
return $settings['redirecturl'];
} else if(array_key_exists('redirectUrl', $settings)){
return $settings['redirectUrl'];
} else if(array_key_exists('RedirectURL', $settings)){
return $settings['RedirectURL'];
} else if(array_key_exists('redirectURI', $settings)){
return $settings['redirectURI'];
}else if(array_key_exists('RedirectUri', $settings)){
return $settings['RedirectUri'];
} else if(array_key_exists('redirecturi', $settings)){
return $settings['redirecturl'];
} else if(array_key_exists('redirectUri', $settings)){
return $settings['redirectUrl'];
} else if(array_key_exists('RedirectURI', $settings)){
return $settings['RedirectURI'];
}
else{
return null;
return static::getValueFromArray($settings, ['requestURL','requestURI']);
}

/**
* Internal helper method to get value from array by varying key spellings or capitalizations
* @param Array $settings The array contains all the key values
* @param Array $keyVariations The array contains all the key spelling variations
* @return String | null The value from the array
*/
private static function getValueFromArray(array $settings, array $keyVariations){
$lowercaseKeyVariations = array_map('strtolower', $keyVariations);
foreach(array_keys($settings) as $settingsKey){
if(in_array(strtolower($settingsKey), $lowercaseKeyVariations, true)){
return $settings[$settingsKey];
}
}
return null;
}

//--------------------------------------------------------------------------------------------------
Expand Down