Awight has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329543 )
Change subject: Short array syntax tweaks. ...................................................................... Short array syntax tweaks. find . -name "*.php" -exec php ~/php-short-array-syntax-converter/revert.php -w "{}" \; Bug: T154209 Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5 --- M phpmailer/phpmailer/class.phpmaileroauthgoogle.php M phpmailer/phpmailer/get_oauth_token.php 2 files changed, 7 insertions(+), 7 deletions(-) Approvals: Awight: Verified; Looks good to me, approved diff --git a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php index 71c9bd3..8d169b2 100644 --- a/phpmailer/phpmailer/class.phpmaileroauthgoogle.php +++ b/phpmailer/phpmailer/class.phpmaileroauthgoogle.php @@ -51,10 +51,10 @@ private function getProvider() { - return new League\OAuth2\Client\Provider\Google([ + return new League\OAuth2\Client\Provider\Google(array( 'clientId' => $this->oauthClientId, 'clientSecret' => $this->oauthClientSecret - ]); + )); } private function getGrant() @@ -66,7 +66,7 @@ { $provider = $this->getProvider(); $grant = $this->getGrant(); - return $provider->getAccessToken($grant, ['refresh_token' => $this->oauthRefreshToken]); + return $provider->getAccessToken($grant, array('refresh_token' => $this->oauthRefreshToken)); } public function getOauth64() diff --git a/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/phpmailer/get_oauth_token.php index 2c26d0f..b95d5c4 100644 --- a/phpmailer/phpmailer/get_oauth_token.php +++ b/phpmailer/phpmailer/get_oauth_token.php @@ -80,24 +80,24 @@ $params = array_merge( parent::getAuthorizationParameters($options), - array_filter([ + array_filter(array( 'hd' => $this->hostedDomain, 'access_type' => $this->accessType, 'scope' => $this->scope, // if the user is logged in with more than one account ask which one to use for the login! 'authuser' => '-1' - ]) + )) ); return $params; } protected function getDefaultScopes() { - return [ + return array( 'email', 'openid', 'profile', - ]; + ); } protected function getScopeSeparator() -- To view, visit https://gerrit.wikimedia.org/r/329543 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8cfc288a756087cd467eb87a819ca39a55150c5 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm/vendor Gerrit-Branch: master Gerrit-Owner: Awight <awi...@wikimedia.org> Gerrit-Reviewer: Awight <awi...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits