diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 8f575043e4..549c4396d6 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -114,7 +114,7 @@ Breadcrumbs::register( $breadcrumbs->push(e($budget->name), route('budgets.show', $budget->id)); if (!is_null($repetition) && !is_null($repetition->id)) { $breadcrumbs->push( - Navigation::periodShow($repetition->startdate, $repetition->budgetlimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id) + Navigation::periodShow($repetition->startdate, $repetition->budgetLimit->repeat_freq), route('budgets.show', $budget->id, $repetition->id) ); } } diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index a6f868937e..51f7c48e98 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -204,7 +204,6 @@ class TransactionJournal extends Model switch ($this->transactionType->type) { case 'Deposit': return $this->transactions()->where('amount', '>', 0)->first()->account; - break; case 'Withdrawal': return $this->transactions()->where('amount', '<', 0)->first()->account; @@ -275,7 +274,6 @@ class TransactionJournal extends Model switch ($this->transactionType->type) { case 'Deposit': return $this->transactions()->where('amount', '<', 0)->first()->account; - break; case 'Withdrawal': return $this->transactions()->where('amount', '>', 0)->first()->account; diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 0c48669c7d..77b551cc54 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -43,13 +43,10 @@ class TagRepository implements TagRepositoryInterface $journal->tags()->save($tag); return true; - break; case 'balancingAct': return $this->connectBalancingAct($journal, $tag); - break; case 'advancePayment': return $this->connectAdvancePayment($journal, $tag); - break; } return false; diff --git a/app/Support/Twig/Budget.php b/app/Support/Twig/Budget.php index 07efad3191..874ca15424 100644 --- a/app/Support/Twig/Budget.php +++ b/app/Support/Twig/Budget.php @@ -19,6 +19,7 @@ class Budget extends Twig_Extension */ public function getFunctions() { + $functions = []; $functions[] = new Twig_SimpleFunction( 'spentInRepetitionCorrected', function (LimitRepetition $repetition) { $sum diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index c4c53cd915..ea4fb950f1 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -32,19 +32,14 @@ class Journal extends Twig_Extension switch ($type) { case 'Withdrawal': return ''; - break; case 'Deposit': return ''; - break; case 'Transfer': return ''; - break; case 'Opening balance': return ''; - break; default: return ''; - break; } diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 9ee4a7eaed..10b56e5b47 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -133,6 +133,7 @@ class FireflyValidator extends Validator try { $value = Crypt::decrypt($value); } catch (DecryptException $e) { + // if it fails, probably not encrypted. }