Some code cleanup.

This commit is contained in:
James Cole 2016-05-20 08:00:35 +02:00
parent ed948cc965
commit dda3082c7e
13 changed files with 17 additions and 20 deletions

View File

@ -30,7 +30,7 @@ use Illuminate\Support\Collection;
*
* @package FireflyIII\Export\Entry
*/
class Entry
final class Entry
{
/** @var string */
public $amount;

View File

@ -158,8 +158,6 @@ class Processor
// is part of this job?
$zipFileName = str_replace($this->job->key . '-', '', $entry);
$result = $zip->addFromString($zipFileName, $disk->get($entry));
if (!$result) {
}
}
$zip->close();

View File

@ -223,8 +223,9 @@ class AccountController extends Controller
if ($cache->has()) {
// $entries = $cache->get();
// return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle'));
$entries = $cache->get();
return view('accounts.show', compact('account', 'what', 'entries', 'subTitleIcon', 'journals', 'subTitle'));
}
while ($end >= $start) {

View File

@ -176,12 +176,7 @@ class BudgetController extends Controller
$accounts = $accountRepository->getAccountsByType(['Default account', 'Asset account', 'Cash account']);
$startAsString = $start->format('Y-m-d');
$endAsString = $end->format('Y-m-d');
/**
* Do some cleanup:
* TODO reimplement the deletion of budget_limits and limit_repetitions with amount 0
*/
// loop the budgets:
/** @var Budget $budget */
foreach ($budgets as $budget) {

View File

@ -131,9 +131,8 @@ class PiggyBankController extends Controller
/*
* Flash some data to fill the form.
*/
if (!is_null($piggyBank->targetdate) || !$piggyBank->targetdate == '') {
$targetDate = new Carbon($piggyBank->targetdate);
$targetDate = $targetDate->format('Y-m-d');
if (!is_null($piggyBank->targetdate)) {
$targetDate = $piggyBank->targetdate->format('Y-m-d');
}
$preFilled = ['name' => $piggyBank->name,

View File

@ -194,9 +194,9 @@ class ReportController extends Controller
*/
$auditData[$id]['journals'] = $journals->reverse();
$auditData[$id]['exists'] = $exists;
$auditData[$id]['end'] = $end->formatLocalized(trans('config.month_and_day'));
$auditData[$id]['end'] = $end->formatLocalized(strval(trans('config.month_and_day')));
$auditData[$id]['endBalance'] = Steam::balance($account, $end);
$auditData[$id]['dayBefore'] = $dayBefore->formatLocalized(trans('config.month_and_day'));
$auditData[$id]['dayBefore'] = $dayBefore->formatLocalized(strval(trans('config.month_and_day')));
$auditData[$id]['dayBeforeBalance'] = $dayBeforeBalance;
}

View File

@ -198,8 +198,6 @@ class SplitController extends Controller
*/
private function arrayFromJournal(Request $request, TransactionJournal $journal): array
{
if (Session::has('_old_input')) {
}
$sourceAccounts = TransactionJournal::sourceAccountList($journal);
$destinationAccounts = TransactionJournal::destinationAccountList($journal);
$array = [

View File

@ -27,6 +27,8 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value)
* @mixin \Eloquent
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition after($date)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition before($date)
*/
class LimitRepetition extends Model
{

View File

@ -34,6 +34,7 @@ use Watson\Validating\ValidatingTrait;
* @mixin \Eloquent
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets
* @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction transactionTypes($types)
*/
class Transaction extends Model
{

View File

@ -78,6 +78,7 @@ use Watson\Validating\ValidatingTrait;
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal expanded()
* @mixin \Eloquent
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal sortCorrectly()
*/
class TransactionJournal extends TransactionJournalSupport
{

View File

@ -218,6 +218,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getTransactions(TransactionJournal $journal): Collection
{
$transactions = new Collection;
switch ($journal->transactionType->type) {
case TransactionType::DEPOSIT:
/** @var Collection $transactions */

View File

@ -227,6 +227,7 @@ class ExpandedForm
*/
public function makeSelectListWithEmpty(Collection $set): array
{
$selectList = [];
$selectList[0] = '(none)';
$fields = ['title', 'name', 'description'];
/** @var Eloquent $entry */

View File

@ -6,7 +6,7 @@ namespace FireflyIII\Support\Twig;
use Amount;
use FireflyIII\Models\Account;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Budget as ModelBudget;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Support\CacheProperties;
@ -78,7 +78,7 @@ class Journal extends Twig_Extension
public function formatBudgetPerspective(): Twig_SimpleFunction
{
return new Twig_SimpleFunction(
'formatBudgetPerspective', function (TransactionJournal $journal, Budget $budget) {
'formatBudgetPerspective', function (TransactionJournal $journal, ModelBudget $budget) {
$cache = new CacheProperties;
$cache->addProperty('formatBudgetPerspective');