Replace uri with url

This commit is contained in:
James Cole
2022-04-12 18:19:30 +02:00
parent ac5c11a8d7
commit 50f87a210a
101 changed files with 449 additions and 486 deletions

View File

@@ -79,8 +79,8 @@ class UpdateRequest implements UpdateRequestInterface
'message' => (string) trans('firefly.unknown_error'),
];
$uri = config('firefly.update_endpoint');
Log::debug(sprintf('Going to call %s', $uri));
$url = config('firefly.update_endpoint');
Log::debug(sprintf('Going to call %s', $url));
try {
$client = new Client;
$options = [
@@ -89,7 +89,7 @@ class UpdateRequest implements UpdateRequestInterface
],
'timeout' => 3.1415,
];
$res = $client->request('GET', $uri, $options);
$res = $client->request('GET', $url, $options);
} catch (GuzzleException $e) {
Log::error('Ran into Guzzle error.');
Log::error($e->getMessage());

View File

@@ -48,7 +48,7 @@ class PwndVerifierV2 implements Verifier
$hash = sha1($password);
$prefix = substr($hash, 0, 5);
$rest = substr($hash, 5);
$uri = sprintf('https://api.pwnedpasswords.com/range/%s', $prefix);
$url = sprintf('https://api.pwnedpasswords.com/range/%s', $prefix);
$opt = [
'headers' => [
'User-Agent' => sprintf('Firefly III v%s', config('firefly.version')),
@@ -61,7 +61,7 @@ class PwndVerifierV2 implements Verifier
try {
$client = new Client();
$res = $client->request('GET', $uri, $opt);
$res = $client->request('GET', $url, $opt);
} catch (GuzzleException|RequestException $e) {
Log::error(sprintf('Could not verify password security: %s', $e->getMessage()));