Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/329371 )
Change subject: Long array syntax...
......................................................................
Long array syntax...
Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
---
M phpmailer/phpmailer/class.phpmaileroauthgoogle.php
M phpmailer/phpmailer/extras/htmlfilter.php
M phpmailer/phpmailer/get_oauth_token.php
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/vendor
refs/changes/71/329371/1
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/extras/htmlfilter.php
b/phpmailer/phpmailer/extras/htmlfilter.php
index 7727487..e9ce434 100644
--- a/phpmailer/phpmailer/extras/htmlfilter.php
+++ b/phpmailer/phpmailer/extras/htmlfilter.php
@@ -772,7 +772,7 @@
tln_defang($contentTemp);
tln_unspace($contentTemp);
- $match = Array('/\/\*.*\*\//',
+ $match = array('/\/\*.*\*\//',
'/expression/i',
'/behaviou*r/i',
'/binding/i',
@@ -780,7 +780,7 @@
'/javascript/i',
'/script/i',
'/position/i');
- $replace = Array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy',
'idiocy', '');
+ $replace = array('','idiocy', 'idiocy', 'idiocy', 'idiocy', 'idiocy',
'idiocy', '');
$contentNew = preg_replace($match, $replace, $contentTemp);
if ($contentNew !== $contentTemp) {
$content = $contentNew;
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/329371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba695fdb4b4e7c441ab5c0c171fd57af8143cd3f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/vendor
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
