IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup.

Browse Source
This commit is contained in:
James Cole 2016-11-05 18:43:18 +01:00
parent 7b4c151df5
commit 962cad33e2
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
15 changed files with 20 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Export/Exporter/CsvExporter.php
View File

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

2
app/Export/Processor.php
View File

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

11
app/Helpers/Attachments/AttachmentHelper.php
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;

15
app/Helpers/Collector/JournalCollector.php
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;
}
/**

3
app/Http/Controllers/AccountController.php
View File

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

15
app/Http/Controllers/BudgetController.php
View File

@ -24,7 +24,6 @@ use FireflyIII\Models\Budget;
use FireflyIII\Models\LimitRepetition;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Input;
use Log;
@ -255,7 +254,7 @@ class BudgetController extends Controller
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
/** @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'));
$pageSize = intval(Preferences::get('transactionPageSize', 50)->data);
$subTitle = trans(
@ -264,9 +263,9 @@ class BudgetController extends Controller
);
// collector
$collector = new JournalCollector(auth()->user());
$collector = new JournalCollector(auth()->user());
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutBudget();
$journals = $collector->getPaginatedJournals();
$journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/list/noBudget');
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]);
// collector:
$collector = new JournalCollector(auth()->user());
$collector = new JournalCollector(auth()->user());
$collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page);
$journals = $collector->getPaginatedJournals();
$journals = $collector->getPaginatedJournals();
$journals->setPath('/budgets/show/' . $budget->id);
@ -350,9 +349,9 @@ class BudgetController extends Controller
// collector:
$collector = new JournalCollector(auth()->user());
$collector = new JournalCollector(auth()->user());
$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);

6
app/Http/Controllers/CategoryController.php
View File

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

2
app/Http/Controllers/HomeController.php
View File

@ -117,7 +117,7 @@ class HomeController extends Controller
/**
* @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)
{

1
app/Http/Controllers/ProfileController.php
View File

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

2
app/Http/Controllers/Report/BudgetController.php
View File

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

1
app/Http/Controllers/Transaction/ConvertController.php
View File

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

2
app/Models/Note.php
View File

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

1
app/Repositories/Budget/BudgetRepository.php
View File

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

3
app/Repositories/Journal/JournalRepositoryInterface.php
View File

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

1
app/Rules/Actions/ClearCategory.php
View File

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