Code cleanup.

This commit is contained in:
James Cole
2016-11-05 18:43:18 +01:00
parent 7b4c151df5
commit 962cad33e2
15 changed files with 20 additions and 46 deletions

View File

@@ -17,10 +17,8 @@ use FireflyIII\Models\Attachment;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\MessageBag;
use Input;
use Log;
use Storage;
use Symfony\Component\HttpFoundation\File\UploadedFile;
use TypeError;
/**
* Class AttachmentHelper
@@ -236,13 +234,8 @@ class AttachmentHelper implements AttachmentHelperInterface
private function getFiles()
{
$files = null;
try {
if (Input::hasFile('attachments')) {
$files = Input::file('attachments');
}
} catch (TypeError $e) {
// Log it, do nothing else.
Log::error($e->getMessage());
if (Input::hasFile('attachments')) {
$files = Input::file('attachments');
}
return $files;

View File

@@ -57,19 +57,6 @@ class JournalCollector
];
/** @var bool */
private $filterTransfers = false;
/** @var array */
private $group
= [
'transaction_journals.id',
'transaction_journals.description',
'firefly-iii.transaction_journals.date',
'transaction_journals.encrypted',
'transaction_currencies.code',
'transaction_types.type',
'transaction_journals.bill_id',
'bills.name',
'transactions.amount',
];
/** @var bool */
private $joinedBudget = false;
/** @var bool */
@@ -285,6 +272,8 @@ class JournalCollector
public function setOffset(int $offset): JournalCollector
{
$this->offset = $offset;
return $this;
}
/**