kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 12:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Use Guzzle, not Requests library.

Browse Source
This commit is contained in:
James Cole
2018-06-06 21:20:21 +02:00
parent 073dedd483
commit 20044427b4
9 changed files with 90 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Helpers/Help/Help.php
View File

@@ -24,9 +24,10 @@ namespace FireflyIII\Helpers\Help;
use Cache;
use Exception;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use League\CommonMark\CommonMarkConverter;
use Log;
use Requests;
use Route;
/**
@@ -64,20 +65,21 @@ class Help implements HelpInterface
{
$uri = sprintf('https://raw.githubusercontent.com/firefly-iii/help/master/%s/%s.md', $language, $route);
Log::debug(sprintf('Trying to get %s...', $uri));
$opt = ['useragent' => $this->userAgent];
$opt = ['headers' => ['User-Agent' => $this->userAgent]];
$content = '';
try {
$result = Requests::get($uri, [], $opt);
} catch (Exception $e) {
$client = new Client;
$res = $client->request('GET', $uri, $opt);
} catch (GuzzleException|Exception $e) {
Log::error($e);
return '';
}
Log::debug(sprintf('Status code is %d', $result->status_code));
Log::debug(sprintf('Status code is %d', $res->getStatusCode()));
if (200 === $result->status_code) {
$content = trim($result->body);
if (200 === $res->getStatusCode()) {
$content = trim($res->getBody()->getContents());
}
if (\strlen($content) > 0) {