summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYury German <blueknight@gentoo.org>2022-06-15 12:08:35 -0400
committerYury German <blueknight@gentoo.org>2022-06-15 12:08:35 -0400
commit36d7691c33cb64ece817246e47a779ec648d10b0 (patch)
tree08f2fb95303a1d8eeba2c8629a24b35a91fb1cac /plugins/openid/lib/Auth/Yadis/Yadis.php
parenttwentyfourteen upg 2.7 to 3.2 and twentysixteen from 2.0 to 2.5 (diff)
downloadblogs-gentoo-36d7691c33cb64ece817246e47a779ec648d10b0.tar.gz
blogs-gentoo-36d7691c33cb64ece817246e47a779ec648d10b0.tar.bz2
blogs-gentoo-36d7691c33cb64ece817246e47a779ec648d10b0.zip
Openid-3.6.1 and jetpack-11.0 upgrade
Signed-off-by: Yury German <blueknight@gentoo.org>
Diffstat (limited to 'plugins/openid/lib/Auth/Yadis/Yadis.php')
-rw-r--r--plugins/openid/lib/Auth/Yadis/Yadis.php28
1 files changed, 16 insertions, 12 deletions
diff --git a/plugins/openid/lib/Auth/Yadis/Yadis.php b/plugins/openid/lib/Auth/Yadis/Yadis.php
index 70dc944d..5e435eb8 100644
--- a/plugins/openid/lib/Auth/Yadis/Yadis.php
+++ b/plugins/openid/lib/Auth/Yadis/Yadis.php
@@ -144,25 +144,27 @@ function Auth_Yadis_getServiceEndpoints($input_url, $xrds_parse_func,
$discover_func=null, $fetcher=null)
{
if ($discover_func === null) {
- $discover_func = array('Auth_Yadis_Yadis', 'discover');
+ $discover_func = ['Auth_Yadis_Yadis', 'discover'];
}
$yadis_result = call_user_func_array($discover_func,
- array($input_url, $fetcher));
+ [$input_url, $fetcher]);
if ($yadis_result === null) {
- return array($input_url, array());
+ return [$input_url, []];
}
$endpoints = call_user_func_array($xrds_parse_func,
- array($yadis_result->normalized_uri,
- $yadis_result->response_text));
+ [
+ $yadis_result->normalized_uri,
+ $yadis_result->response_text,
+ ]);
if ($endpoints === null) {
- $endpoints = array();
+ $endpoints = [];
}
- return array($yadis_result->normalized_uri, $endpoints);
+ return [$yadis_result->normalized_uri, $endpoints];
}
/**
@@ -334,8 +336,10 @@ class Auth_Yadis_Yadis {
{
$result = new Auth_Yadis_DiscoveryResult($uri);
- $headers = array("Accept: " . Auth_Yadis_CONTENT_TYPE .
- ', text/html; q=0.3, application/xhtml+xml; q=0.5');
+ $headers = [
+ "Accept: " . Auth_Yadis_CONTENT_TYPE .
+ ', text/html; q=0.3, application/xhtml+xml; q=0.5',
+ ];
if ($fetcher === null) {
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher($timeout);
@@ -352,7 +356,7 @@ class Auth_Yadis_Yadis {
$result->normalized_uri = $response->final_url;
$result->content_type = Auth_Yadis_Yadis::_getHeader(
$response->headers,
- array('content-type'));
+ ['content-type']);
if ($result->content_type &&
(Auth_Yadis_Yadis::_getContentType($result->content_type) ==
@@ -361,7 +365,7 @@ class Auth_Yadis_Yadis {
} else {
$yadis_location = Auth_Yadis_Yadis::_getHeader(
$response->headers,
- array(Auth_Yadis_HEADER_NAME));
+ [Auth_Yadis_HEADER_NAME]);
if (!$yadis_location) {
$parser = new Auth_Yadis_ParseHTML();
@@ -381,7 +385,7 @@ class Auth_Yadis_Yadis {
$result->content_type = Auth_Yadis_Yadis::_getHeader(
$response->headers,
- array('content-type'));
+ ['content-type']);
}
}