From a21a7991a7fc21321b90614b609b316fca54daa7 Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Mon, 10 Aug 2020 16:22:13 +0200
Subject: vanilla php compliance
---
it_url.class | 4 ++--
test/it_url.t | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/it_url.class b/it_url.class
index fa58d88..54128dd 100644
--- a/it_url.class
+++ b/it_url.class
@@ -173,13 +173,13 @@ static function _default_headers($url, $p)
if ((!it::is_devel() || EDC('subreqcheck')) && $p['url'] && !$p['headers']['Accept-Language'] && T_lang() != T_defaultlang() && $search_subrequest && !it::match('\blogin\.|banner\.html|machines\.txt|mbtiles\.php|/itjs/|/images/|\.(de|fr|en|it)(\.js|\.html|\.txt|\.php|\.ics|\.pdf|\.json|\.csv|\.gif|\.jpg|\.png)', $p['url']))
it::error(['title' => "Subrequest without language override", 'body' => [ $p ]]);
- $headers = array_filter(
+ $headers = array_filter([
'Host' => $url->realhostname . $url->explicitport,
'User-Agent' => "Mozilla/5.0 (compatible; ITools; Chrome/70.0.3538.102 Safari/537.36 Edge/18.19582)",
'Accept-Language' => $p['headers']['Accept-Language'] ?: ($search_subrequest ? T_defaultlang() : T_lang()), # can prevent loading of it_text
'Referer' => it::match('([-\w]+\.\w+)$', $url->hostname) == it::match('([-\w]+\.\w+)$', $_SERVER['HTTP_HOST']) ? it_url::absolute(U($_GET)) : null,
'X-Ultra-Https' => $_SERVER['HTTPS'],
- );
+ ]);
if (is_int($p['filemtime']))
$headers['If-Modified-Since'] = date("r", $p['filemtime']);
return $headers;
diff --git a/test/it_url.t b/test/it_url.t
index 1636bd6..360b971 100755
--- a/test/it_url.t
+++ b/test/it_url.t
@@ -326,15 +326,15 @@ handle_server(
"failure"
),
is(
- it_url::get('url' => 'http://localhost:8000/maybe_error?chance=10', 'retries' => 10),
+ it_url::get(['url' => 'http://localhost:8000/maybe_error?chance=10', 'retries' => 10]),
"success",
"Retry on sporadically failing url in ::get"
),
is(
- it_url::get_multi('urls' => ['http://localhost:8000/maybe_error?chance=10'], 'retries' => 10),
+ it_url::get_multi(['urls' => ['http://localhost:8000/maybe_error?chance=10'], 'retries' => 10]),
["success"],
"Retry on sporadically failing url in ::get_multi"
- ),
+ )
);
is(it_url::parse("/foo"), ["/foo"], "it_url::parse path only");
--
cgit v1.2.3