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

@@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace FireflyIII\Export\Exporter; namespace FireflyIII\Export\Exporter;
use FireflyIII\Export\Entry\Entry; use FireflyIII\Export\Entry\Entry;
use FireflyIII\Export\Entry\EntryAccount;
use FireflyIII\Models\ExportJob; use FireflyIII\Models\ExportJob;
use League\Csv\Writer; use League\Csv\Writer;
use SplFileObject; use SplFileObject;

View File

@@ -45,8 +45,6 @@ class Processor
public $job; public $job;
/** @var array */ /** @var array */
public $settings; public $settings;
/** @var \FireflyIII\Export\ConfigurationFile */
private $configurationMaker;
/** @var Collection */ /** @var Collection */
private $exportEntries; private $exportEntries;
/** @var Collection */ /** @var Collection */

View File

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

View File

@@ -57,19 +57,6 @@ class JournalCollector
]; ];
/** @var bool */ /** @var bool */
private $filterTransfers = false; 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 */ /** @var bool */
private $joinedBudget = false; private $joinedBudget = false;
/** @var bool */ /** @var bool */
@@ -285,6 +272,8 @@ class JournalCollector
public function setOffset(int $offset): JournalCollector public function setOffset(int $offset): JournalCollector
{ {
$this->offset = $offset; $this->offset = $offset;
return $this;
} }
/** /**

View File

@@ -275,13 +275,12 @@ class AccountController extends Controller
} }
/** /**
* @param AccountTaskerInterface $tasker
* @param Account $account * @param Account $account
* @param string $date * @param string $date
* *
* @return View * @return View
*/ */
public function showWithDate(AccountTaskerInterface $tasker, Account $account, string $date) public function showWithDate(Account $account, string $date)
{ {
$carbon = new Carbon($date); $carbon = new Carbon($date);
$range = Preferences::get('viewRange', '1M')->data; $range = Preferences::get('viewRange', '1M')->data;

View File

@@ -24,7 +24,6 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition; use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Input; use Input;
use Log; use Log;
@@ -255,7 +254,7 @@ class BudgetController extends Controller
/** @var Carbon $start */ /** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth()); $start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */ /** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth()); $end = session('end', Carbon::now()->endOfMonth());
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page')); $page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data); $pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$subTitle = trans( $subTitle = trans(
@@ -264,9 +263,9 @@ class BudgetController extends Controller
); );
// collector // collector
$collector = new JournalCollector(auth()->user()); $collector = new JournalCollector(auth()->user());
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget(); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget();
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/list/noBudget'); $journals->setPath('/budgets/list/noBudget');
return view('budgets.no-budget', compact('journals', 'subTitle')); return view('budgets.no-budget', compact('journals', 'subTitle'));
@@ -307,9 +306,9 @@ class BudgetController extends Controller
$accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]);
// collector: // collector:
$collector = new JournalCollector(auth()->user()); $collector = new JournalCollector(auth()->user());
$collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page);
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/show/' . $budget->id); $journals->setPath('/budgets/show/' . $budget->id);
@@ -350,9 +349,9 @@ class BudgetController extends Controller
// collector: // collector:
$collector = new JournalCollector(auth()->user()); $collector = new JournalCollector(auth()->user());
$collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page);
$journals = $collector->getPaginatedJournals(); $journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/show/' . $budget->id . '/' . $repetition->id); $journals->setPath('/budgets/show/' . $budget->id . '/' . $repetition->id);

View File

@@ -240,10 +240,8 @@ class CategoryController extends Controller
} }
/** /**
* @param CRI $repository * @param Category $category
* @param Category $category * @param $date
*
* @param $date
* *
* @return View * @return View
*/ */

View File

@@ -117,7 +117,7 @@ class HomeController extends Controller
/** /**
* @param ARI $repository * @param ARI $repository
* *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View
*/ */
public function index(ARI $repository) public function index(ARI $repository)
{ {

View File

@@ -13,7 +13,6 @@ declare(strict_types = 1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use FireflyIII\Events\DeletedUser;
use FireflyIII\Http\Requests\DeleteAccountFormRequest; use FireflyIII\Http\Requests\DeleteAccountFormRequest;
use FireflyIII\Http\Requests\ProfileFormRequest; use FireflyIII\Http\Requests\ProfileFormRequest;
use FireflyIII\User; use FireflyIII\User;

View File

@@ -33,6 +33,8 @@ class BudgetController extends Controller
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param Collection $accounts * @param Collection $accounts
*
* @return mixed|string
*/ */
public function budgetMultiYear(BudgetReportHelperInterface $helper, Carbon $start, Carbon $end, Collection $accounts) public function budgetMultiYear(BudgetReportHelperInterface $helper, Carbon $start, Carbon $end, Collection $accounts)
{ {

View File

@@ -206,7 +206,6 @@ class ConvertController extends Controller
$sourceAccount = TransactionJournal::sourceAccountList($journal)->first(); $sourceAccount = TransactionJournal::sourceAccountList($journal)->first();
$destinationAccount = TransactionJournal::destinationAccountList($journal)->first(); $destinationAccount = TransactionJournal::destinationAccountList($journal)->first();
$sourceType = $journal->transactionType; $sourceType = $journal->transactionType;
$source = new Account;
$joined = $sourceType->type . '-' . $destinationType->type; $joined = $sourceType->type . '-' . $destinationType->type;
switch ($joined) { switch ($joined) {
default: default:

View File

@@ -46,8 +46,6 @@ class Note extends Model
/** /**
* @param $value
*
* @return string * @return string
*/ */
public function getMarkdownAttribute(): string public function getMarkdownAttribute(): string

View File

@@ -24,7 +24,6 @@ use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log; use Log;

View File

@@ -29,7 +29,8 @@ interface JournalRepositoryInterface
/** /**
* @param TransactionJournal $journal * @param TransactionJournal $journal
* @param TransactionType $type * @param TransactionType $type
* @param array $data * @param Account $source
* @param Account $destination
* *
* @return MessageBag * @return MessageBag
*/ */

View File

@@ -16,6 +16,7 @@ namespace FireflyIII\Rules\Actions;
use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleAction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ClearCategory * Class ClearCategory