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

Various bugfixes and code clean up.

Browse Source
This commit is contained in:
James Cole
2018-07-27 04:46:21 +02:00
parent 2ad8e7f343
commit 0312ba8ad7
60 changed files with 223 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -77,11 +77,12 @@ class AttachmentHelper implements AttachmentHelperInterface
*/
public function getAttachmentContent(Attachment $attachment): string
{
$content = '';
try {
$content = Crypt::decrypt($this->uploadDisk->get(sprintf('at-%d.data', $attachment->id)));
} catch (DecryptException|FileNotFoundException $e) {
Log::error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
$content = '';
}
return $content;

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

@@ -76,7 +76,8 @@ class Help implements HelpInterface
$statusCode = $res->getStatusCode();
$content = trim($res->getBody()->getContents());
} catch (GuzzleException|Exception $e) {
Log::error($e);
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
}
Log::debug(sprintf('Status code is %d', $statusCode));

4
app/Helpers/Update/UpdateTrait.php
View File

@@ -66,12 +66,12 @@ trait UpdateTrait
/**
* Parses the version check result in a human readable sentence.
*
* @param Release|null $release
* @param int $versionCheck
* @param Release|null $release
*
* @return string
*/
public function parseResult(Release $release = null, int $versionCheck): string
public function parseResult(int $versionCheck, Release $release = null): string
{
$current = (string)config('firefly.version');
$return = '';