From c3c59d0627619e4835aa95635f1f6ebebc282e7b Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 07:50:38 +0200 Subject: [PATCH 01/29] Fixed some JS things [skip ci] --- public/js/accounts.js | 2 +- public/js/budgets.js | 2 +- public/js/categories.js | 2 +- public/js/firefly.js | 2 +- public/js/index.js | 2 +- public/js/piggy-banks.js | 2 +- public/js/reports.js | 2 +- public/js/tags.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/js/accounts.js b/public/js/accounts.js index ae240b8500..e6bbc4ac39 100644 --- a/public/js/accounts.js +++ b/public/js/accounts.js @@ -1,4 +1,4 @@ -/* global $ */ +/* global $, googleLineChart, accountID, token */ // Return a helper with preserved width of cells diff --git a/public/js/budgets.js b/public/js/budgets.js index 3493c81fc0..67a7d325a1 100644 --- a/public/js/budgets.js +++ b/public/js/budgets.js @@ -1,4 +1,4 @@ -/* globals $, budgeted:false, currencySymbol, budgetIncomeTotal ,budgetedMuch, budgetedPercentage, token, budgetID, repetitionID, spent, budgeted*/ +/* globals $, budgeted:true, currencySymbol, budgetIncomeTotal ,budgetedMuch, budgetedPercentage, token, budgetID, repetitionID, spent, googleLineChart */ function drawSpentBar() { "use strict"; diff --git a/public/js/categories.js b/public/js/categories.js index 073b8e2355..ffc72468dd 100644 --- a/public/js/categories.js +++ b/public/js/categories.js @@ -1,4 +1,4 @@ -/* globals $, categoryID */ +/* globals $, categoryID, googleColumnChart */ $(function () { "use strict"; if (typeof categoryID !== 'undefined') { diff --git a/public/js/firefly.js b/public/js/firefly.js index c01a3269c7..00c86a9d60 100644 --- a/public/js/firefly.js +++ b/public/js/firefly.js @@ -1,4 +1,4 @@ -/* globals start, end, dateRangeURL, everything, firstDate, moment, currentMonthName, $, previousMonthName, nextMonthName, applyLabel, cancelLabel, toLabel, customRangeLabel, fromLabel, */ +/* globals token, start, end, dateRangeURL, everything, firstDate, moment, currentMonthName, $, previousMonthName, nextMonthName, applyLabel, cancelLabel, toLabel, customRangeLabel, fromLabel, */ $(function () { "use strict"; $('.currencySelect').click(currencySelect); diff --git a/public/js/index.js b/public/js/index.js index 6ca893aa6b..e334644636 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,4 +1,4 @@ -/* globals google */ +/* globals $, googleColumnChart, google, googleLineChart, googlePieChart, googleStackedColumnChart */ google.setOnLoadCallback(drawChart); diff --git a/public/js/piggy-banks.js b/public/js/piggy-banks.js index 4e32a77eee..d108c41ef2 100644 --- a/public/js/piggy-banks.js +++ b/public/js/piggy-banks.js @@ -1,4 +1,4 @@ -/* globals $, googleLineChart, token */ +/* globals $, googleLineChart, token, piggyBankID */ // Return a helper with preserved width of cells var fixHelper = function (e, tr) { diff --git a/public/js/reports.js b/public/js/reports.js index 36845910f6..bba54bd53c 100644 --- a/public/js/reports.js +++ b/public/js/reports.js @@ -1,4 +1,4 @@ -/* globals expenseRestShow:true, incomeRestShow:true, year, shared, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, googleColumnChart, googleLineChart, googleStackedColumnChartg */ +/* globals google, expenseRestShow:true, incomeRestShow:true, year, shared, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, googleColumnChart, googleLineChart, googleStackedColumnChart */ if (typeof(google) !== 'undefined') { google.setOnLoadCallback(drawChart); } diff --git a/public/js/tags.js b/public/js/tags.js index c87f6b8cb7..55b5882f43 100644 --- a/public/js/tags.js +++ b/public/js/tags.js @@ -1,4 +1,4 @@ -/* globals zoomLevel, token, google, latitude, longitude */ +/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ $(function () { "use strict"; /* From 812aae358fbcd1cd8cd7cb46507ea8f6fcd60928 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 08:17:58 +0200 Subject: [PATCH 02/29] Some code cleanup. --- app/Helpers/Collection/BalanceLine.php | 1 + app/Helpers/Report/ReportHelper.php | 3 +- app/Helpers/Report/ReportQuery.php | 6 +- app/Http/Controllers/BudgetController.php | 1 + .../Controllers/Chart/AccountController.php | 6 +- .../Controllers/Chart/BudgetController.php | 2 + app/Http/Controllers/PiggyBankController.php | 3 + app/Http/Controllers/TagController.php | 4 +- app/Models/TransactionJournal.php | 2 + .../Account/AccountRepository.php | 12 +- app/Support/ExpandedForm.php | 11 +- app/Support/Navigation.php | 111 ------------- app/Support/Preferences.php | 1 - app/Support/Steam.php | 152 ------------------ .../2015_05_22_172026_changes_for_v3409.php | 100 ------------ .../charts/ChartBudgetControllerTest.php | 1 + tests/helpers/ReminderHelperTest.php | 2 + tests/helpers/ReportHelperTest.php | 3 + tests/helpers/ReportQueryTest.php | 4 + tests/models/AccountModelTest.php | 4 +- tests/models/TransactionJournalModelTest.php | 1 + tests/repositories/CategoryRepositoryTest.php | 1 + 22 files changed, 49 insertions(+), 382 deletions(-) diff --git a/app/Helpers/Collection/BalanceLine.php b/app/Helpers/Collection/BalanceLine.php index a3d64ff7e3..de82b6814d 100644 --- a/app/Helpers/Collection/BalanceLine.php +++ b/app/Helpers/Collection/BalanceLine.php @@ -64,6 +64,7 @@ class BalanceLine if ($this->getRole() == self::ROLE_DIFFROLE) { return trans('firefly.leftUnbalanced'); } + return ''; } /** diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index bb77e99b52..986d324e50 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -70,7 +70,8 @@ class ReportHelper implements ReportHelperInterface if ($account->accountType->type != 'Cash account') { return $account; } - } // @codeCoverageIgnore + return null; + } ); // summarize: diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 8675989368..ad1a6d575a 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -72,7 +72,8 @@ class ReportQuery implements ReportQueryInterface if ($journal->amount != 0) { return $journal; } - } // @codeCoverageIgnore + return null; + } ); return $data; @@ -188,7 +189,8 @@ class ReportQuery implements ReportQueryInterface if ($journal->amount != 0) { return $journal; } - } // @codeCoverageIgnore + return null; + } ); return $data; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 70d39f6040..b583e62c71 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -20,6 +20,7 @@ use View; * Class BudgetController * * @package FireflyIII\Http\Controllers + * @SuppressWarnings(PHPMD.TooManyMethods) */ class BudgetController extends Controller { diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 5460b9212b..5c9e11e3c1 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -26,6 +26,10 @@ class AccountController extends Controller * @param GChart $chart * @param AccountRepositoryInterface $repository * + * @param $year + * @param $month + * @param bool $shared + * * @return \Symfony\Component\HttpFoundation\Response */ public function all(GChart $chart, AccountRepositoryInterface $repository, $year, $month, $shared = false) @@ -38,7 +42,6 @@ class AccountController extends Controller /** @var Collection $accounts */ $accounts = $repository->getAccounts(['Default account', 'Asset account']); if ($shared === false) { - // remove the shared accounts from the collection: /** @var Account $account */ foreach ($accounts as $index => $account) { if ($account->getMeta('accountRole') == 'sharedAsset') { @@ -71,7 +74,6 @@ class AccountController extends Controller $chart->generate(); return Response::json($chart->getData()); - } /** diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index a49f294630..195b3c4458 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -25,6 +25,8 @@ class BudgetController extends Controller * @param GChart $chart * @param BudgetRepositoryInterface $repository * @param Budget $budget + * + * @return \Symfony\Component\HttpFoundation\Response */ public function budget(GChart $chart, BudgetRepositoryInterface $repository, Budget $budget) { diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 44f87a3463..d6ebe48f18 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -18,6 +18,9 @@ use URL; use View; /** + * + * @SuppressWarnings(PHPMD.TooManyMethods) + * * Class PiggyBankController * * @package FireflyIII\Http\Controllers diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 28d47123aa..8a73839482 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -111,7 +111,9 @@ class TagController extends Controller } /** - * @param Tag $tag + * @param Tag $tag + * + * @param TagRepositoryInterface $repository * * @return View */ diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index c1c21adbbc..ad24e7a712 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -12,6 +12,8 @@ use Watson\Validating\ValidatingTrait; * Class TransactionJournal * * @package FireflyIII\Models + * + * @SuppressWarnings(PHPMD.TooManyMethods) */ class TransactionJournal extends Model { diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index a79274200f..0f03b71f3d 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -25,6 +25,8 @@ use Steam; /** + * @SuppressWarnings(PHPMD.TooManyMethods) + * * Class AccountRepository * * @package FireflyIII\Repositories\Account @@ -306,7 +308,8 @@ class AccountRepository implements AccountRepositoryInterface if ($journal->destination_account->id == $account->id) { return $journal; } - } // @codeCoverageIgnore + return null; + } ); return $filtered; @@ -398,7 +401,6 @@ class AccountRepository implements AccountRepositoryInterface // update meta data: $this->updateMetadata($account, $data); - $openingBalance = $this->openingBalanceTransaction($account); // if has openingbalance? @@ -421,10 +423,8 @@ class AccountRepository implements AccountRepositoryInterface } } else { - // opening balance is zero, should we delete it? - if ($openingBalance) { - // delete existing opening balance. - $openingBalance->delete(); + if ($openingBalance) { // opening balance is zero, should we delete it? + $openingBalance->delete();// delete existing opening balance. } } diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 8e5d4fe7a4..bac40078a4 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -3,6 +3,7 @@ namespace FireflyIII\Support; use Amount as Amt; +use Eloquent; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Input; @@ -13,6 +14,8 @@ use View; * Class ExpandedForm * * @package FireflyIII\Support + * + * @SuppressWarnings(PHPMD.TooManyMethods) */ class ExpandedForm { @@ -46,7 +49,7 @@ class ExpandedForm * * @return mixed */ - public function label($name, $options) + protected function label($name, $options) { if (isset($options['label'])) { return $options['label']; @@ -63,7 +66,7 @@ class ExpandedForm * * @return array */ - public function expandOptionArray($name, $label, array $options) + protected function expandOptionArray($name, $label, array $options) { $options['class'] = 'form-control'; $options['id'] = 'ffInput_' . $name; @@ -78,7 +81,7 @@ class ExpandedForm * * @return string */ - public function getHolderClasses($name) + protected function getHolderClasses($name) { /* * Get errors from session: @@ -100,7 +103,7 @@ class ExpandedForm * * @return mixed */ - public function fillFieldValue($name, $value) + protected function fillFieldValue($name, $value) { if (Session::has('preFilled')) { $preFilled = Session::get('preFilled'); diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index bfb3c607a2..542cd669f3 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -140,117 +140,6 @@ class Navigation return $currentEnd; } - /** - * @param $range - * @param Carbon $date - * - * @return Carbon - * @throws FireflyException - */ - public function jumpToNext($range, Carbon $date) - { - switch ($range) { - case '1D': - $date->endOfDay()->addDay(); - break; - case '1W': - $date->endOfWeek()->addDay()->startOfWeek(); - break; - case '1M': - $date->endOfMonth()->addDay()->startOfMonth(); - break; - case '3M': - $date->lastOfQuarter()->addDay(); - break; - case '6M': - if ($date->month >= 7) { - $date->startOfYear()->addYear(); - } else { - $date->startOfYear()->addMonths(6); - } - break; - case '1Y': - $date->startOfYear()->addYear(); - break; - default: - throw new FireflyException('Cannot do _next() on ' . $range); - break; - } - - return $date; - } - - /** - * @param $range - * @param Carbon $date - * - * @return Carbon - * @throws FireflyException - */ - public function jumpToPrevious($range, Carbon $date) - { - $functionMap = [ - '1D' => 'Day', - '1W' => 'Week', - '1M' => 'Month', - '1Y' => 'Year' - ]; - - if (isset($functionMap[$range])) { - $startFunction = 'startOf' . $functionMap[$range]; - $subFunction = 'sub' . $functionMap[$range]; - $date->$startFunction()->$subFunction(); - - return $date; - } - if ($range == '3M') { - $date->firstOfQuarter()->subMonths(3)->firstOfQuarter(); - - return $date; - } - if ($range == '6M') { - $date->startOfYear(); - if ($date->month <= 6) { - $date->subMonths(6); - } - - return $date; - } - throw new FireflyException('Cannot do _previous() on ' . $range); - } - - /** - * @param $range - * @param Carbon $date - * - * @return string - * @throws FireflyException - */ - public function periodName($range, Carbon $date) - { - $formatMap = [ - '1D' => 'jS F Y', - '1W' => '\w\e\ek W, Y', - '1M' => 'F Y', - '1Y' => 'Y', - ]; - if (isset($formatMap[$range])) { - return $date->format($formatMap[$range]); - } - if ($range == '3M') { - - - return 'Q' . ceil(($date->month / 12) * 4) . ' ' . $date->year; - } - if ($range == '6M') { - $half = ceil(($date->month / 12) * 2); - $halfName = $half == 1 ? 'first' : 'second'; - - return $halfName . ' half of ' . $date->year; - } - throw new FireflyException('No _periodName() for range "' . $range . '"'); - } - /** * @param Carbon $date * @param $repeatFrequency diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index a4adfb586f..3d53d9c16a 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -4,7 +4,6 @@ namespace FireflyIII\Support; use Auth; use FireflyIII\Models\Preference; -use Log; /** * Class Preferences diff --git a/app/Support/Steam.php b/app/Support/Steam.php index d49affdc2d..a04e3ee002 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -6,7 +6,6 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; -use Illuminate\Support\Collection; /** * Class Steam @@ -50,155 +49,4 @@ class Steam return round($balance, 2); } - /** - * Only return the top X entries, group the rest by amount - * and described as 'Others'. id = 0 as well - * - * @param array $array - * @param int $limit - * - * @return array - */ - public function limitArray(array $array, $limit = 10) - { - $others = [ - 'name' => 'Others', - 'queryAmount' => 0 - ]; - $return = []; - $count = 0; - foreach ($array as $id => $entry) { - if ($count < ($limit - 1)) { - $return[$id] = $entry; - } else { - $others['queryAmount'] += $entry['queryAmount']; - } - - $count++; - } - $return[0] = $others; - - return $return; - - } - - /** - * Turns a collection into an array. Needs the field 'id' for the key, - * and saves only 'name' and 'amount' as a sub array. - * - * @param \Illuminate\Support\Collection $collection - * - * @return array - */ - public function makeArray(Collection $collection) - { - $array = []; - foreach ($collection as $entry) { - $entry->spent = isset($entry->spent) ? floatval($entry->spent) : 0.0; - $id = intval($entry->id); - if (isset($array[$id])) { - $array[$id]['amount'] += floatval($entry->amount); - $array[$id]['queryAmount'] += floatval($entry->queryAmount); - $array[$id]['spent'] += floatval($entry->spent); - $array[$id]['encrypted'] = intval($entry->encrypted); - } else { - $array[$id] = [ - 'amount' => floatval($entry->amount), - 'queryAmount' => floatval($entry->queryAmount), - 'spent' => floatval($entry->spent), - 'encrypted' => intval($entry->encrypted), - 'name' => $entry->name - ]; - } - } - - return $array; - } - - /** - * Merges two of the arrays as defined above. Can't handle more (yet) - * - * @param array $one - * @param array $two - * - * @return array - */ - public function mergeArrays(array $one, array $two) - { - foreach ($two as $id => $value) { - // $otherId also exists in $one: - if (isset($one[$id])) { - $one[$id]['queryAmount'] += $value['queryAmount']; - $one[$id]['spent'] += $value['spent']; - } else { - $one[$id] = $value; - } - } - - return $one; - } - - /** - * @param PiggyBank $piggyBank - * @param PiggyBankRepetition $repetition - * - * @return int - */ - public function percentage(PiggyBank $piggyBank, PiggyBankRepetition $repetition) - { - $pct = $repetition->currentamount / $piggyBank->targetamount * 100; - if ($pct > 100) { - // @codeCoverageIgnoreStart - return 100; - // @codeCoverageIgnoreEnd - } else { - return floor($pct); - } - } - - /** - * Sort an array where all 'amount' keys are positive floats. - * - * @param array $array - * - * @return array - */ - public function sortArray(array $array) - { - uasort( - $array, function ($left, $right) { - if ($left['queryAmount'] == $right['queryAmount']) { - return 0; - } - - return ($left['queryAmount'] < $right['queryAmount']) ? 1 : -1; - } - ); - - return $array; - - } - - /** - * Sort an array where all 'amount' keys are negative floats. - * - * @param array $array - * - * @return array - */ - public function sortNegativeArray(array $array) - { - uasort( - $array, function ($left, $right) { - if ($left['queryAmount'] == $right['queryAmount']) { - return 0; - } - - return ($left['queryAmount'] < $right['queryAmount']) ? -1 : 1; - } - ); - - return $array; - } - } diff --git a/database/migrations/2015_05_22_172026_changes_for_v3409.php b/database/migrations/2015_05_22_172026_changes_for_v3409.php index 3f53f00441..5c401d8cdd 100644 --- a/database/migrations/2015_05_22_172026_changes_for_v3409.php +++ b/database/migrations/2015_05_22_172026_changes_for_v3409.php @@ -18,60 +18,12 @@ class ChangesForV3409 extends Migration */ public function down() { - // remove decryption, but this will destroy amounts. - - Schema::table( - 'accounts', function (Blueprint $table) { - $table->dropColumn('virtual_balance_encrypted'); - } - ); - - Schema::table( - 'bills', function (Blueprint $table) { - $table->dropColumn('amount_min_encrypted'); - $table->dropColumn('amount_max_encrypted'); - } - ); - - Schema::table( - 'budget_limits', function (Blueprint $table) { - - $table->dropColumn('amount_encrypted'); - } - ); - Schema::table( - 'limit_repetitions', function (Blueprint $table) { - $table->dropColumn('amount_encrypted'); - } - ); - Schema::table( - 'piggy_bank_events', function (Blueprint $table) { - $table->dropColumn('amount_encrypted'); - } - ); - Schema::table( - 'piggy_bank_repetitions', function (Blueprint $table) { - $table->dropColumn('currentamount_encrypted'); - } - ); - - Schema::table( - 'piggy_banks', function (Blueprint $table) { - $table->dropColumn('targetamount_encrypted'); - } - ); Schema::table( 'preferences', function (Blueprint $table) { $table->dropColumn('name_encrypted'); $table->dropColumn('data_encrypted'); } ); - - Schema::table( - 'transactions', function (Blueprint $table) { - $table->dropColumn('amount_encrypted'); - } - ); } /** @@ -81,52 +33,7 @@ class ChangesForV3409 extends Migration */ public function up() { - // encrypt account virtual balance: - Schema::table( - 'accounts', function (Blueprint $table) { - $table->string('virtual_balance_encrypted')->nullable()->after('virtual_balance'); - } - ); - // encrypt bill amount_min and amount_max: - Schema::table( - 'bills', function (Blueprint $table) { - $table->string('amount_min_encrypted')->nullable()->after('amount_min'); - $table->string('amount_max_encrypted')->nullable()->after('amount_max'); - } - ); - - // encrypt budget limit amount - Schema::table( - 'budget_limits', function (Blueprint $table) { - $table->string('amount_encrypted')->nullable()->after('amount'); - } - ); - // encrypt limit repetition amount - Schema::table( - 'limit_repetitions', function (Blueprint $table) { - $table->string('amount_encrypted')->nullable()->after('amount'); - } - ); - // encrypt piggy bank event amount - Schema::table( - 'piggy_bank_events', function (Blueprint $table) { - $table->string('amount_encrypted')->nullable()->after('amount'); - } - ); - // encrypt piggy bank repetition currentamount - Schema::table( - 'piggy_bank_repetitions', function (Blueprint $table) { - $table->string('currentamount_encrypted')->nullable()->after('currentamount'); - } - ); - - // encrypt piggy bank targetamount - Schema::table( - 'piggy_banks', function (Blueprint $table) { - $table->string('targetamount_encrypted')->nullable()->after('targetamount'); - } - ); // encrypt preference name (add field) // encrypt preference data (add field) Schema::table( @@ -136,13 +43,6 @@ class ChangesForV3409 extends Migration } ); - // encrypt transaction amount - Schema::table( - 'transactions', function (Blueprint $table) { - $table->string('amount_encrypted')->nullable()->after('amount'); - } - ); - } } diff --git a/tests/controllers/charts/ChartBudgetControllerTest.php b/tests/controllers/charts/ChartBudgetControllerTest.php index 7c9777f5ef..4670313328 100644 --- a/tests/controllers/charts/ChartBudgetControllerTest.php +++ b/tests/controllers/charts/ChartBudgetControllerTest.php @@ -76,6 +76,7 @@ class ChartBudgetControllerTest extends TestCase /** * @covers FireflyIII\Http\Controllers\Chart\BudgetController::frontpage + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testFrontpage() { diff --git a/tests/helpers/ReminderHelperTest.php b/tests/helpers/ReminderHelperTest.php index 7e29e99860..82f289b41e 100644 --- a/tests/helpers/ReminderHelperTest.php +++ b/tests/helpers/ReminderHelperTest.php @@ -8,6 +8,8 @@ use League\FactoryMuffin\Facade as FactoryMuffin; /** * Class ReminderHelperTest + * + * @SuppressWarnings(PHPMD.TooManyMethods) */ class ReminderHelperTest extends TestCase { diff --git a/tests/helpers/ReportHelperTest.php b/tests/helpers/ReportHelperTest.php index 9f5134f0c2..e321854f4f 100644 --- a/tests/helpers/ReportHelperTest.php +++ b/tests/helpers/ReportHelperTest.php @@ -107,6 +107,7 @@ class ReportHelperTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportHelper::getBillReport + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGetBillReport() { @@ -214,6 +215,7 @@ class ReportHelperTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportHelper::getExpenseReport + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGetExpenseReport() { @@ -278,6 +280,7 @@ class ReportHelperTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportHelper::getIncomeReport + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGetIncomeReport() { diff --git a/tests/helpers/ReportQueryTest.php b/tests/helpers/ReportQueryTest.php index 894d037af4..eb12e6e35d 100644 --- a/tests/helpers/ReportQueryTest.php +++ b/tests/helpers/ReportQueryTest.php @@ -40,6 +40,7 @@ class ReportQueryTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportQuery::expenseInPeriodCorrected * @covers FireflyIII\Helpers\Report\ReportQuery::queryJournalsWithTransactions + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExpenseInPeriodCorrected() { @@ -108,6 +109,7 @@ class ReportQueryTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportQuery::expenseInPeriodCorrected * @covers FireflyIII\Helpers\Report\ReportQuery::queryJournalsWithTransactions + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testExpenseInPeriodCorrectedShared() { @@ -228,6 +230,7 @@ class ReportQueryTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportQuery::incomeInPeriodCorrected * @covers FireflyIII\Helpers\Report\ReportQuery::queryJournalsWithTransactions + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testIncomeInPeriodCorrected() { @@ -295,6 +298,7 @@ class ReportQueryTest extends TestCase /** * @covers FireflyIII\Helpers\Report\ReportQuery::incomeInPeriodCorrected * @covers FireflyIII\Helpers\Report\ReportQuery::queryJournalsWithTransactions + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testIncomeInPeriodCorrectedShared() { diff --git a/tests/models/AccountModelTest.php b/tests/models/AccountModelTest.php index 82636cf799..7537c9ea79 100644 --- a/tests/models/AccountModelTest.php +++ b/tests/models/AccountModelTest.php @@ -69,7 +69,7 @@ class AccountModelTest extends TestCase { // create account: $account = FactoryMuffin::create('FireflyIII\Models\Account'); - $user = FactoryMuffin::create('FireflyIII\User'); + FactoryMuffin::create('FireflyIII\User'); // search for account with the same properties: $search = [ @@ -118,7 +118,7 @@ class AccountModelTest extends TestCase { // create account: $account = FactoryMuffin::create('FireflyIII\Models\Account'); - $user = FactoryMuffin::create('FireflyIII\User'); + FactoryMuffin::create('FireflyIII\User'); // search for account with the same properties: $search = [ diff --git a/tests/models/TransactionJournalModelTest.php b/tests/models/TransactionJournalModelTest.php index e9d625f616..dbdf86f035 100644 --- a/tests/models/TransactionJournalModelTest.php +++ b/tests/models/TransactionJournalModelTest.php @@ -5,6 +5,7 @@ use League\FactoryMuffin\Facade as FactoryMuffin; /** * Class TransactionJournalModelTest + * @SuppressWarnings(PHPMD.TooManyMethods) */ class TransactionJournalModelTest extends TestCase { diff --git a/tests/repositories/CategoryRepositoryTest.php b/tests/repositories/CategoryRepositoryTest.php index 6e235007ef..2ade3fae1e 100644 --- a/tests/repositories/CategoryRepositoryTest.php +++ b/tests/repositories/CategoryRepositoryTest.php @@ -80,6 +80,7 @@ class CategoryRepositoryTest extends TestCase /** * @covers FireflyIII\Repositories\Category\CategoryRepository::getCategoriesAndExpensesCorrected + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function testGetCategoriesAndExpensesCorrected() { From 349e0778021c836170fcdc9b3153a93a56231445 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 11:15:45 +0200 Subject: [PATCH 03/29] Added model data to models to aid scrutiniser. --- app/Models/Account.php | 29 +++++++++++++++++ app/Models/AccountMeta.php | 15 ++++++++- app/Models/AccountType.php | 13 +++++++- app/Models/Bill.php | 40 ++++++++++++++++++++++-- app/Models/Budget.php | 21 ++++++++++++- app/Models/BudgetLimit.php | 22 ++++++++++++- app/Models/Category.php | 17 +++++++++- app/Models/Component.php | 16 +++++++++- app/Models/LimitRepetition.php | 20 ++++++++++-- app/Models/PiggyBank.php | 37 ++++++++++++++++++++-- app/Models/PiggyBankEvent.php | 21 +++++++++++-- app/Models/PiggyBankRepetition.php | 21 ++++++++++++- app/Models/Preference.php | 19 +++++++++++- app/Models/Reminder.php | 31 ++++++++++++++++-- app/Models/Tag.php | 26 ++++++++++++++++ app/Models/Transaction.php | 24 +++++++++++++- app/Models/TransactionCurrency.php | 18 +++++++++-- app/Models/TransactionGroup.php | 16 +++++++++- app/Models/TransactionJournal.php | 50 ++++++++++++++++++++++++++++-- app/Models/TransactionRelation.php | 2 +- app/Models/TransactionType.php | 13 +++++++- app/User.php | 22 +++++++++++++ 22 files changed, 467 insertions(+), 26 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index a3fe6796c9..bda55d8c8b 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -11,6 +11,35 @@ use Watson\Validating\ValidatingTrait; * Class Account * * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $account_type_id + * @property string $name + * @property boolean $active + * @property boolean $encrypted + * @property float $virtual_balance + * @property string $virtual_balance_encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta + * @property-read \FireflyIII\Models\AccountType $accountType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereAccountTypeId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereActive($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalance($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalanceEncrypted($value) + * @method static \FireflyIII\Models\Account accountTypeIn($types) + * @method static \FireflyIII\Models\Account hasMetaValue($name, $value) */ class Account extends Model { diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 960d3d7759..7279f6094c 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -6,8 +6,21 @@ use Watson\Validating\ValidatingTrait; /** * Class AccountMeta * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $account_id + * @property string $name + * @property string $data + * @property-read \FireflyIII\Models\Account $account + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereData($value) */ class AccountMeta extends Model { diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 4d17499645..ebf51de3df 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -5,8 +5,19 @@ use Illuminate\Database\Eloquent\Model; /** * Class AccountType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $type + * @property boolean $editable + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereType($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereEditable($value) */ class AccountType extends Model { diff --git a/app/Models/Bill.php b/app/Models/Bill.php index c11110142c..c3fdce553c 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -4,10 +4,46 @@ use Crypt; use Illuminate\Database\Eloquent\Model; /** - * @codeCoverageIgnore - * Class Bill + * FireflyIII\Models\Bill * + * @codeCoverageIgnore Class Bill * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $match + * @property float $amount_min + * @property string $amount_min_encrypted + * @property float $amount_max + * @property string $amount_max_encrypted + * @property \Carbon\Carbon $date + * @property boolean $active + * @property boolean $automatch + * @property string $repeat_freq + * @property integer $skip + * @property boolean $name_encrypted + * @property boolean $match_encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatch($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMin($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMinEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMax($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMaxEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereActive($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAutomatch($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) */ class Bill extends Model { diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 64ee6d9f7a..bb186cb493 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -7,8 +7,27 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Budget * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $active + * @property boolean $encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereActive($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereEncrypted($value) */ class Budget extends Model { diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index c945701ad2..3ef24e24ac 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -5,8 +5,28 @@ use Illuminate\Database\Eloquent\Model; /** * Class BudgetLimit * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_id + * @property \Carbon\Carbon $startdate + * @property float $amount + * @property string $amount_encrypted + * @property boolean $repeats + * @property string $repeat_freq + * @property-read \FireflyIII\Models\Budget $budget + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmountEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeats($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeatFreq($value) */ class BudgetLimit extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index dc51ad3f92..8833cf1a2d 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -7,8 +7,23 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Category * - * * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value) */ class Category extends Model { diff --git a/app/Models/Component.php b/app/Models/Component.php index cac107270a..4e543d830e 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -6,8 +6,22 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class Component * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property string $class + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereClass($value) */ class Component extends Model { diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 4cadd5e466..580ef92977 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -5,9 +5,25 @@ use Illuminate\Database\Eloquent\Model; /** * Class LimitRepetition * - * @codeCoverageIgnore - * + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_limit_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereBudgetLimitId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmountEncrypted($value) */ class LimitRepetition extends Model { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 18e4251d76..9601cc946f 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -7,9 +7,42 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class PiggyBank * - * @codeCoverageIgnore - * + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property string $name + * @property float $targetamount + * @property string $targetamount_encrypted + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property string $reminder + * @property integer $reminder_skip + * @property boolean $remind_me + * @property integer $order + * @property boolean $encrypted + * @property-read \FireflyIII\Models\Account $account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamountEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminder($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) */ class PiggyBank extends Model { diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 5cf2498889..2d2d37bc9b 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -5,9 +5,26 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankEvent * - * @codeCoverageIgnore - * + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property integer $transaction_journal_id + * @property \Carbon\Carbon $date + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\PiggyBank $piggyBank + * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmountEncrypted($value) */ class PiggyBankEvent extends Model { diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index fed4dfd490..221d491ede 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -7,8 +7,27 @@ use Illuminate\Database\Eloquent\Model; /** * Class PiggyBankRepetition * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property float $currentamount + * @property string $currentamount_encrypted + * @property-read \FireflyIII\Models\PiggyBank $piggyBank + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamountEncrypted($value) + * @method static \FireflyIII\Models\PiggyBankRepetition onDates($start, $target) + * @method static \FireflyIII\Models\PiggyBankRepetition relevantOnDate($date) */ class PiggyBankRepetition extends Model { diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 84ba5ceaf9..bce89c26fb 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -6,8 +6,25 @@ use Illuminate\Database\Eloquent\Model; /** * Class Preference * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $name_encrypted + * @property string $data + * @property string $data_encrypted + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereNameEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereData($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereDataEncrypted($value) */ class Preference extends Model { diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index ddde2a7ed5..079d18b20e 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -8,9 +8,36 @@ use Illuminate\Database\Eloquent\Model; /** * Class Reminder * - * @codeCoverageIgnore - * + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property boolean $active + * @property boolean $notnow + * @property integer $remindersable_id + * @property string $remindersable_type + * @property string $metadata + * @property boolean $encrypted + * @property-read \ $remindersable + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereStartdate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEnddate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereActive($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereNotnow($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereRemindersableId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereRemindersableType($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereMetadata($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEncrypted($value) + * @method static \FireflyIII\Models\Reminder onDates($start, $end) + * @method static \FireflyIII\Models\Reminder today() */ class Reminder extends Model { diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 3a1f1fd9a9..5e4335c081 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -10,6 +10,32 @@ use Watson\Validating\ValidatingTrait; * Class Tag * * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $deleted_at + * @property integer $user_id + * @property string $tag + * @property string $tagMode + * @property \Carbon\Carbon $date + * @property string $description + * @property float $latitude + * @property float $longitude + * @property integer $zoomLevel + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTag($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTagMode($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDescription($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLatitude($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLongitude($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value) */ class Tag extends Model { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 0c2fe0ff04..dda3393095 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -9,8 +9,30 @@ use Watson\Validating\ValidatingTrait; /** * Class Transaction * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property integer $transaction_journal_id + * @property string $description + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\Account $account + * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAccountId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDescription($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmountEncrypted($value) + * @method static \FireflyIII\Models\Transaction after($date) + * @method static \FireflyIII\Models\Transaction before($date) */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index a91c2df889..be9ce8c810 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -4,11 +4,25 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; /** - * * Class TransactionCurrency * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $code + * @property string $name + * @property string $symbol + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereName($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value) */ class TransactionCurrency extends Model { diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index 31e93d90fe..d51e534cf2 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -6,8 +6,22 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionGroup * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property string $relation + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereRelation($value) */ class TransactionGroup extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index ad24e7a712..fbb49e93f8 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -12,8 +12,54 @@ use Watson\Validating\ValidatingTrait; * Class TransactionJournal * * @package FireflyIII\Models - * - * @SuppressWarnings(PHPMD.TooManyMethods) + * @SuppressWarnings (PHPMD.TooManyMethods) + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $transaction_type_id + * @property integer $bill_id + * @property integer $transaction_currency_id + * @property string $description + * @property boolean $completed + * @property \Carbon\Carbon $date + * @property boolean $encrypted + * @property integer $order + * @property-read \FireflyIII\Models\Bill $bill + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories + * @property-read mixed $actual_amount + * @property-read mixed $amount + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read mixed $asset_account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions + * @property-read mixed $corrected_actual_amount + * @property-read mixed $destination_account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency + * @property-read \FireflyIII\Models\TransactionType $transactionType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups + * @property-read \FireflyIII\User $user + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDate($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value) + * @method static \FireflyIII\Models\TransactionJournal accountIs($account) + * @method static \FireflyIII\Models\TransactionJournal after($date) + * @method static \FireflyIII\Models\TransactionJournal before($date) + * @method static \FireflyIII\Models\TransactionJournal onDate($date) + * @method static \FireflyIII\Models\TransactionJournal transactionTypes($types) + * @method static \FireflyIII\Models\TransactionJournal withRelevantData() */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php index aa4d3810af..056d61fdd8 100644 --- a/app/Models/TransactionRelation.php +++ b/app/Models/TransactionRelation.php @@ -5,7 +5,7 @@ use Illuminate\Database\Eloquent\Model; /** * Class TransactionRelation * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models */ class TransactionRelation extends Model diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index cee923cfc2..bfea460fa2 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -6,8 +6,19 @@ use Illuminate\Database\Eloquent\SoftDeletes; /** * Class TransactionType * - * @codeCoverageIgnore + * @codeCoverageIgnore * @package FireflyIII\Models + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $type + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereType($value) */ class TransactionType extends Model { diff --git a/app/User.php b/app/User.php index f649708cfb..2f28eb1c93 100644 --- a/app/User.php +++ b/app/User.php @@ -10,6 +10,28 @@ use Illuminate\Database\Eloquent\Model; * Class User * * @package FireflyIII + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $email + * @property string $password + * @property string $reset + * @property string $remember_token + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereUpdatedAt($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereEmail($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User wherePassword($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereReset($value) + * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereRememberToken($value) */ class User extends Model implements AuthenticatableContract, CanResetPasswordContract { From 3af0dd2e3bd236a35ea9a87d3b8022b9c2dc95a1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 12:08:46 +0200 Subject: [PATCH 04/29] Some code cleanup [skip ci] --- app/Helpers/Report/ReportHelper.php | 2 +- app/Helpers/Report/ReportHelperInterface.php | 7 +++-- app/Http/Controllers/PiggyBankController.php | 5 --- app/Http/Requests/JournalFormRequest.php | 3 +- app/Http/routes.php | 32 +++++++------------- 5 files changed, 18 insertions(+), 31 deletions(-) diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 986d324e50..d8134a6110 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -53,7 +53,7 @@ class ReportHelper implements ReportHelperInterface * @param Carbon $end * @param $shared * - * @return Account + * @return AccountCollection */ public function getAccountReport(Carbon $date, Carbon $end, $shared) { diff --git a/app/Helpers/Report/ReportHelperInterface.php b/app/Helpers/Report/ReportHelperInterface.php index 13bef6fb67..e1e0a3df1a 100644 --- a/app/Helpers/Report/ReportHelperInterface.php +++ b/app/Helpers/Report/ReportHelperInterface.php @@ -3,10 +3,11 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Collection\Account; +use FireflyIII\Helpers\Collection\Account as AccountCollection; use FireflyIII\Helpers\Collection\Balance; use FireflyIII\Helpers\Collection\Budget as BudgetCollection; use FireflyIII\Helpers\Collection\Category as CategoryCollection; +use FireflyIII\Helpers\Collection\Bill as BillCollection; use FireflyIII\Helpers\Collection\Expense; use FireflyIII\Helpers\Collection\Income; @@ -26,7 +27,7 @@ interface ReportHelperInterface * @param Carbon $end * @param boolean $shared * - * @return Account + * @return AccountCollection */ public function getAccountReport(Carbon $date, Carbon $end, $shared); @@ -38,7 +39,7 @@ interface ReportHelperInterface * @param Carbon $end * @param boolean $shared * - * @return Account + * @return BillCollection */ public function getBillReport(Carbon $start, Carbon $end, $shared); diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index d6ebe48f18..43616f360b 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -240,11 +240,6 @@ class PiggyBankController extends Controller // create event $repository->createEvent($piggyBank, $amount); - /* - * Create event! - */ - //Event::fire('piggy_bank.addMoney', [$piggyBank, $amount]); // new and used. - Session::flash('success', 'Added ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".'); } else { Session::flash('error', 'Could not add ' . Amount::format($amount, false) . ' to "' . e($piggyBank->name) . '".'); diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 1e3d4e0d53..914eae0583 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -2,6 +2,7 @@ namespace FireflyIII\Http\Requests; +use App; use Auth; use Carbon\Carbon; use Exception; @@ -85,7 +86,7 @@ class JournalFormRequest extends Request $rules['category'] = 'between:1,255'; break; default: - throw new Exception('Cannot handle ' . $what); + App::abort(500, 'Cannot handle ' . $what); break; } diff --git a/app/Http/routes.php b/app/Http/routes.php index c44686eda1..02631fcac4 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -13,10 +13,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; // models -/** @noinspection PhpUnusedParameterInspection */ Route::bind( 'account', - function ($value, $route) { + function ($value) { if (Auth::check()) { $object = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->where('account_types.editable', 1) @@ -31,9 +30,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'tj', function ($value, $route) { + 'tj', function ($value) { if (Auth::check()) { $object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -45,9 +43,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'currency', function ($value, $route) { + 'currency', function ($value) { if (Auth::check()) { $object = TransactionCurrency::find($value); if ($object) { @@ -58,9 +55,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'bill', function ($value, $route) { + 'bill', function ($value) { if (Auth::check()) { $object = Bill::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -72,9 +68,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'budget', function ($value, $route) { + 'budget', function ($value) { if (Auth::check()) { $object = Budget::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -86,9 +81,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'reminder', function ($value, $route) { + 'reminder', function ($value) { if (Auth::check()) { $object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -100,9 +94,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'limitrepetition', function ($value, $route) { + 'limitrepetition', function ($value) { if (Auth::check()) { $object = LimitRepetition::where('limit_repetitions.id', $value) ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') @@ -118,9 +111,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'piggyBank', function ($value, $route) { + 'piggyBank', function ($value) { if (Auth::check()) { $object = PiggyBank::where('piggy_banks.id', $value) ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') @@ -135,9 +127,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'category', function ($value, $route) { + 'category', function ($value) { if (Auth::check()) { $object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -151,7 +142,7 @@ Route::bind( /** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'reminder', function ($value, $route) { + 'reminder', function ($value) { if (Auth::check()) { /** @var \FireflyIII\Models\Reminder $object */ $object = Reminder::find($value); @@ -166,9 +157,8 @@ Route::bind( } ); -/** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'tag', function ($value, $route) { + 'tag', function ($value) { if (Auth::check()) { $object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { From 2d2f18e5388c86318c3d11ba22703638e73edd0f Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 12:19:11 +0200 Subject: [PATCH 05/29] Code cleanup. --- app/Models/Account.php | 32 +++---- app/Models/AccountMeta.php | 14 ++-- app/Models/AccountType.php | 12 +-- app/Models/Bill.php | 38 ++++----- app/Models/Budget.php | 22 ++--- app/Models/BudgetLimit.php | 22 ++--- app/Models/Category.php | 18 ++-- app/Models/Component.php | 14 ++-- app/Models/LimitRepetition.php | 18 ++-- app/Models/PiggyBank.php | 38 ++++----- app/Models/PiggyBankEvent.php | 20 ++--- app/Models/PiggyBankRepetition.php | 18 ++-- app/Models/Preference.php | 18 ++-- app/Models/Reminder.php | 28 +++---- app/Models/Tag.php | 28 +++---- app/Models/Transaction.php | 22 ++--- app/Models/TransactionCurrency.php | 16 ++-- app/Models/TransactionGroup.php | 16 ++-- app/Models/TransactionJournal.php | 102 ++++++++++++++--------- app/Models/TransactionType.php | 12 +-- app/Repositories/Bill/BillRepository.php | 45 ++-------- app/User.php | 30 +++---- 22 files changed, 285 insertions(+), 298 deletions(-) diff --git a/app/Models/Account.php b/app/Models/Account.php index bda55d8c8b..581c0d48e2 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -11,22 +11,22 @@ use Watson\Validating\ValidatingTrait; * Class Account * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $account_type_id - * @property string $name - * @property boolean $active - * @property boolean $encrypted - * @property float $virtual_balance - * @property string $virtual_balance_encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta - * @property-read \FireflyIII\Models\AccountType $accountType - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $account_type_id + * @property string $name + * @property boolean $active + * @property boolean $encrypted + * @property float $virtual_balance + * @property string $virtual_balance_encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta + * @property-read \FireflyIII\Models\AccountType $accountType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[] $piggyBanks + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value) diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 7279f6094c..3cd0f95fbe 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -8,13 +8,13 @@ use Watson\Validating\ValidatingTrait; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $account_id - * @property string $name - * @property string $data - * @property-read \FireflyIII\Models\Account $account + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $account_id + * @property string $name + * @property string $data + * @property-read \FireflyIII\Models\Account $account * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value) diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index ebf51de3df..10c10a1ef4 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -7,12 +7,12 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $type - * @property boolean $editable - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $type + * @property boolean $editable + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value) diff --git a/app/Models/Bill.php b/app/Models/Bill.php index c3fdce553c..845d110cf5 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -8,25 +8,25 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore Class Bill * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $match - * @property float $amount_min - * @property string $amount_min_encrypted - * @property float $amount_max - * @property string $amount_max_encrypted - * @property \Carbon\Carbon $date - * @property boolean $active - * @property boolean $automatch - * @property string $repeat_freq - * @property integer $skip - * @property boolean $name_encrypted - * @property boolean $match_encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $match + * @property float $amount_min + * @property string $amount_min_encrypted + * @property float $amount_max + * @property string $amount_max_encrypted + * @property \Carbon\Carbon $date + * @property boolean $active + * @property boolean $automatch + * @property string $repeat_freq + * @property integer $skip + * @property boolean $name_encrypted + * @property boolean $match_encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value) diff --git a/app/Models/Budget.php b/app/Models/Budget.php index bb186cb493..7de89a558e 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -9,17 +9,17 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $active - * @property boolean $encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $active + * @property boolean $encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[] $budgetlimits + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value) diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 3ef24e24ac..921f37d9db 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -7,17 +7,17 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_id - * @property \Carbon\Carbon $startdate - * @property float $amount - * @property string $amount_encrypted - * @property boolean $repeats - * @property string $repeat_freq - * @property-read \FireflyIII\Models\Budget $budget - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_id + * @property \Carbon\Carbon $startdate + * @property float $amount + * @property string $amount_encrypted + * @property boolean $repeats + * @property string $repeat_freq + * @property-read \FireflyIII\Models\Budget $budget + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value) diff --git a/app/Models/Category.php b/app/Models/Category.php index 8833cf1a2d..30b1601f50 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -8,15 +8,15 @@ use Illuminate\Database\Eloquent\SoftDeletes; * Class Category * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property boolean $encrypted - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property boolean $encrypted + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value) diff --git a/app/Models/Component.php b/app/Models/Component.php index 4e543d830e..ac43425ad7 100644 --- a/app/Models/Component.php +++ b/app/Models/Component.php @@ -8,13 +8,13 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $name - * @property integer $user_id - * @property string $class + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $name + * @property integer $user_id + * @property string $class * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value) diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index 580ef92977..1adffb5e18 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -7,15 +7,15 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $budget_limit_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $enddate - * @property float $amount - * @property string $amount_encrypted - * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $budget_limit_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value) diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 9601cc946f..6d4b904d81 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -9,25 +9,25 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property string $name - * @property float $targetamount - * @property string $targetamount_encrypted - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property string $reminder - * @property integer $reminder_skip - * @property boolean $remind_me - * @property integer $order - * @property boolean $encrypted - * @property-read \FireflyIII\Models\Account $account - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property string $name + * @property float $targetamount + * @property string $targetamount_encrypted + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property string $reminder + * @property integer $reminder_skip + * @property boolean $remind_me + * @property integer $order + * @property boolean $encrypted + * @property-read \FireflyIII\Models\Account $account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value) diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index 2d2d37bc9b..2c03dadace 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -7,16 +7,16 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property integer $transaction_journal_id - * @property \Carbon\Carbon $date - * @property float $amount - * @property string $amount_encrypted - * @property-read \FireflyIII\Models\PiggyBank $piggyBank - * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property integer $transaction_journal_id + * @property \Carbon\Carbon $date + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\PiggyBank $piggyBank + * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value) diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index 221d491ede..deccd7bbde 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -9,15 +9,15 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $piggy_bank_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $targetdate - * @property float $currentamount - * @property string $currentamount_encrypted - * @property-read \FireflyIII\Models\PiggyBank $piggyBank + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $piggy_bank_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $targetdate + * @property float $currentamount + * @property string $currentamount_encrypted + * @property-read \FireflyIII\Models\PiggyBank $piggyBank * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value) diff --git a/app/Models/Preference.php b/app/Models/Preference.php index bce89c26fb..a25fd850e6 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -8,15 +8,15 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property string $name - * @property string $name_encrypted - * @property string $data - * @property string $data_encrypted - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property string $name + * @property string $name_encrypted + * @property string $data + * @property string $data_encrypted + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value) diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index 079d18b20e..d46cf56e74 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -10,20 +10,20 @@ use Illuminate\Database\Eloquent\Model; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property integer $user_id - * @property \Carbon\Carbon $startdate - * @property \Carbon\Carbon $enddate - * @property boolean $active - * @property boolean $notnow - * @property integer $remindersable_id - * @property string $remindersable_type - * @property string $metadata - * @property boolean $encrypted - * @property-read \ $remindersable - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property integer $user_id + * @property \Carbon\Carbon $startdate + * @property \Carbon\Carbon $enddate + * @property boolean $active + * @property boolean $notnow + * @property integer $remindersable_id + * @property string $remindersable_type + * @property string $metadata + * @property boolean $encrypted + * @property-read \ $remindersable + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereUpdatedAt($value) diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 5e4335c081..2d973f4bf1 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -10,20 +10,20 @@ use Watson\Validating\ValidatingTrait; * Class Tag * * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $deleted_at - * @property integer $user_id - * @property string $tag - * @property string $tagMode - * @property \Carbon\Carbon $date - * @property string $description - * @property float $latitude - * @property float $longitude - * @property integer $zoomLevel - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $deleted_at + * @property integer $user_id + * @property string $tag + * @property string $tagMode + * @property \Carbon\Carbon $date + * @property string $description + * @property float $latitude + * @property float $longitude + * @property integer $zoomLevel + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value) diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index dda3393095..8b375090d3 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -11,17 +11,17 @@ use Watson\Validating\ValidatingTrait; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $account_id - * @property integer $transaction_journal_id - * @property string $description - * @property float $amount - * @property string $amount_encrypted - * @property-read \FireflyIII\Models\Account $account - * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $account_id + * @property integer $transaction_journal_id + * @property string $description + * @property float $amount + * @property string $amount_encrypted + * @property-read \FireflyIII\Models\Account $account + * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value) diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index be9ce8c810..edc8797aca 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -8,14 +8,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $code - * @property string $name - * @property string $symbol - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $code + * @property string $name + * @property string $symbol + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value) diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php index d51e534cf2..9ef702872c 100644 --- a/app/Models/TransactionGroup.php +++ b/app/Models/TransactionGroup.php @@ -8,14 +8,14 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property string $relation - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property string $relation + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value) diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index fbb49e93f8..236c8a8ed4 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -13,34 +13,34 @@ use Watson\Validating\ValidatingTrait; * * @package FireflyIII\Models * @SuppressWarnings (PHPMD.TooManyMethods) - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property integer $user_id - * @property integer $transaction_type_id - * @property integer $bill_id - * @property integer $transaction_currency_id - * @property string $description - * @property boolean $completed - * @property \Carbon\Carbon $date - * @property boolean $encrypted - * @property integer $order - * @property-read \FireflyIII\Models\Bill $bill - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories - * @property-read mixed $actual_amount - * @property-read mixed $amount - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read mixed $asset_account - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions - * @property-read mixed $corrected_actual_amount - * @property-read mixed $destination_account - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents - * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency - * @property-read \FireflyIII\Models\TransactionType $transactionType - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups - * @property-read \FireflyIII\User $user + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property integer $user_id + * @property integer $transaction_type_id + * @property integer $bill_id + * @property integer $transaction_currency_id + * @property string $description + * @property boolean $completed + * @property \Carbon\Carbon $date + * @property boolean $encrypted + * @property integer $order + * @property-read \FireflyIII\Models\Bill $bill + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories + * @property-read mixed $actual_amount + * @property-read mixed $amount + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read mixed $asset_account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions + * @property-read mixed $corrected_actual_amount + * @property-read mixed $destination_account + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[] $piggyBankEvents + * @property-read \FireflyIII\Models\TransactionCurrency $transactionCurrency + * @property-read \FireflyIII\Models\TransactionType $transactionType + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups + * @property-read \FireflyIII\User $user * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value) @@ -60,6 +60,7 @@ use Watson\Validating\ValidatingTrait; * @method static \FireflyIII\Models\TransactionJournal onDate($date) * @method static \FireflyIII\Models\TransactionJournal transactionTypes($types) * @method static \FireflyIII\Models\TransactionJournal withRelevantData() + * @property-read mixed $expense_account */ class TransactionJournal extends Model { @@ -196,22 +197,21 @@ class TransactionJournal extends Model */ public function getAssetAccountAttribute() { - $positive = true; // the asset account is in the transaction with the positive amount. - if ($this->transactionType->type === 'Withdrawal') { - $positive = false; - } - /** @var Transaction $transaction */ - foreach ($this->transactions()->get() as $transaction) { - if (floatval($transaction->amount) > 0 && $positive === true) { - return $transaction->account; - } - if (floatval($transaction->amount) < 0 && $positive === false) { - return $transaction->account; - } + // if it's a deposit, it's the one thats positive + // if it's a withdrawal, it's the one thats negative + // otherwise, it's either (return first one): + + 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; } return $this->transactions()->first()->account; + } /** @@ -285,6 +285,28 @@ class TransactionJournal extends Model return $this->transactions()->first()->account; } + /** + * @return Account + */ + public function getExpenseAccountAttribute() + { + // if it's a deposit, it's the one thats negative + // if it's a withdrawal, it's the one thats positive + // otherwise, it's either (return first one): + + 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; + + } + + return $this->transactions()->first()->account; + + } + /** * @codeCoverageIgnore * @return \Illuminate\Database\Eloquent\Relations\HasMany diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index bfea460fa2..697b0e8432 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -8,12 +8,12 @@ use Illuminate\Database\Eloquent\SoftDeletes; * * @codeCoverageIgnore * @package FireflyIII\Models - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property \Carbon\Carbon $deleted_at - * @property string $type - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property \Carbon\Carbon $deleted_at + * @property string $type + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value) diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 290d967503..190808cfb0 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -5,13 +5,10 @@ namespace FireflyIII\Repositories\Bill; use Auth; use Carbon\Carbon; use DB; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use Illuminate\Support\Collection; -use Log; use Navigation; /** @@ -268,27 +265,8 @@ class BillRepository implements BillRepositoryInterface $amountMatch = false; $wordMatch = false; $matches = explode(',', $bill->match); - $description = strtolower($journal->description); - - /* - * Attach expense account to description for more narrow matching. - */ - $transactions = $journal->transactions()->get(); - - /** @var Transaction $transaction */ - foreach ($transactions as $transaction) { - /** @var Account $account */ - $account = $transaction->account()->first(); - /** @var AccountType $type */ - $type = $account->accountType()->first(); - if ($type->type == 'Expense account' || $type->type == 'Beneficiary account') { - $description .= ' ' . strtolower($account->name); - } - } - Log::debug('Final description: ' . $description); - Log::debug('Matches searched: ' . join(':', $matches)); - - $count = 0; + $description = strtolower($journal->description) . ' ' . strtolower($journal->expense_account->name); + $count = 0; foreach ($matches as $word) { if (!(strpos($description, strtolower($word)) === false)) { $count++; @@ -296,37 +274,24 @@ class BillRepository implements BillRepositoryInterface } if ($count >= count($matches)) { $wordMatch = true; - Log::debug('word match is true'); - } else { - Log::debug('Count: ' . $count . ', count(matches): ' . count($matches)); } /* * Match amount. */ - - if (count($transactions) > 1) { - - $amount = max(floatval($transactions[0]->amount), floatval($transactions[1]->amount)); - $min = floatval($bill->amount_min); - $max = floatval($bill->amount_max); - if ($amount >= $min && $amount <= $max) { - $amountMatch = true; - Log::debug('Amount match is true!'); - } + if ($journal->amount >= $bill->amount_min && $journal->amount <= $bill->amount_max) { + $amountMatch = true; } - /* * If both, update! */ if ($wordMatch && $amountMatch) { - Log::debug('TOTAL match is true!'); $journal->bill()->associate($bill); $journal->save(); } else { - if ((!$wordMatch || !$amountMatch) && $bill->id == $journal->bill_id) { + if ($bill->id == $journal->bill_id) { // if no match, but bill used to match, remove it: $journal->bill_id = null; $journal->save(); diff --git a/app/User.php b/app/User.php index 2f28eb1c93..3a97465ee8 100644 --- a/app/User.php +++ b/app/User.php @@ -10,21 +10,21 @@ use Illuminate\Database\Eloquent\Model; * Class User * * @package FireflyIII - * @property integer $id - * @property \Carbon\Carbon $created_at - * @property \Carbon\Carbon $updated_at - * @property string $email - * @property string $password - * @property string $reset - * @property string $remember_token - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders - * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals + * @property integer $id + * @property \Carbon\Carbon $created_at + * @property \Carbon\Carbon $updated_at + * @property string $email + * @property string $password + * @property string $reset + * @property string $remember_token + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[] $tags + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[] $bills + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[] $budgets + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[] $categories + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[] $preferences + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Reminder[] $reminders + * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereUpdatedAt($value) From 7dfde51b84a365e8d91e5a9b471a05a66c7779b7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 19:38:52 +0200 Subject: [PATCH 06/29] Fixed tests. --- app/Models/TransactionJournal.php | 22 -- app/Validation/FireflyValidator.php | 2 +- composer.json | 5 +- composer.lock | 98 ++++----- tests/controllers/CategoryControllerTest.php | 1 + tests/factories/all.php | 33 ++- .../helpers/ConnectJournalToPiggyBankTest.php | 47 ----- tests/helpers/ReportHelperTest.php | 46 +---- tests/helpers/ReportQueryTest.php | 85 +++----- tests/models/TransactionJournalModelTest.php | 195 +++++++++--------- tests/repositories/AccountRepositoryTest.php | 158 +++++--------- tests/repositories/BillRepositoryTest.php | 9 +- tests/repositories/CategoryRepositoryTest.php | 3 +- tests/repositories/TagRepositoryTest.php | 21 +- 14 files changed, 282 insertions(+), 443 deletions(-) diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 236c8a8ed4..a6f868937e 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -223,28 +223,6 @@ class TransactionJournal extends Model return $this->hasMany('FireflyIII\Models\Transaction'); } - /** - * @return float - */ - public function getCorrectedActualAmountAttribute() - { - $amount = '0'; - $type = $this->transactionType->type; - /** @var Transaction $t */ - foreach ($this->transactions as $t) { - if ($t->amount > 0 && $type != 'Withdrawal') { - $amount = $t->amount; - break; - } - if ($t->amount < 0 && $type == 'Withdrawal') { - $amount = $t->amount; - break; - } - } - - return $amount; - } - /** * @codeCoverageIgnore * @return array diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 9263fd13d4..9ee4a7eaed 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -167,7 +167,7 @@ class FireflyValidator extends Validator { $query = DB::table($parameters[0])->where($parameters[1], $value); $query->where('user_id', Auth::user()->id); - if (isset($paramers[2])) { + if (isset($parameters[2])) { $query->where('id', '!=', $parameters[2]); } $count = $query->count(); diff --git a/composer.json b/composer.json index 3a3e55afc2..abc1ca1ffc 100644 --- a/composer.json +++ b/composer.json @@ -38,8 +38,9 @@ "satooshi/php-coveralls": "0.6.1", "mockery/mockery": "0.9.*", "league/factory-muffin": "~2.1", - "codeclimate/php-test-reporter": "^0.1.2" - + "codeclimate/php-test-reporter": "^0.1.2", + "fzaninotto/faker": "^1.4" + }, diff --git a/composer.lock b/composer.lock index 36256fec53..d5201cc8a3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "5c085b2cc90ffa610e386897066315a7", + "hash": "46b7813f499f70942e9997e916e68145", "packages": [ { "name": "classpreloader/classpreloader", @@ -673,6 +673,54 @@ ], "time": "2014-09-09 13:34:57" }, + { + "name": "fzaninotto/faker", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/010c7efedd88bf31141a02719f51fb44c732d5a0", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-0": { + "Faker": "src/", + "Faker\\PHPUnit": "test/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2014-06-04 14:43:02" + }, { "name": "grumpydictator/gchart", "version": "1.0.9", @@ -2800,54 +2848,6 @@ ], "time": "2014-10-13 12:58:55" }, - { - "name": "fzaninotto/faker", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/010c7efedd88bf31141a02719f51fb44c732d5a0", - "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "extra": { - "branch-alias": [] - }, - "autoload": { - "psr-0": { - "Faker": "src/", - "Faker\\PHPUnit": "test/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2014-06-04 14:43:02" - }, { "name": "guzzle/guzzle", "version": "v3.9.3", diff --git a/tests/controllers/CategoryControllerTest.php b/tests/controllers/CategoryControllerTest.php index 8a260fb8af..50644b4252 100644 --- a/tests/controllers/CategoryControllerTest.php +++ b/tests/controllers/CategoryControllerTest.php @@ -159,6 +159,7 @@ class CategoryControllerTest extends TestCase Amount::shouldReceive('format')->andReturn('xx'); Amount::shouldReceive('getCurrencyCode')->andReturn('xx'); + Amount::shouldReceive('formatJournal')->andReturn('xx'); $this->call('GET', '/categories/show/' . $category->id); $this->assertResponseOk(); diff --git a/tests/factories/all.php b/tests/factories/all.php index 986efab4a4..fa4e472d90 100644 --- a/tests/factories/all.php +++ b/tests/factories/all.php @@ -1,4 +1,6 @@ 'email', + 'email' => function () { + $faker = Faker\Factory::create(); + + return $faker->email; + }, 'password' => bcrypt('james'), ] ); @@ -286,5 +293,27 @@ FactoryMuffin::define( 'date' => 'date', 'encrypted' => '1', 'order' => '0', - ] + ], function (TransactionJournal $object, $saved) { + if ($saved) { + $one = FactoryMuffin::create('FireflyIII\Models\Account'); + $two = FactoryMuffin::create('FireflyIII\Models\Account'); + + Transaction::create( + [ + 'account_id' => $one->id, + 'transaction_journal_id' => $object->id, + 'amount' => 100 + ] + ); + Transaction::create( + [ + 'account_id' => $two->id, + 'transaction_journal_id' => $object->id, + 'amount' => -100 + ] + ); + + } + +} ); diff --git a/tests/helpers/ConnectJournalToPiggyBankTest.php b/tests/helpers/ConnectJournalToPiggyBankTest.php index 602d945703..c580db3fce 100644 --- a/tests/helpers/ConnectJournalToPiggyBankTest.php +++ b/tests/helpers/ConnectJournalToPiggyBankTest.php @@ -61,23 +61,6 @@ class ConnectJournalToPiggyBankTest extends TestCase $rep->forceDelete(); } - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); - - // two transactions: - $event = new JournalCreated($journal, $piggyBank->id); $class = new ConnectJournalToPiggyBank(); @@ -141,21 +124,6 @@ class ConnectJournalToPiggyBankTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); - $event = new JournalCreated($journal, $piggyBank->id); $class = new ConnectJournalToPiggyBank(); $result = $class->handle($event); @@ -202,21 +170,6 @@ class ConnectJournalToPiggyBankTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); - $event = new JournalCreated($journal, $piggyBank->id); $class = new ConnectJournalToPiggyBank(); $result = $class->handle($event); diff --git a/tests/helpers/ReportHelperTest.php b/tests/helpers/ReportHelperTest.php index e321854f4f..3598c959eb 100644 --- a/tests/helpers/ReportHelperTest.php +++ b/tests/helpers/ReportHelperTest.php @@ -122,20 +122,6 @@ class ReportHelperTest extends TestCase for ($i = 0; $i < 5; $i++) { $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); - Transaction::create( - [ - 'account_id' => $left->id, - 'transaction_journal_id' => $journal->id, - 'amount' => rand(-100, 100) - ] - ); - Transaction::create( - [ - 'account_id' => $right->id, - 'transaction_journal_id' => $journal->id, - 'amount' => rand(-100, 100) - ] - ); $journals->push($journal); } @@ -257,25 +243,11 @@ class ReportHelperTest extends TestCase $journal->transaction_type_id = $type->id; $journal->user_id = $user->id; $journal->save(); - Transaction::create( - [ - 'account_id' => $left->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $right->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); } // test! $object = $this->object->getExpenseReport(Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth(), true); - $this->assertCount(1, $object->getExpenses()); + $this->assertCount(5, $object->getExpenses()); } /** @@ -322,25 +294,11 @@ class ReportHelperTest extends TestCase $journal->transaction_type_id = $type->id; $journal->user_id = $user->id; $journal->save(); - Transaction::create( - [ - 'account_id' => $left->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $right->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); } // test! $object = $this->object->getIncomeReport(Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth(), true); - $this->assertCount(1, $object->getIncomes()); + $this->assertCount(5, $object->getIncomes()); } diff --git a/tests/helpers/ReportQueryTest.php b/tests/helpers/ReportQueryTest.php index eb12e6e35d..af78cd15e8 100644 --- a/tests/helpers/ReportQueryTest.php +++ b/tests/helpers/ReportQueryTest.php @@ -80,21 +80,15 @@ class ReportQueryTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); + // update both transactions + $journal->transactions[0]->account_id = $account1->id; + $journal->transactions[0]->amount = -100; + $journal->transactions[0]->save(); + + $journal->transactions[1]->account_id = $account2->id; + $journal->transactions[1]->amount = 100; + $journal->transactions[1]->save(); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); } $this->be($user); @@ -149,21 +143,14 @@ class ReportQueryTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); + // update both transactions + $journal->transactions[0]->account_id = $account1->id; + $journal->transactions[0]->amount = -100; + $journal->transactions[0]->save(); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); + $journal->transactions[1]->account_id = $account2->id; + $journal->transactions[1]->amount = 100; + $journal->transactions[1]->save(); } $this->be($user); @@ -271,21 +258,14 @@ class ReportQueryTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); + // update both transactions + $journal->transactions[0]->account_id = $account1->id; + $journal->transactions[0]->amount = 100; + $journal->transactions[0]->save(); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); + $journal->transactions[1]->account_id = $account2->id; + $journal->transactions[1]->amount = -100; + $journal->transactions[1]->save(); } $this->be($user); @@ -339,21 +319,14 @@ class ReportQueryTest extends TestCase ] ); - Transaction::create( - [ - 'account_id' => $account2->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100 - ] - ); + // update both transactions + $journal->transactions[0]->account_id = $account1->id; + $journal->transactions[0]->amount = -100; + $journal->transactions[0]->save(); - Transaction::create( - [ - 'account_id' => $account1->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); + $journal->transactions[1]->account_id = $account2->id; + $journal->transactions[1]->amount = 100; + $journal->transactions[1]->save(); } $this->be($user); diff --git a/tests/models/TransactionJournalModelTest.php b/tests/models/TransactionJournalModelTest.php index dbdf86f035..d05f285529 100644 --- a/tests/models/TransactionJournalModelTest.php +++ b/tests/models/TransactionJournalModelTest.php @@ -47,13 +47,11 @@ class TransactionJournalModelTest extends TestCase $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $account = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 123.45 - ] - ); + $journal->transactions[0]->amount = '123.45'; + $journal->transactions[0]->save(); + $journal->transactions[1]->amount = '-123.45'; + $journal->transactions[1]->save(); + $amount = $journal->actual_amount; $this->assertEquals('123.45', $amount); } @@ -88,13 +86,22 @@ class TransactionJournalModelTest extends TestCase $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - // for withdrawal, asset to expense account and reversed: //89,88 - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => -300]); - Transaction::create(['account_id' => $expense->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => 300]); + // transactions are already in place, update them: + $withdrawal->transactions[0]->account_id = $asset->id; + $withdrawal->transactions[0]->amount = -300; + $withdrawal->transactions[0]->save(); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -89.88]); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => 89.88]); + $withdrawal->transactions[1]->account_id = $expense->id; + $withdrawal->transactions[1]->amount = 300; + $withdrawal->transactions[1]->save(); + $deposit->transactions[0]->account_id = $revenue->id; + $deposit->transactions[0]->amount = -89.88; + $deposit->transactions[0]->save(); + + $deposit->transactions[1]->account_id = $asset->id; + $deposit->transactions[1]->amount = 89.88; + $deposit->transactions[1]->save(); // connect to tag: $tag->transactionJournals()->save($withdrawal); @@ -138,17 +145,27 @@ class TransactionJournalModelTest extends TestCase // make accounts: $expense = FactoryMuffin::create('FireflyIII\Models\Account'); - $asset2 = FactoryMuffin::create('FireflyIII\Models\Account'); + $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - $asset2->account_type_id = $asset->account_type_id; - $asset2->save(); + $revenue->account_type_id = $asset->account_type_id; + $revenue->save(); - // make transactions: - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => -123.45]); - Transaction::create(['account_id' => $expense->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => 123.45]); + // transactions are already in place, update them: + $withdrawal->transactions[0]->account_id = $asset->id; + $withdrawal->transactions[0]->amount = -123.45; + $withdrawal->transactions[0]->save(); - Transaction::create(['account_id' => $asset2->id, 'transaction_journal_id' => $transfer->id, 'amount' => -123.45]); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $transfer->id, 'amount' => 123.45]); + $withdrawal->transactions[1]->account_id = $expense->id; + $withdrawal->transactions[1]->amount = 123.45; + $withdrawal->transactions[1]->save(); + + $transfer->transactions[0]->account_id = $revenue->id; + $transfer->transactions[0]->amount = -123.45; + $transfer->transactions[0]->save(); + + $transfer->transactions[1]->account_id = $asset->id; + $transfer->transactions[1]->amount = 123.45; + $transfer->transactions[1]->save(); $amount = $withdrawal->amount; @@ -161,15 +178,13 @@ class TransactionJournalModelTest extends TestCase public function testGetAmountAttributeNoTags() { $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); - $account = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 123.45 - ] - ); + $journal->transactions[0]->amount = 123.45; + $journal->transactions[0]->save(); + + $journal->transactions[1]->amount = -123.45; + $journal->transactions[1]->save(); + $amount = $journal->amount; $this->assertEquals('123.45', $amount); } @@ -195,8 +210,13 @@ class TransactionJournalModelTest extends TestCase $expense = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => -300]); - Transaction::create(['account_id' => $expense->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => 300]); + $withdrawal->transactions[0]->amount = -300; + $withdrawal->transactions[0]->account_id = $asset->id; + $withdrawal->transactions[0]->save(); + + $withdrawal->transactions[1]->amount = 300; + $withdrawal->transactions[1]->account_id = $expense->id; + $withdrawal->transactions[1]->save(); // connect to tag: $tag->transactionJournals()->save($withdrawal); @@ -224,8 +244,15 @@ class TransactionJournalModelTest extends TestCase $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => 300]); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); + // update transactions + $deposit->transactions[0]->account_id = $asset->id; + $deposit->transactions[0]->amount = 300; + $deposit->transactions[0]->save(); + + $deposit->transactions[1]->account_id = $revenue->id; + $deposit->transactions[1]->amount = -300; + $deposit->transactions[1]->save(); + // get asset account: $result = $deposit->asset_account; @@ -240,19 +267,24 @@ class TransactionJournalModelTest extends TestCase { FactoryMuffin::create('FireflyIII\Models\TransactionType'); + // make accounts + FactoryMuffin::create('FireflyIII\Models\Account'); + $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); + $asset = FactoryMuffin::create('FireflyIII\Models\Account'); + // make withdrawal $depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType'); $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $deposit->transaction_type_id = $depositType->id; $deposit->save(); - // make accounts - FactoryMuffin::create('FireflyIII\Models\Account'); - $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); - $asset = FactoryMuffin::create('FireflyIII\Models\Account'); + $deposit->transactions[0]->account_id = $asset->id; + $deposit->transactions[0]->amount = 300; + $deposit->transactions[0]->save(); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); + $deposit->transactions[1]->account_id = $revenue->id; + $deposit->transactions[1]->amount = -300; + $deposit->transactions[1]->save(); // get asset account: $result = $deposit->asset_account; @@ -265,18 +297,25 @@ class TransactionJournalModelTest extends TestCase */ public function testGetAssetAccountAttributeWithdrawal() { + // make accounts + $expense = FactoryMuffin::create('FireflyIII\Models\Account'); + $asset = FactoryMuffin::create('FireflyIII\Models\Account'); + // make withdrawal $withdrawalType = FactoryMuffin::create('FireflyIII\Models\TransactionType'); $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $withdrawal->transaction_type_id = $withdrawalType->id; $withdrawal->save(); - // make accounts - $expense = FactoryMuffin::create('FireflyIII\Models\Account'); - $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => -300]); - Transaction::create(['account_id' => $expense->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => 300]); + + $withdrawal->transactions[0]->account_id = $asset->id; + $withdrawal->transactions[0]->amount = -300; + $withdrawal->transactions[0]->save(); + + $withdrawal->transactions[1]->account_id = $expense->id; + $withdrawal->transactions[1]->amount = 300; + $withdrawal->transactions[1]->save(); // get asset account: $result = $withdrawal->asset_account; @@ -284,58 +323,6 @@ class TransactionJournalModelTest extends TestCase $this->assertEquals($asset->id, $result->id); } - /** - * @covers FireflyIII\Models\TransactionJournal::getCorrectedActualAmountAttribute - */ - public function testGetCorrectedActualAmountAttributeDeposit() - { - - FactoryMuffin::create('FireflyIII\Models\TransactionType'); - $depositType = FactoryMuffin::create('FireflyIII\Models\TransactionType'); - $deposit = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); - $deposit->transaction_type_id = $depositType->id; - $deposit->save(); - - // make accounts - FactoryMuffin::create('FireflyIII\Models\Account'); - $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); - $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => 300]); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); - - // get asset account: - $result = $deposit->corrected_actual_amount; - - $this->assertEquals('300', $result); - } - - /** - * @covers FireflyIII\Models\TransactionJournal::getCorrectedActualAmountAttribute - */ - public function testGetCorrectedActualAmountAttributeWithdrawal() - { - - // make withdrawal - $withdrawalType = FactoryMuffin::create('FireflyIII\Models\TransactionType'); - $withdrawal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); - $withdrawal->transaction_type_id = $withdrawalType->id; - $withdrawal->save(); - - // make accounts - $expense = FactoryMuffin::create('FireflyIII\Models\Account'); - FactoryMuffin::create('FireflyIII\Models\Account'); - $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - - Transaction::create(['account_id' => $expense->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => 300]); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $withdrawal->id, 'amount' => -300]); - - // get asset account: - $result = $withdrawal->corrected_actual_amount; - - $this->assertEquals('-300', $result); - } - /** * @covers FireflyIII\Models\TransactionJournal::getDestinationAccountAttribute */ @@ -352,8 +339,13 @@ class TransactionJournalModelTest extends TestCase $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => 300]); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); + $deposit->transactions[0]->account_id = $asset->id; + $deposit->transactions[0]->amount = 300; + $deposit->transactions[0]->save(); + + $deposit->transactions[1]->account_id = $revenue->id; + $deposit->transactions[1]->amount = -300; + $deposit->transactions[1]->save(); // get asset account: $result = $deposit->destination_account; @@ -377,8 +369,13 @@ class TransactionJournalModelTest extends TestCase $revenue = FactoryMuffin::create('FireflyIII\Models\Account'); $asset = FactoryMuffin::create('FireflyIII\Models\Account'); - Transaction::create(['account_id' => $asset->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); - Transaction::create(['account_id' => $revenue->id, 'transaction_journal_id' => $deposit->id, 'amount' => -300]); + $deposit->transactions[0]->account_id = $asset->id; + $deposit->transactions[0]->amount = -300; + $deposit->transactions[0]->save(); + + $deposit->transactions[1]->account_id = $revenue->id; + $deposit->transactions[1]->amount = -300; + $deposit->transactions[1]->save(); // get asset account: $result = $deposit->destination_account; diff --git a/tests/repositories/AccountRepositoryTest.php b/tests/repositories/AccountRepositoryTest.php index 59b1b53973..d96994e8b0 100644 --- a/tests/repositories/AccountRepositoryTest.php +++ b/tests/repositories/AccountRepositoryTest.php @@ -2,8 +2,6 @@ use Carbon\Carbon; use FireflyIII\Models\Account; use FireflyIII\Models\AccountMeta; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\Preference; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepository; @@ -117,30 +115,18 @@ class AccountRepositoryTest extends TestCase { $account = FactoryMuffin::create('FireflyIII\Models\Account'); $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); + $first = $journal->transactions()->orderBy('date', 'DESC')->first(); + $first->account_id = $account->id; + $first->save(); - // two matching transactions: - $first = Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100, - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => -100, - ] - ); // login $this->be($account->user); $oldest = $this->object->getFirstTransaction($journal, $account); - $this->assertEquals($oldest->amount, $first->amount); - $this->assertEquals($oldest->id, $first->id); + $this->assertEquals($first->amount, $oldest->amount); + $this->assertEquals($first->id, $oldest->id); } @@ -215,28 +201,12 @@ class AccountRepositoryTest extends TestCase $journal2->save(); $journal3->save(); - // transactions to match the dates (one per journal will do) - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal1->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal2->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal3->id, - 'amount' => 100 - ] - ); + $journal1->transactions[0]->account_id = $account->id; + $journal1->transactions[0]->save(); + $journal2->transactions[0]->account_id = $account->id; + $journal2->transactions[0]->save(); + $journal3->transactions[0]->account_id = $account->id; + $journal3->transactions[0]->save(); // be user $this->be($journal1->user); @@ -277,28 +247,12 @@ class AccountRepositoryTest extends TestCase $journal2->save(); $journal3->save(); - // transactions to match the dates (one per journal will do) - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal1->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal2->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal3->id, - 'amount' => 100 - ] - ); + $journal1->transactions[0]->account_id = $account->id; + $journal1->transactions[0]->save(); + $journal2->transactions[0]->account_id = $account->id; + $journal2->transactions[0]->save(); + $journal3->transactions[0]->account_id = $account->id; + $journal3->transactions[0]->save(); // be user $this->be($journal1->user); @@ -329,14 +283,8 @@ class AccountRepositoryTest extends TestCase $journal->user_id = $account->user_id; $journal->save(); - // transaction to match the date (one will do) - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => 100 - ] - ); + $journal->transactions[0]->account_id = $account->id; + $journal->transactions[0]->save(); // be user $this->be($journal->user); @@ -478,28 +426,25 @@ class AccountRepositoryTest extends TestCase $journal2->transaction_type_id = $journal1->transaction_type_id; $journal3->transaction_type_id = $journal1->transaction_type_id; - // three transactions: - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal1->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal2->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal3->id, - 'amount' => 100 - ] - ); + // transactions are already present, update them! + $journal1->transactions[0]->account_id = $account->id; + $journal1->transactions[0]->amount = 100; + $journal1->transactions[1]->account_id = $account->id; + $journal1->transactions[1]->amount = 100; + $journal2->transactions[0]->account_id = $account->id; + $journal2->transactions[0]->amount = 100; + $journal2->transactions[1]->account_id = $account->id; + $journal2->transactions[1]->amount = 100; + $journal3->transactions[0]->account_id = $account->id; + $journal3->transactions[0]->amount = 100; + $journal3->transactions[1]->account_id = $account->id; + $journal3->transactions[1]->amount = 100; + $journal1->transactions[0]->save(); + $journal1->transactions[1]->save(); + $journal2->transactions[0]->save(); + $journal2->transactions[1]->save(); + $journal3->transactions[0]->save(); + $journal3->transactions[1]->save(); // check date: $start = new Carbon('2014-01-01'); @@ -557,21 +502,6 @@ class AccountRepositoryTest extends TestCase $account = FactoryMuffin::create('FireflyIII\Models\Account'); $journal1 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); - // two transactions: - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal1->id, - 'amount' => 100 - ] - ); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal2->id, - 'amount' => 100 - ] - ); // dates $one = new Carbon('2013-01-15'); @@ -582,6 +512,18 @@ class AccountRepositoryTest extends TestCase $journal1->user_id = $account->user_id; $journal2->date = $two; $journal2->user_id = $account->user_id; + + // add account things: + $journal1->transactions[0]->account_id = $account->id; + $journal1->transactions[1]->account_id = $account->id; + $journal2->transactions[0]->account_id = $account->id; + $journal2->transactions[1]->account_id = $account->id; + $journal1->transactions[0]->save(); + $journal1->transactions[1]->save(); + $journal2->transactions[0]->save(); + $journal2->transactions[1]->save(); + + $journal1->save(); $journal2->save(); diff --git a/tests/repositories/BillRepositoryTest.php b/tests/repositories/BillRepositoryTest.php index 5c2c1df2de..5c1de9fe92 100644 --- a/tests/repositories/BillRepositoryTest.php +++ b/tests/repositories/BillRepositoryTest.php @@ -176,13 +176,8 @@ class BillRepositoryTest extends TestCase $journal = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); $journal->user_id = $bill1->user_id; $journal->save(); - Transaction::create( - [ - 'account_id' => $account->id, - 'transaction_journal_id' => $journal->id, - 'amount' => rand(101, 999), - ] - ); + $journal->transactions[0]->account_id = $account->id; + $journal->transactions[0]->save(); } $this->be($bill1->user); diff --git a/tests/repositories/CategoryRepositoryTest.php b/tests/repositories/CategoryRepositoryTest.php index 2ade3fae1e..9ea3727bc4 100644 --- a/tests/repositories/CategoryRepositoryTest.php +++ b/tests/repositories/CategoryRepositoryTest.php @@ -129,7 +129,8 @@ class CategoryRepositoryTest extends TestCase $this->assertCount(10, $set); reset($set); - $this->assertEquals(0, current($set)['sum']); + // every journal has amount 100. + $this->assertEquals(100, current($set)['sum']); } /** diff --git a/tests/repositories/TagRepositoryTest.php b/tests/repositories/TagRepositoryTest.php index 9dcb52145d..3a8962dc29 100644 --- a/tests/repositories/TagRepositoryTest.php +++ b/tests/repositories/TagRepositoryTest.php @@ -180,9 +180,14 @@ class TagRepositoryTest extends TestCase $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); // transactions for both: - Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => $journal1->id, 'amount' => 100]); - Transaction::create(['account_id' => $account->id, 'transaction_journal_id' => $journal2->id, 'amount' => 100]); - + $journal1->transactions[0]->account_id = $account->id; + $journal2->transactions[0]->account_id = $account->id; + $journal1->transactions[1]->account_id = $account->id; + $journal2->transactions[1]->account_id = $account->id; + $journal1->transactions[0]->save(); + $journal2->transactions[0]->save(); + $journal1->transactions[1]->save(); + $journal2->transactions[1]->save(); $tag = FactoryMuffin::create('FireflyIII\Models\Tag'); @@ -228,8 +233,14 @@ class TagRepositoryTest extends TestCase $journal2 = FactoryMuffin::create('FireflyIII\Models\TransactionJournal'); // transactions for both: - Transaction::create(['account_id' => $account1->id, 'transaction_journal_id' => $journal1->id, 'amount' => 100]); - Transaction::create(['account_id' => $account2->id, 'transaction_journal_id' => $journal2->id, 'amount' => 100]); + $journal1->transactions[0]->account_id = $account1->id; + $journal2->transactions[0]->account_id = $account2->id; + $journal1->transactions[1]->account_id = $account1->id; + $journal2->transactions[1]->account_id = $account2->id; + $journal1->transactions[0]->save(); + $journal2->transactions[0]->save(); + $journal1->transactions[1]->save(); + $journal2->transactions[1]->save(); $tag = FactoryMuffin::create('FireflyIII\Models\Tag'); From 2738ac5a5ce8f44af7647f39d3860f74a9eb2105 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 19:48:49 +0200 Subject: [PATCH 07/29] Did some cleanup [skip ci] --- app/Http/breadcrumbs.php | 2 +- app/Models/TransactionJournal.php | 2 -- app/Repositories/Tag/TagRepository.php | 3 --- app/Support/Twig/Budget.php | 1 + app/Support/Twig/Journal.php | 5 ----- app/Validation/FireflyValidator.php | 1 + 6 files changed, 3 insertions(+), 11 deletions(-) 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. } From 571cac6644ef989c5d99e9a63f1816ce70a28d62 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Tue, 26 May 2015 17:50:09 +0000 Subject: [PATCH 08/29] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- .../Events/UpdateJournalConnection.php | 2 +- app/Helpers/Collection/Bill.php | 2 +- app/Helpers/Collection/Category.php | 2 +- app/Helpers/Collection/Expense.php | 2 +- app/Helpers/Collection/Income.php | 4 +- app/Helpers/Report/ReportHelper.php | 2 +- app/Helpers/Report/ReportQuery.php | 94 ++++++++-------- app/Http/Controllers/AccountController.php | 13 ++- app/Http/Controllers/Auth/AuthController.php | 4 +- app/Http/Controllers/BillController.php | 16 ++- app/Http/Controllers/BudgetController.php | 17 ++- app/Http/Controllers/CurrencyController.php | 2 - app/Http/Controllers/PiggyBankController.php | 1 - .../Controllers/TransactionController.php | 1 - app/Http/Middleware/Cleanup.php | 1 - app/Http/breadcrumbs.php | 102 +++++++++--------- 16 files changed, 128 insertions(+), 137 deletions(-) diff --git a/app/Handlers/Events/UpdateJournalConnection.php b/app/Handlers/Events/UpdateJournalConnection.php index 7d2dbe1dda..2708e463a2 100644 --- a/app/Handlers/Events/UpdateJournalConnection.php +++ b/app/Handlers/Events/UpdateJournalConnection.php @@ -50,7 +50,7 @@ class UpdateJournalConnection return; } $amount = $journal->amount; - $diff = $amount - $event->amount;// update current repetition + $diff = $amount - $event->amount; // update current repetition $repetition->currentamount += $diff; $repetition->save(); diff --git a/app/Helpers/Collection/Bill.php b/app/Helpers/Collection/Bill.php index 34b3205c6b..de5b86fc97 100644 --- a/app/Helpers/Collection/Bill.php +++ b/app/Helpers/Collection/Bill.php @@ -41,7 +41,7 @@ class Bill public function getBills() { $this->bills->sortBy( - function (BillLine $bill) { + function(BillLine $bill) { $active = intval($bill->getBill()->active) == 0 ? 1 : 0; $name = $bill->getBill()->name; diff --git a/app/Helpers/Collection/Category.php b/app/Helpers/Collection/Category.php index 84f426487a..71af3c2607 100644 --- a/app/Helpers/Collection/Category.php +++ b/app/Helpers/Collection/Category.php @@ -55,7 +55,7 @@ class Category public function getCategories() { $this->categories->sortByDesc( - function (CategoryModel $category) { + function(CategoryModel $category) { return $category->spent; } ); diff --git a/app/Helpers/Collection/Expense.php b/app/Helpers/Collection/Expense.php index a66c1ef86d..f328bfd42a 100644 --- a/app/Helpers/Collection/Expense.php +++ b/app/Helpers/Collection/Expense.php @@ -67,7 +67,7 @@ class Expense public function getExpenses() { $this->expenses->sortByDesc( - function (stdClass $object) { + function(stdClass $object) { return $object->amount; } ); diff --git a/app/Helpers/Collection/Income.php b/app/Helpers/Collection/Income.php index 638e42d06a..4f40a7aa3b 100644 --- a/app/Helpers/Collection/Income.php +++ b/app/Helpers/Collection/Income.php @@ -68,7 +68,7 @@ class Income public function getIncomes() { $this->incomes->sortByDesc( - function (stdClass $object) { + function(stdClass $object) { return $object->amount; } ); @@ -77,7 +77,7 @@ class Income } /** - * @return float + * @return string */ public function getTotal() { diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index d8134a6110..a1e337531a 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -66,7 +66,7 @@ class ReportHelper implements ReportHelperInterface // remove cash account, if any: $accounts = $accounts->filter( - function (Account $account) { + function(Account $account) { if ($account->accountType->type != 'Cash account') { return $account; } diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index ad1a6d575a..10fb20215e 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -35,15 +35,15 @@ class ReportQuery implements ReportQueryInterface $query = $this->queryJournalsWithTransactions($start, $end); if ($includeShared === false) { $query->where( - function (Builder $query) { + function(Builder $query) { $query->where( - function (Builder $q) { // only get withdrawals not from a shared account + function(Builder $q) { // only get withdrawals not from a shared account $q->where('transaction_types.type', 'Withdrawal'); $q->where('acm_from.data', '!=', '"sharedAsset"'); } ); $query->orWhere( - function (Builder $q) { // and transfers from a shared account. + function(Builder $q) { // and transfers from a shared account. $q->where('transaction_types.type', 'Transfer'); $q->where('acm_to.data', '=', '"sharedAsset"'); } @@ -61,14 +61,14 @@ class ReportQuery implements ReportQueryInterface ); $data->each( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { if (intval($journal->account_encrypted) == 1) { $journal->name = Crypt::decrypt($journal->name); } } ); $data = $data->filter( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { if ($journal->amount != 0) { return $journal; } @@ -91,26 +91,26 @@ class ReportQuery implements ReportQueryInterface public function getAllAccounts(Carbon $start, Carbon $end, $includeShared = false) { $query = Auth::user()->accounts()->orderBy('accounts.name', 'ASC') - ->accountTypeIn(['Default account', 'Asset account', 'Cash account']); + ->accountTypeIn(['Default account', 'Asset account', 'Cash account']); if ($includeShared === false) { $query->leftJoin( 'account_meta', function (JoinClause $join) { $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); } ) - ->orderBy('accounts.name', 'ASC') - ->where( - function (Builder $query) { + ->orderBy('accounts.name', 'ASC') + ->where( + function (Builder $query) { - $query->where('account_meta.data', '!=', '"sharedAsset"'); - $query->orWhereNull('account_meta.data'); + $query->where('account_meta.data', '!=', '"sharedAsset"'); + $query->orWhereNull('account_meta.data'); - } - ); + } + ); } $set = $query->get(['accounts.*']); $set->each( - function (Account $account) use ($start, $end) { + function(Account $account) use ($start, $end) { /** * The balance for today always incorporates transactions * made on today. So to get todays "start" balance, we sub one @@ -151,15 +151,15 @@ class ReportQuery implements ReportQueryInterface // only get deposits not to a shared account // and transfers to a shared account. $query->where( - function (Builder $query) { + function(Builder $query) { $query->where( - function (Builder $q) { + function(Builder $q) { $q->where('transaction_types.type', 'Deposit'); $q->where('acm_to.data', '!=', '"sharedAsset"'); } ); $query->orWhere( - function (Builder $q) { + function(Builder $q) { $q->where('transaction_types.type', 'Transfer'); $q->where('acm_from.data', '=', '"sharedAsset"'); } @@ -178,14 +178,14 @@ class ReportQuery implements ReportQueryInterface ); $data->each( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { if (intval($journal->account_encrypted) == 1) { $journal->name = Crypt::decrypt($journal->name); } } ); $data = $data->filter( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { if ($journal->amount != 0) { return $journal; } @@ -210,16 +210,16 @@ class ReportQuery implements ReportQueryInterface { return floatval( - Auth::user()->transactionjournals() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->transactionTypes(['Withdrawal']) - ->where('transactions.account_id', $account->id) - ->before($end) - ->after($start) - ->where('budget_transaction_journal.budget_id', $budget->id) - ->get(['transaction_journals.*'])->sum('amount') - ) * -1; + Auth::user()->transactionjournals() + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->transactionTypes(['Withdrawal']) + ->where('transactions.account_id', $account->id) + ->before($end) + ->after($start) + ->where('budget_transaction_journal.budget_id', $budget->id) + ->get(['transaction_journals.*'])->sum('amount') + ) * -1; } /** @@ -258,24 +258,24 @@ class ReportQuery implements ReportQueryInterface $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0); } ) - ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') - ->leftJoin( - 'account_meta as acm_from', function (JoinClause $join) { - $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); - } - ) - ->leftJoin( - 'transactions as t_to', function (JoinClause $join) { - $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); - } - ) - ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') - ->leftJoin( - 'account_meta as acm_to', function (JoinClause $join) { - $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); - } - ) - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); + ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') + ->leftJoin( + 'account_meta as acm_from', function (JoinClause $join) { + $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); + } + ) + ->leftJoin( + 'transactions as t_to', function (JoinClause $join) { + $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); + } + ) + ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') + ->leftJoin( + 'account_meta as acm_to', function (JoinClause $join) { + $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); + } + ) + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id'); $query->before($end)->after($start)->where('transaction_journals.user_id', Auth::user()->id); return $query; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index a95ec4799d..485199a90f 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -3,7 +3,6 @@ use Auth; use Carbon\Carbon; use Config; -use FireflyIII\Http\Requests; use FireflyIII\Http\Requests\AccountFormRequest; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -95,7 +94,7 @@ class AccountController extends Controller * @param AccountRepositoryInterface $repository * @param Account $account * - * @return View + * @return \Illuminate\View\View */ public function edit(AccountRepositoryInterface $repository, Account $account) { @@ -140,7 +139,7 @@ class AccountController extends Controller * @param AccountRepositoryInterface $repository * @param $what * - * @return View + * @return \Illuminate\View\View */ public function index(AccountRepositoryInterface $repository, $what) { @@ -155,7 +154,7 @@ class AccountController extends Controller $start = clone Session::get('start', Carbon::now()->startOfMonth()); $start->subDay(); $accounts->each( - function (Account $account) use ($start, $repository) { + function(Account $account) use ($start, $repository) { $account->lastActivityDate = $repository->getLastActivity($account); $account->startBalance = Steam::balance($account, $start); $account->endBalance = Steam::balance($account, clone Session::get('end', Carbon::now()->endOfMonth())); @@ -169,7 +168,7 @@ class AccountController extends Controller * @param AccountRepositoryInterface $repository * @param Account $account * - * @return View + * @return \Illuminate\View\View */ public function show(AccountRepositoryInterface $repository, Account $account) { @@ -204,7 +203,7 @@ class AccountController extends Controller 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), ]; - $account = $repository->store($accountData); + $account = $repository->store($accountData); Session::flash('success', 'New account "' . $account->name . '" stored!'); @@ -226,7 +225,7 @@ class AccountController extends Controller * @param AccountRepositoryInterface $repository * @param Account $account * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function update(AccountFormRequest $request, AccountRepositoryInterface $repository, Account $account) { diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 80301480e1..147ca6040a 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -67,7 +67,7 @@ class AuthController extends Controller * * @param Request $request * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function postRegister(Request $request) { @@ -91,7 +91,7 @@ class AuthController extends Controller // send email. Mail::send( - 'emails.registered', [], function (Message $message) use ($email) { + 'emails.registered', [], function(Message $message) use ($email) { $message->to($email, $email)->subject('Welcome to Firefly III!'); } ); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index fee773abb4..a9da4f449b 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -1,10 +1,8 @@ getBills(); $bills->each( - function (Bill $bill) use ($repository) { + function(Bill $bill) use ($repository) { $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill); $bill->lastFoundMatch = $repository->lastFoundMatch($bill); } @@ -151,7 +149,7 @@ class BillController extends Controller * @param BillRepositoryInterface $repository * @param Bill $bill * - * @return mixed + * @return \Illuminate\View\View */ public function show(BillRepositoryInterface $repository, Bill $bill) { @@ -167,7 +165,7 @@ class BillController extends Controller * @param BillFormRequest $request * @param BillRepositoryInterface $repository * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function store(BillFormRequest $request, BillRepositoryInterface $repository) { @@ -192,7 +190,7 @@ class BillController extends Controller * @param BillRepositoryInterface $repository * @param Bill $bill * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill) { diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index b583e62c71..ff52bbc5d2 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -3,7 +3,6 @@ use Amount; use Auth; use Carbon\Carbon; -use FireflyIII\Http\Requests; use FireflyIII\Http\Requests\BudgetFormRequest; use FireflyIII\Models\Budget; use FireflyIII\Models\LimitRepetition; @@ -56,7 +55,7 @@ class BudgetController extends Controller } /** - * @return $this + * @return \Illuminate\View\View */ public function create() { @@ -111,7 +110,7 @@ class BudgetController extends Controller /** * @param Budget $budget * - * @return $this + * @return \Illuminate\View\View */ public function edit(Budget $budget) { @@ -132,7 +131,7 @@ class BudgetController extends Controller /** * @param BudgetRepositoryInterface $repository * - * @return View + * @return \Illuminate\View\View */ public function index(BudgetRepositoryInterface $repository) { @@ -174,7 +173,7 @@ class BudgetController extends Controller /** * @param BudgetRepositoryInterface $repository * - * @return View + * @return \Illuminate\View\View */ public function noBudget(BudgetRepositoryInterface $repository) { @@ -206,7 +205,7 @@ class BudgetController extends Controller * @param Budget $budget * @param LimitRepetition $repetition * - * @return View + * @return \Illuminate\View\View */ public function show(BudgetRepositoryInterface $repository, Budget $budget, LimitRepetition $repetition = null) { @@ -240,7 +239,7 @@ class BudgetController extends Controller 'name' => $request->input('name'), 'user' => Auth::user()->id, ]; - $budget = $repository->store($budgetData); + $budget = $repository->store($budgetData); Session::flash('success', 'New budget "' . $budget->name . '" stored!'); @@ -261,7 +260,7 @@ class BudgetController extends Controller * @param BudgetRepositoryInterface $repository * @param Budget $budget * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function update(BudgetFormRequest $request, BudgetRepositoryInterface $repository, Budget $budget) { @@ -287,7 +286,7 @@ class BudgetController extends Controller } /** - * @return View + * @return \Illuminate\View\View */ public function updateIncome() { diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 0e93e5ba35..aa07a9c902 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -1,9 +1,7 @@ push(trans('breadcrumbs.home'), route('index')); } @@ -25,7 +25,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'index', - function (Generator $breadcrumbs) { + function(Generator $breadcrumbs) { $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); } @@ -34,21 +34,21 @@ Breadcrumbs::register( // accounts Breadcrumbs::register( - 'accounts.index', function (Generator $breadcrumbs, $what) { + 'accounts.index', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', $what)); } ); Breadcrumbs::register( - 'accounts.create', function (Generator $breadcrumbs, $what) { + 'accounts.create', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('accounts.index', $what); $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', $what)); } ); Breadcrumbs::register( - 'accounts.show', function (Generator $breadcrumbs, Account $account) { + 'accounts.show', function(Generator $breadcrumbs, Account $account) { $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); @@ -58,7 +58,7 @@ Breadcrumbs::register( } ); Breadcrumbs::register( - 'accounts.delete', function (Generator $breadcrumbs, Account $account) { + 'accounts.delete', function(Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', $account->id)); } @@ -66,7 +66,7 @@ Breadcrumbs::register( Breadcrumbs::register( - 'accounts.edit', function (Generator $breadcrumbs, Account $account) { + 'accounts.edit', function(Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); @@ -76,40 +76,40 @@ Breadcrumbs::register( // budgets. Breadcrumbs::register( - 'budgets.index', function (Generator $breadcrumbs) { + 'budgets.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.budgets'), route('budgets.index')); } ); Breadcrumbs::register( - 'budgets.create', function (Generator $breadcrumbs) { + 'budgets.create', function(Generator $breadcrumbs) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(trans('breadcrumbs.newBudget'), route('budgets.create')); } ); Breadcrumbs::register( - 'budgets.edit', function (Generator $breadcrumbs, Budget $budget) { + 'budgets.edit', function(Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', $budget->id)); } ); Breadcrumbs::register( - 'budgets.delete', function (Generator $breadcrumbs, Budget $budget) { + 'budgets.delete', function(Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', $budget->id)); } ); Breadcrumbs::register( - 'budgets.noBudget', function (Generator $breadcrumbs, $subTitle) { + 'budgets.noBudget', function(Generator $breadcrumbs, $subTitle) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push($subTitle, route('budgets.noBudget')); } ); Breadcrumbs::register( - 'budgets.show', function (Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) { + 'budgets.show', function(Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) { $breadcrumbs->parent('budgets.index'); $breadcrumbs->push(e($budget->name), route('budgets.show', $budget->id)); if (!is_null($repetition) && !is_null($repetition->id)) { @@ -122,33 +122,33 @@ Breadcrumbs::register( // categories Breadcrumbs::register( - 'categories.index', function (Generator $breadcrumbs) { + 'categories.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.categories'), route('categories.index')); } ); Breadcrumbs::register( - 'categories.create', function (Generator $breadcrumbs) { + 'categories.create', function(Generator $breadcrumbs) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(trans('breadcrumbs.newCategory'), route('categories.create')); } ); Breadcrumbs::register( - 'categories.edit', function (Generator $breadcrumbs, Category $category) { + 'categories.edit', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', $category->id)); } ); Breadcrumbs::register( - 'categories.delete', function (Generator $breadcrumbs, Category $category) { + 'categories.delete', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', $category->id)); } ); Breadcrumbs::register( - 'categories.show', function (Generator $breadcrumbs, Category $category) { + 'categories.show', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push(e($category->name), route('categories.show', $category->id)); @@ -156,7 +156,7 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'categories.noCategory', function (Generator $breadcrumbs, $subTitle) { + 'categories.noCategory', function(Generator $breadcrumbs, $subTitle) { $breadcrumbs->parent('categories.index'); $breadcrumbs->push($subTitle, route('categories.noCategory')); } @@ -164,20 +164,20 @@ Breadcrumbs::register( // currencies. Breadcrumbs::register( - 'currency.index', function (Generator $breadcrumbs) { + 'currency.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.currencies'), route('currency.index')); } ); Breadcrumbs::register( - 'currency.edit', function (Generator $breadcrumbs, TransactionCurrency $currency) { + 'currency.edit', function(Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', $currency->id)); } ); Breadcrumbs::register( - 'currency.delete', function (Generator $breadcrumbs, TransactionCurrency $currency) { + 'currency.delete', function(Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', $currency->id)); } @@ -186,33 +186,33 @@ Breadcrumbs::register( // piggy banks Breadcrumbs::register( - 'piggy-banks.index', function (Generator $breadcrumbs) { + 'piggy-banks.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.piggyBanks'), route('piggy-banks.index')); } ); Breadcrumbs::register( - 'piggy-banks.create', function (Generator $breadcrumbs) { + 'piggy-banks.create', function(Generator $breadcrumbs) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create')); } ); Breadcrumbs::register( - 'piggy-banks.edit', function (Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.edit', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', $piggyBank->id)); } ); Breadcrumbs::register( - 'piggy-banks.delete', function (Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.delete', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', $piggyBank->id)); } ); Breadcrumbs::register( - 'piggy-banks.show', function (Generator $breadcrumbs, PiggyBank $piggyBank) { + 'piggy-banks.show', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', $piggyBank->id)); @@ -221,7 +221,7 @@ Breadcrumbs::register( // preferences Breadcrumbs::register( - 'preferences', function (Generator $breadcrumbs) { + 'preferences', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences')); @@ -230,14 +230,14 @@ Breadcrumbs::register( // profile Breadcrumbs::register( - 'profile', function (Generator $breadcrumbs) { + 'profile', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile')); } ); Breadcrumbs::register( - 'change-password', function (Generator $breadcrumbs) { + 'change-password', function(Generator $breadcrumbs) { $breadcrumbs->parent('profile'); $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('change-password')); @@ -246,33 +246,33 @@ Breadcrumbs::register( // bills Breadcrumbs::register( - 'bills.index', function (Generator $breadcrumbs) { + 'bills.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index')); } ); Breadcrumbs::register( - 'bills.create', function (Generator $breadcrumbs) { + 'bills.create', function(Generator $breadcrumbs) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create')); } ); Breadcrumbs::register( - 'bills.edit', function (Generator $breadcrumbs, Bill $bill) { + 'bills.edit', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', $bill->id)); } ); Breadcrumbs::register( - 'bills.delete', function (Generator $breadcrumbs, Bill $bill) { + 'bills.delete', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', $bill->id)); } ); Breadcrumbs::register( - 'bills.show', function (Generator $breadcrumbs, Bill $bill) { + 'bills.show', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.index'); $breadcrumbs->push(e($bill->name), route('bills.show', $bill->id)); @@ -281,7 +281,7 @@ Breadcrumbs::register( // reminders Breadcrumbs::register( - 'reminders.index', function (Generator $breadcrumbs) { + 'reminders.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.reminders'), route('reminders.index')); @@ -290,7 +290,7 @@ Breadcrumbs::register( // reminders Breadcrumbs::register( - 'reminders.show', function (Generator $breadcrumbs, Reminder $reminder) { + 'reminders.show', function(Generator $breadcrumbs, Reminder $reminder) { $breadcrumbs->parent('reminders.index'); $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($reminder->id)]), route('reminders.show', $reminder->id)); @@ -300,14 +300,14 @@ Breadcrumbs::register( // reports Breadcrumbs::register( - 'reports.index', function (Generator $breadcrumbs) { + 'reports.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index')); } ); Breadcrumbs::register( - 'reports.year', function (Generator $breadcrumbs, Carbon $date, $shared) { + 'reports.year', function(Generator $breadcrumbs, Carbon $date, $shared) { $breadcrumbs->parent('reports.index'); if ($shared) { $title = trans('breadcrumbs.yearly_report_shared', ['date' => $date->year]); @@ -319,7 +319,7 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'reports.month', function (Generator $breadcrumbs, Carbon $date, $shared) { + 'reports.month', function(Generator $breadcrumbs, Carbon $date, $shared) { $breadcrumbs->parent('reports.year', $date, $shared); if ($shared) { @@ -334,7 +334,7 @@ Breadcrumbs::register( // search Breadcrumbs::register( - 'search', function (Generator $breadcrumbs, $query) { + 'search', function(Generator $breadcrumbs, $query) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.searchResult', ['query' => e($query)]), route('search')); } @@ -342,33 +342,33 @@ Breadcrumbs::register( // transactions Breadcrumbs::register( - 'transactions.index', function (Generator $breadcrumbs, $what) { + 'transactions.index', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', $what)); } ); Breadcrumbs::register( - 'transactions.create', function (Generator $breadcrumbs, $what) { + 'transactions.create', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('transactions.index', $what); $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', $what)); } ); Breadcrumbs::register( - 'transactions.edit', function (Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.edit', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', $journal->id)); } ); Breadcrumbs::register( - 'transactions.delete', function (Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.delete', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', $journal->id)); } ); Breadcrumbs::register( - 'transactions.show', function (Generator $breadcrumbs, TransactionJournal $journal) { + 'transactions.show', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type)); $breadcrumbs->push($journal->description, route('transactions.show', $journal->id)); @@ -378,28 +378,28 @@ Breadcrumbs::register( // tags Breadcrumbs::register( - 'tags.index', function (Generator $breadcrumbs) { + 'tags.index', function(Generator $breadcrumbs) { $breadcrumbs->parent('home'); $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index')); } ); Breadcrumbs::register( - 'tags.create', function (Generator $breadcrumbs) { + 'tags.create', function(Generator $breadcrumbs) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create')); } ); Breadcrumbs::register( - 'tags.edit', function (Generator $breadcrumbs, Tag $tag) { + 'tags.edit', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', $tag->id)); } ); Breadcrumbs::register( - 'tags.delete', function (Generator $breadcrumbs, Tag $tag) { + 'tags.delete', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', $tag->id)); } @@ -407,7 +407,7 @@ Breadcrumbs::register( Breadcrumbs::register( - 'tags.show', function (Generator $breadcrumbs, Tag $tag) { + 'tags.show', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.index'); $breadcrumbs->push(e($tag->tag), route('tags.show', $tag->id)); } From f733216fcb2c6dabac39652a100377ff5ec22252 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 20:18:21 +0200 Subject: [PATCH 09/29] Trigger a build. --- app/Helpers/Collection/Income.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Collection/Income.php b/app/Helpers/Collection/Income.php index 4f40a7aa3b..2b635f8aa4 100644 --- a/app/Helpers/Collection/Income.php +++ b/app/Helpers/Collection/Income.php @@ -18,7 +18,7 @@ class Income /** @var Collection */ protected $incomes; - /** @var float */ + /** @var string */ protected $total; /** From 9ad8b1a980d82a4498ea33dad93fb8c3d9b5b777 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 20:28:18 +0200 Subject: [PATCH 10/29] Some optimisations. --- app/Models/Category.php | 2 +- app/Repositories/Budget/BudgetRepository.php | 2 +- app/Repositories/Budget/BudgetRepositoryInterface.php | 3 ++- app/Repositories/Category/CategoryRepository.php | 2 +- app/Repositories/Category/CategoryRepositoryInterface.php | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Models/Category.php b/app/Models/Category.php index 30b1601f50..a86bc2fc84 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -36,7 +36,7 @@ class Category extends Model * @param array $fields * @SuppressWarnings(PHPMD.CyclomaticComplexity) * - * @return Account|null + * @return Category */ public static function firstOrCreateEncrypted(array $fields) { diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index ddc95d23ca..8a13ce11df 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -146,7 +146,7 @@ class BudgetRepository implements BudgetRepositoryInterface * @param LimitRepetition $repetition * @param int $take * - * @return \Illuminate\Pagination\Paginator + * @return LengthAwarePaginator */ public function getJournals(Budget $budget, LimitRepetition $repetition = null, $take = 50) { diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index b928ed35df..0a035bea35 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -5,6 +5,7 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\LimitRepetition; +use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; /** @@ -89,7 +90,7 @@ interface BudgetRepositoryInterface * @param LimitRepetition $repetition * @param int $take * - * @return \Illuminate\Pagination\Paginator + * @return LengthAwarePaginator */ public function getJournals(Budget $budget, LimitRepetition $repetition = null, $take = 50); diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index a00ec82c5f..1fbb964e42 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -62,7 +62,7 @@ class CategoryRepository implements CategoryRepositoryInterface * @param Carbon $start * @param Carbon $end * - * @return Collection + * @return array */ public function getCategoriesAndExpensesCorrected($start, $end) { diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index 524b2ce443..cfe3f93c50 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -38,7 +38,7 @@ interface CategoryRepositoryInterface * @param Carbon $start * @param Carbon $end * - * @return Collection + * @return array */ public function getCategoriesAndExpensesCorrected($start, $end); From 946be80eefb709304e03d330c967efff7104f415 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 20:37:01 +0200 Subject: [PATCH 11/29] Fix route urls. --- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/BillController.php | 2 +- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/CategoryController.php | 2 +- app/Http/Controllers/CurrencyController.php | 2 +- app/Http/Controllers/PiggyBankController.php | 2 +- app/Http/Controllers/ReminderController.php | 2 +- app/Http/Controllers/TagController.php | 2 +- .../Controllers/TransactionController.php | 4 +- app/Http/breadcrumbs.php | 60 +++++++++---------- app/Support/Twig/Journal.php | 6 +- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 485199a90f..b4a87804d2 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -251,7 +251,7 @@ class AccountController extends Controller // set value so edit routine will not overwrite URL: Session::put('accounts.edit.fromUpdate', true); - return Redirect::route('accounts.edit', $account->id)->withInput(['return_to_edit' => 1]); + return Redirect::route('accounts.edit', [$account->id])->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index a9da4f449b..80bc497336 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -203,7 +203,7 @@ class BillController extends Controller // set value so edit routine will not overwrite URL: Session::put('bills.edit.fromUpdate', true); - return Redirect::route('bills.edit', $bill->id)->withInput(['return_to_edit' => 1]); + return Redirect::route('bills.edit', [$bill->id])->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index ff52bbc5d2..b4d0cca20e 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -277,7 +277,7 @@ class BudgetController extends Controller // set value so edit routine will not overwrite URL: Session::put('budgets.edit.fromUpdate', true); - return Redirect::route('budgets.edit', $budget->id)->withInput(['return_to_edit' => 1]); + return Redirect::route('budgets.edit', [$budget->id])->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 733a714beb..4477dcda9a 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -199,7 +199,7 @@ class CategoryController extends Controller if (intval(Input::get('return_to_edit')) === 1) { Session::put('categories.edit.fromUpdate', true); - return Redirect::route('categories.edit', $category->id); + return Redirect::route('categories.edit', [$category->id]); } // redirect to previous URL. diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index aa07a9c902..521f298185 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -194,7 +194,7 @@ class CurrencyController extends Controller if (intval(Input::get('return_to_edit')) === 1) { Session::put('currency.edit.fromUpdate', true); - return Redirect::route('currency.edit', $currency->id); + return Redirect::route('currency.edit', [$currency->id]); } // redirect to previous URL. diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index a435cdb328..873a5a4bd2 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -366,7 +366,7 @@ class PiggyBankController extends Controller if (intval(Input::get('return_to_edit')) === 1) { Session::put('piggy-banks.edit.fromUpdate', true); - return Redirect::route('piggy-banks.edit', $piggyBank->id); + return Redirect::route('piggy-banks.edit', [$piggyBank->id]); } diff --git a/app/Http/Controllers/ReminderController.php b/app/Http/Controllers/ReminderController.php index 9e80c5acd0..6e72f32ff6 100644 --- a/app/Http/Controllers/ReminderController.php +++ b/app/Http/Controllers/ReminderController.php @@ -31,7 +31,7 @@ class ReminderController extends Controller ]; Session::flash('_old_input', $data); - return Redirect::route('transactions.create', 'transfer'); + return Redirect::route('transactions.create', ['transfer']); } /** diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 8a73839482..f1eee2103f 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -276,7 +276,7 @@ class TagController extends Controller // set value so edit routine will not overwrite URL: Session::put('tags.edit.fromUpdate', true); - return Redirect::route('tags.edit', $tag->id)->withInput(['return_to_edit' => 1]); + return Redirect::route('tags.edit', [$tag->id])->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 38a5cdb2b9..885d9c9f53 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -286,7 +286,7 @@ class TransactionController extends Controller // set value so create routine will not overwrite URL: Session::put('transactions.create.fromStore', true); - return Redirect::route('transactions.create', $request->input('what'))->withInput(); + return Redirect::route('transactions.create', [$request->input('what')])->withInput(); } // redirect to previous URL. @@ -317,7 +317,7 @@ class TransactionController extends Controller // set value so edit routine will not overwrite URL: Session::put('transactions.edit.fromUpdate', true); - return Redirect::route('transactions.edit', $journal->id)->withInput(['return_to_edit' => 1]); + return Redirect::route('transactions.edit', [$journal->id])->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 560b6e44c7..80aa857876 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -36,14 +36,14 @@ Breadcrumbs::register( Breadcrumbs::register( 'accounts.index', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', $what)); + $breadcrumbs->push(trans('breadcrumbs.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); } ); Breadcrumbs::register( 'accounts.create', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', $what)); + $breadcrumbs->push(trans('breadcrumbs.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); } ); @@ -54,13 +54,13 @@ Breadcrumbs::register( $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push(e($account->name), route('accounts.show', $account->id)); + $breadcrumbs->push(e($account->name), route('accounts.show', [$account->id])); } ); Breadcrumbs::register( 'accounts.delete', function(Generator $breadcrumbs, Account $account) { $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', $account->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_account', ['name' => e($account->name)]), route('accounts.delete', [$account->id])); } ); @@ -70,7 +70,7 @@ Breadcrumbs::register( $breadcrumbs->parent('accounts.show', $account); $what = Config::get('firefly.shortNamesByFullName.' . $account->accountType->type); - $breadcrumbs->push(trans('breadcrumbs.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', $account->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_' . $what . '_account', ['name' => e($account->name)]), route('accounts.edit', [$account->id])); } ); @@ -91,13 +91,13 @@ Breadcrumbs::register( Breadcrumbs::register( 'budgets.edit', function(Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', $budget->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_budget', ['name' => e($budget->name)]), route('budgets.edit', [$budget->id])); } ); Breadcrumbs::register( 'budgets.delete', function(Generator $breadcrumbs, Budget $budget) { $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', $budget->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_budget', ['name' => e($budget->name)]), route('budgets.delete', [$budget->id])); } ); @@ -111,10 +111,10 @@ Breadcrumbs::register( Breadcrumbs::register( 'budgets.show', function(Generator $breadcrumbs, Budget $budget, LimitRepetition $repetition = null) { $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push(e($budget->name), route('budgets.show', $budget->id)); + $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]) ); } } @@ -137,20 +137,20 @@ Breadcrumbs::register( Breadcrumbs::register( 'categories.edit', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); - $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', $category->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_category', ['name' => e($category->name)]), route('categories.edit', [$category->id])); } ); Breadcrumbs::register( 'categories.delete', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.show', $category); - $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', $category->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_category', ['name' => e($category->name)]), route('categories.delete', [$category->id])); } ); Breadcrumbs::register( 'categories.show', function(Generator $breadcrumbs, Category $category) { $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(e($category->name), route('categories.show', $category->id)); + $breadcrumbs->push(e($category->name), route('categories.show', [$category->id])); } ); @@ -173,13 +173,13 @@ Breadcrumbs::register( Breadcrumbs::register( 'currency.edit', function(Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); - $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', $currency->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => e($currency->name)]), route('currency.edit', [$currency->id])); } ); Breadcrumbs::register( 'currency.delete', function(Generator $breadcrumbs, TransactionCurrency $currency) { $breadcrumbs->parent('currency.index'); - $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', $currency->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => e($currency->name)]), route('currency.delete', [$currency->id])); } ); @@ -201,20 +201,20 @@ Breadcrumbs::register( Breadcrumbs::register( 'piggy-banks.edit', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', $piggyBank->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.edit', [$piggyBank->id])); } ); Breadcrumbs::register( 'piggy-banks.delete', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', $piggyBank->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_piggyBank', ['name' => e($piggyBank->name)]), route('piggy-banks.delete', [$piggyBank->id])); } ); Breadcrumbs::register( 'piggy-banks.show', function(Generator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.index'); - $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', $piggyBank->id)); + $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id])); } ); @@ -261,20 +261,20 @@ Breadcrumbs::register( Breadcrumbs::register( 'bills.edit', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); - $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', $bill->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => e($bill->name)]), route('bills.edit', [$bill->id])); } ); Breadcrumbs::register( 'bills.delete', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.show', $bill); - $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', $bill->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => e($bill->name)]), route('bills.delete', [$bill->id])); } ); Breadcrumbs::register( 'bills.show', function(Generator $breadcrumbs, Bill $bill) { $breadcrumbs->parent('bills.index'); - $breadcrumbs->push(e($bill->name), route('bills.show', $bill->id)); + $breadcrumbs->push(e($bill->name), route('bills.show', [$bill->id])); } ); @@ -292,7 +292,7 @@ Breadcrumbs::register( Breadcrumbs::register( 'reminders.show', function(Generator $breadcrumbs, Reminder $reminder) { $breadcrumbs->parent('reminders.index'); - $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($reminder->id)]), route('reminders.show', $reminder->id)); + $breadcrumbs->push(trans('breadcrumbs.reminder', ['id' => e($reminder->id)]), route('reminders.show', [$reminder->id])); } ); @@ -314,7 +314,7 @@ Breadcrumbs::register( } else { $title = trans('breadcrumbs.yearly_report', ['date' => $date->year]); } - $breadcrumbs->push($title, route('reports.year', $date->year)); + $breadcrumbs->push($title, route('reports.year', [$date->year])); } ); @@ -344,26 +344,26 @@ Breadcrumbs::register( Breadcrumbs::register( 'transactions.index', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', $what)); + $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); } ); Breadcrumbs::register( 'transactions.create', function(Generator $breadcrumbs, $what) { $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', $what)); + $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); } ); Breadcrumbs::register( 'transactions.edit', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', $journal->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id])); } ); Breadcrumbs::register( 'transactions.delete', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', $journal->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => e($journal->description)]), route('transactions.delete', [$journal->id])); } ); @@ -371,7 +371,7 @@ Breadcrumbs::register( 'transactions.show', function(Generator $breadcrumbs, TransactionJournal $journal) { $breadcrumbs->parent('transactions.index', strtolower($journal->transactionType->type)); - $breadcrumbs->push($journal->description, route('transactions.show', $journal->id)); + $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); } ); @@ -394,14 +394,14 @@ Breadcrumbs::register( Breadcrumbs::register( 'tags.edit', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); - $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', $tag->id)); + $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => e($tag->tag)]), route('tags.edit', [$tag->id])); } ); Breadcrumbs::register( 'tags.delete', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.show', $tag); - $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', $tag->id)); + $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => e($tag->tag)]), route('tags.delete', [$tag->id])); } ); @@ -409,6 +409,6 @@ Breadcrumbs::register( Breadcrumbs::register( 'tags.show', function(Generator $breadcrumbs, Tag $tag) { $breadcrumbs->parent('tags.index'); - $breadcrumbs->push(e($tag->tag), route('tags.show', $tag->id)); + $breadcrumbs->push(e($tag->tag), route('tags.show', [$tag->id])); } ); diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index ea4fb950f1..60b4e34ec2 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -81,7 +81,7 @@ class Journal extends Twig_Extension // tags are present. $amount = App::make('amount')->format($journal->actual_amount, false); - return 'id]) . '" class="label label-success" title="' . $amount . '"> ' . $tag->tag . ''; } @@ -91,7 +91,7 @@ class Journal extends Twig_Extension if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Deposit') { $amount = App::make('amount')->formatJournal($journal, false); - return 'id]) . '" class="label label-success" title="' . $amount . '"> ' . $tag->tag . ''; } /* @@ -101,7 +101,7 @@ class Journal extends Twig_Extension if ($tag->tagMode == 'advancePayment' && $journal->transactionType->type == 'Withdrawal') { $amount = App::make('amount')->formatJournal($journal); - return '' . $amount . ''; + return '' . $amount . ''; } From 14a7cd05b10a6c992aa51a3feca3de0ef6db6f3d Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Tue, 26 May 2015 18:57:31 +0000 Subject: [PATCH 12/29] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- app/Helpers/Report/ReportQuery.php | 12 +-- app/Http/Controllers/CategoryController.php | 14 +-- .../Controllers/Chart/BudgetController.php | 6 +- .../Controllers/Chart/CategoryController.php | 2 +- app/Http/Controllers/HomeController.php | 4 +- app/Http/Controllers/PiggyBankController.php | 10 +- app/Http/Controllers/TagController.php | 6 +- .../Controllers/TransactionController.php | 14 +-- app/Http/Middleware/Reminders.php | 2 +- app/Http/routes.php | 46 ++++----- app/Models/Account.php | 6 +- app/Models/AccountMeta.php | 2 +- app/Models/Bill.php | 2 +- app/Models/Category.php | 2 +- app/Models/PiggyBank.php | 6 +- app/Models/PiggyBankRepetition.php | 12 +-- app/Models/Reminder.php | 4 +- app/Models/Tag.php | 2 +- app/Models/TransactionJournal.php | 10 +- app/Providers/BusServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 12 +-- app/Providers/FireflyServiceProvider.php | 12 +-- app/Providers/RouteServiceProvider.php | 2 +- .../Account/AccountRepository.php | 98 +++++++++---------- app/Repositories/Bill/BillRepository.php | 8 +- app/Repositories/Budget/BudgetRepository.php | 98 +++++++++---------- .../Category/CategoryRepository.php | 54 +++++----- .../Journal/JournalRepository.php | 8 +- .../PiggyBank/PiggyBankRepository.php | 4 +- .../Reminder/ReminderRepository.php | 40 ++++---- app/Repositories/Tag/TagRepository.php | 4 +- app/Services/Registrar.php | 6 +- app/Support/Navigation.php | 4 +- app/Support/Search/Search.php | 12 +-- app/Support/Twig/Budget.php | 16 +-- app/Support/Twig/General.php | 22 ++--- app/Support/Twig/Journal.php | 10 +- app/Support/Twig/PiggyBank.php | 2 +- app/Support/Twig/Translation.php | 2 +- 39 files changed, 289 insertions(+), 289 deletions(-) diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 10fb20215e..5bcf09f9d8 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -94,13 +94,13 @@ class ReportQuery implements ReportQueryInterface ->accountTypeIn(['Default account', 'Asset account', 'Cash account']); if ($includeShared === false) { $query->leftJoin( - 'account_meta', function (JoinClause $join) { + 'account_meta', function(JoinClause $join) { $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); } ) ->orderBy('accounts.name', 'ASC') ->where( - function (Builder $query) { + function(Builder $query) { $query->where('account_meta.data', '!=', '"sharedAsset"'); $query->orWhereNull('account_meta.data'); @@ -254,24 +254,24 @@ class ReportQuery implements ReportQueryInterface { $query = TransactionJournal:: leftJoin( - 'transactions as t_from', function (JoinClause $join) { + 'transactions as t_from', function(JoinClause $join) { $join->on('t_from.transaction_journal_id', '=', 'transaction_journals.id')->where('t_from.amount', '<', 0); } ) ->leftJoin('accounts as ac_from', 't_from.account_id', '=', 'ac_from.id') ->leftJoin( - 'account_meta as acm_from', function (JoinClause $join) { + 'account_meta as acm_from', function(JoinClause $join) { $join->on('ac_from.id', '=', 'acm_from.account_id')->where('acm_from.name', '=', 'accountRole'); } ) ->leftJoin( - 'transactions as t_to', function (JoinClause $join) { + 'transactions as t_to', function(JoinClause $join) { $join->on('t_to.transaction_journal_id', '=', 'transaction_journals.id')->where('t_to.amount', '>', 0); } ) ->leftJoin('accounts as ac_to', 't_to.account_id', '=', 'ac_to.id') ->leftJoin( - 'account_meta as acm_to', function (JoinClause $join) { + 'account_meta as acm_to', function(JoinClause $join) { $join->on('ac_to.id', '=', 'acm_to.account_id')->where('acm_to.name', '=', 'accountRole'); } ) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 4477dcda9a..92f027ab26 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -31,7 +31,7 @@ class CategoryController extends Controller } /** - * @return $this + * @return \Illuminate\View\View */ public function create() { @@ -84,7 +84,7 @@ class CategoryController extends Controller /** * @param Category $category * - * @return $this + * @return \Illuminate\View\View */ public function edit(Category $category) { @@ -105,14 +105,14 @@ class CategoryController extends Controller /** * @param CategoryRepositoryInterface $repository * - * @return $this + * @return \Illuminate\View\View */ public function index(CategoryRepositoryInterface $repository) { $categories = $repository->getCategories(); $categories->each( - function (Category $category) use ($repository) { + function(Category $category) use ($repository) { $category->lastActivity = $repository->getLatestActivity($category); } ); @@ -139,7 +139,7 @@ class CategoryController extends Controller * @param CategoryRepositoryInterface $repository * @param Category $category * - * @return View + * @return \Illuminate\View\View */ public function show(CategoryRepositoryInterface $repository, Category $category) { @@ -157,7 +157,7 @@ class CategoryController extends Controller * @param CategoryFormRequest $request * @param CategoryRepositoryInterface $repository * - * @return mixed + * @return \Illuminate\Http\RedirectResponse */ public function store(CategoryFormRequest $request, CategoryRepositoryInterface $repository) { @@ -165,7 +165,7 @@ class CategoryController extends Controller 'name' => $request->input('name'), 'user' => Auth::user()->id, ]; - $category = $repository->store($categoryData); + $category = $repository->store($categoryData); Session::flash('success', 'New category "' . $category->name . '" stored!'); diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 195b3c4458..445db07672 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -127,9 +127,9 @@ class BudgetController extends Controller $overspent = $expenses > floatval($repetition->amount) ? $expenses - floatval($repetition->amount) : 0; $allEntries->push( [$budget->name . ' (' . $repetition->startdate->formatLocalized($this->monthAndDayFormat) . ')', - $left, - $spent, - $overspent + $left, + $spent, + $overspent ] ); } diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index bf0781e69e..c6f42cad5b 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -80,7 +80,7 @@ class CategoryController extends Controller // sort by callback: uasort( $set, - function ($left, $right) { + function($left, $right) { if ($left['sum'] == $right['sum']) { return 0; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index ffdf6f4afc..3b09b9f96c 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -73,8 +73,8 @@ class HomeController extends Controller if ($sum != 0) { Session::flash( 'error', 'Your transactions are unbalanced. This means a' - . ' withdrawal, deposit or transfer was not stored properly. ' - . 'Please check your accounts and transactions for errors.' + . ' withdrawal, deposit or transfer was not stored properly. ' + . 'Please check your accounts and transactions for errors.' ); } diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 873a5a4bd2..6961b5787b 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -137,11 +137,11 @@ class PiggyBankController extends Controller $targetDate = $targetDate->format('Y-m-d'); } $preFilled = ['name' => $piggyBank->name, - 'account_id' => $piggyBank->account_id, - 'targetamount' => $piggyBank->targetamount, - 'targetdate' => $targetDate, - 'reminder' => $piggyBank->reminder, - 'remind_me' => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false + 'account_id' => $piggyBank->account_id, + 'targetamount' => $piggyBank->targetamount, + 'targetdate' => $targetDate, + 'reminder' => $piggyBank->reminder, + 'remind_me' => intval($piggyBank->remind_me) == 1 && !is_null($piggyBank->reminder) ? true : false ]; Session::flash('preFilled', $preFilled); Session::flash('gaEventCategory', 'piggy-banks'); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index f1eee2103f..251a88ea2e 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -115,7 +115,7 @@ class TagController extends Controller * * @param TagRepositoryInterface $repository * - * @return View + * @return \Illuminate\View\View */ public function edit(Tag $tag, TagRepositoryInterface $repository) { @@ -200,7 +200,7 @@ class TagController extends Controller * * @param TagRepositoryInterface $repository * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function store(TagFormRequest $request, TagRepositoryInterface $repository) { @@ -244,7 +244,7 @@ class TagController extends Controller * @param TagRepositoryInterface $repository * @param Tag $tag * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function update(TagFormRequest $request, TagRepositoryInterface $repository, Tag $tag) { diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 885d9c9f53..2ebef96f41 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -38,7 +38,7 @@ class TransactionController extends Controller * @param AccountRepositoryInterface $repository * @param string $what * - * @return View + * @return \Illuminate\View\View */ public function create(AccountRepositoryInterface $repository, $what = 'deposit') { @@ -75,7 +75,7 @@ class TransactionController extends Controller * * @param TransactionJournal $journal * - * @return $this + * @return \Illuminate\View\View */ public function delete(TransactionJournal $journal) { @@ -178,7 +178,7 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param $what * - * @return View + * @return \Illuminate\View\View */ public function index(JournalRepositoryInterface $repository, $what) { @@ -244,12 +244,12 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param TransactionJournal $journal * - * @return $this + * @return \Illuminate\View\View */ public function show(JournalRepositoryInterface $repository, TransactionJournal $journal) { $journal->transactions->each( - function (Transaction $t) use ($journal, $repository) { + function(Transaction $t) use ($journal, $repository) { $t->before = $repository->getAmountBefore($journal, $t); $t->after = $t->before + $t->amount; } @@ -263,7 +263,7 @@ class TransactionController extends Controller * @param JournalFormRequest $request * @param JournalRepositoryInterface $repository * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function store(JournalFormRequest $request, JournalRepositoryInterface $repository) { @@ -300,7 +300,7 @@ class TransactionController extends Controller * @param JournalRepositoryInterface $repository * @param TransactionJournal $journal * - * @return $this|\Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse */ public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal) { diff --git a/app/Http/Middleware/Reminders.php b/app/Http/Middleware/Reminders.php index c64c2ad1fa..869b1f170a 100644 --- a/app/Http/Middleware/Reminders.php +++ b/app/Http/Middleware/Reminders.php @@ -68,7 +68,7 @@ class Reminders // get and list active reminders: $reminders = $this->auth->user()->reminders()->today()->get(); $reminders->each( - function (Reminder $reminder) use ($helper) { + function(Reminder $reminder) use ($helper) { $reminder->description = $helper->getReminderText($reminder); } ); diff --git a/app/Http/routes.php b/app/Http/routes.php index 02631fcac4..750d9a7b3b 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -15,13 +15,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; // models Route::bind( 'account', - function ($value) { + function($value) { if (Auth::check()) { $object = Account::leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') - ->where('account_types.editable', 1) - ->where('accounts.id', $value) - ->where('user_id', Auth::user()->id) - ->first(['accounts.*']); + ->where('account_types.editable', 1) + ->where('accounts.id', $value) + ->where('user_id', Auth::user()->id) + ->first(['accounts.*']); if ($object) { return $object; } @@ -31,7 +31,7 @@ Route::bind( ); Route::bind( - 'tj', function ($value) { + 'tj', function($value) { if (Auth::check()) { $object = TransactionJournal::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -44,7 +44,7 @@ Route::bind( ); Route::bind( - 'currency', function ($value) { + 'currency', function($value) { if (Auth::check()) { $object = TransactionCurrency::find($value); if ($object) { @@ -56,7 +56,7 @@ Route::bind( ); Route::bind( - 'bill', function ($value) { + 'bill', function($value) { if (Auth::check()) { $object = Bill::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -69,7 +69,7 @@ Route::bind( ); Route::bind( - 'budget', function ($value) { + 'budget', function($value) { if (Auth::check()) { $object = Budget::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -82,7 +82,7 @@ Route::bind( ); Route::bind( - 'reminder', function ($value) { + 'reminder', function($value) { if (Auth::check()) { $object = Reminder::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -95,13 +95,13 @@ Route::bind( ); Route::bind( - 'limitrepetition', function ($value) { + 'limitrepetition', function($value) { if (Auth::check()) { $object = LimitRepetition::where('limit_repetitions.id', $value) - ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') - ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') - ->where('budgets.user_id', Auth::user()->id) - ->first(['limit_repetitions.*']); + ->leftjoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') + ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') + ->where('budgets.user_id', Auth::user()->id) + ->first(['limit_repetitions.*']); if ($object) { return $object; } @@ -112,12 +112,12 @@ Route::bind( ); Route::bind( - 'piggyBank', function ($value) { + 'piggyBank', function($value) { if (Auth::check()) { $object = PiggyBank::where('piggy_banks.id', $value) - ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') - ->where('accounts.user_id', Auth::user()->id) - ->first(['piggy_banks.*']); + ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id') + ->where('accounts.user_id', Auth::user()->id) + ->first(['piggy_banks.*']); if ($object) { return $object; } @@ -128,7 +128,7 @@ Route::bind( ); Route::bind( - 'category', function ($value) { + 'category', function($value) { if (Auth::check()) { $object = Category::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -142,7 +142,7 @@ Route::bind( /** @noinspection PhpUnusedParameterInspection */ Route::bind( - 'reminder', function ($value) { + 'reminder', function($value) { if (Auth::check()) { /** @var \FireflyIII\Models\Reminder $object */ $object = Reminder::find($value); @@ -158,7 +158,7 @@ Route::bind( ); Route::bind( - 'tag', function ($value) { + 'tag', function($value) { if (Auth::check()) { $object = Tag::where('id', $value)->where('user_id', Auth::user()->id)->first(); if ($object) { @@ -189,7 +189,7 @@ Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'routes']); * Home Controller */ Route::group( - ['middleware' => ['auth', 'range', 'reminders']], function () { + ['middleware' => ['auth', 'range', 'reminders']], function() { Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index', 'middleware' => 'cleanup']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); diff --git a/app/Models/Account.php b/app/Models/Account.php index 581c0d48e2..a47a7f75d7 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -129,7 +129,7 @@ class Account extends Model /** * @codeCoverageIgnore - * @return array + * @return string[] */ public function getDates() { @@ -138,7 +138,7 @@ class Account extends Model /** * - * @param $fieldName + * @param string $fieldName * * @codeCoverageIgnore * @@ -208,7 +208,7 @@ class Account extends Model { $joinName = str_replace('.', '_', $name); $query->leftJoin( - 'account_meta as ' . $joinName, function (JoinClause $join) use ($joinName, $name) { + 'account_meta as ' . $joinName, function(JoinClause $join) use ($joinName, $name) { $join->on($joinName . '.account_id', '=', 'accounts.id')->where($joinName . '.name', '=', $name); } ); diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index 3cd0f95fbe..f3ec8dfb60 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -33,7 +33,7 @@ class AccountMeta extends Model 'name' => 'required|between:1,100', 'data' => 'required' ]; - protected $table = 'account_meta'; + protected $table = 'account_meta'; /** * diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 845d110cf5..d7517da9c1 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -49,7 +49,7 @@ class Bill extends Model { protected $fillable - = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',]; + = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active', ]; protected $hidden = ['amount_min_encrypted', 'amount_max_encrypted', 'name_encrypted', 'match_encrypted']; diff --git a/app/Models/Category.php b/app/Models/Category.php index a86bc2fc84..b1cd0f5d71 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -63,7 +63,7 @@ class Category extends Model /** * @codeCoverageIgnore - * @return array + * @return string[] */ public function getDates() { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 6d4b904d81..3a60335bef 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -49,7 +49,7 @@ class PiggyBank extends Model use SoftDeletes; protected $fillable - = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me']; + = ['name', 'account_id', 'order', 'reminder_skip', 'targetamount', 'startdate', 'targetdate', 'reminder', 'remind_me']; protected $hidden = ['targetamount_encrypted', 'encrypted']; /** @@ -88,7 +88,7 @@ class PiggyBank extends Model } /** - * @return array + * @return string[] */ public function getDates() { @@ -115,7 +115,7 @@ class PiggyBank extends Model * * @param $value * - * @return int + * @return boolean */ public function getRemindMeAttribute($value) { diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index deccd7bbde..699b712c25 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -77,13 +77,13 @@ class PiggyBankRepetition extends Model $q->orWhereNull('startdate'); } ) - ->where( - function (EloquentBuilder $q) use ($date) { + ->where( + function (EloquentBuilder $q) use ($date) { - $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); - $q->orWhereNull('targetdate'); - } - ); + $q->where('targetdate', '>=', $date->format('Y-m-d 00:00:00')); + $q->orWhereNull('targetdate'); + } + ); } /** diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index d46cf56e74..5b0b62bcfd 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -43,7 +43,7 @@ class Reminder extends Model { - protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type',]; + protected $fillable = ['user_id', 'startdate', 'metadata', 'enddate', 'active', 'notnow', 'remindersable_id', 'remindersable_type', ]; protected $hidden = ['encrypted']; /** @@ -123,7 +123,7 @@ class Reminder extends Model $today = new Carbon; return $query->where('startdate', '<=', $today->format('Y-m-d 00:00:00'))->where('enddate', '>=', $today->format('Y-m-d 00:00:00'))->where('active', 1) - ->where('notnow', 0); + ->where('notnow', 0); } /** diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 2d973f4bf1..0fb6a9c876 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -89,7 +89,7 @@ class Tag extends Model /** * @codeCoverageIgnore - * @return array + * @return string[] */ public function getDates() { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 51f7c48e98..212682c5e9 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -224,7 +224,7 @@ class TransactionJournal extends Model /** * @codeCoverageIgnore - * @return array + * @return string[] */ public function getDates() { @@ -313,7 +313,7 @@ class TransactionJournal extends Model * @param EloquentBuilder $query * @param Carbon $date * - * @return mixed + * @return EloquentBuilder */ public function scopeAfter(EloquentBuilder $query, Carbon $date) { @@ -326,7 +326,7 @@ class TransactionJournal extends Model * @param EloquentBuilder $query * @param Carbon $date * - * @return mixed + * @return EloquentBuilder */ public function scopeBefore(EloquentBuilder $query, Carbon $date) { @@ -339,7 +339,7 @@ class TransactionJournal extends Model * @param EloquentBuilder $query * @param Carbon $date * - * @return mixed + * @return EloquentBuilder */ public function scopeOnDate(EloquentBuilder $query, Carbon $date) { @@ -373,7 +373,7 @@ class TransactionJournal extends Model public function scopeWithRelevantData(EloquentBuilder $query) { $query->with( - ['transactions' => function (HasMany $q) { + ['transactions' => function(HasMany $q) { $q->orderBy('amount', 'ASC'); }, 'transactiontype', 'transactioncurrency', 'budgets', 'categories', 'transactions.account.accounttype', 'bill', 'budgets', 'categories'] ); diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php index dc2e86ac21..1eef3684d7 100644 --- a/app/Providers/BusServiceProvider.php +++ b/app/Providers/BusServiceProvider.php @@ -23,7 +23,7 @@ class BusServiceProvider extends ServiceProvider public function boot(Dispatcher $dispatcher) { $dispatcher->mapUsing( - function ($command) { + function($command) { return Dispatcher::simpleMapping( $command, 'FireflyIII\Commands', 'FireflyIII\Handlers\Commands' ); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 9299f12fcb..3e01105bd5 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -52,12 +52,12 @@ class EventServiceProvider extends ServiceProvider $this->registerDeleteEvents(); $this->registerCreateEvents(); BudgetLimit::saved( - function (BudgetLimit $budgetLimit) { + function(BudgetLimit $budgetLimit) { $end = Navigation::addPeriod(clone $budgetLimit->startdate, $budgetLimit->repeat_freq, 0); $end->subDay(); $set = $budgetLimit->limitrepetitions()->where('startdate', $budgetLimit->startdate->format('Y-m-d'))->where('enddate', $end->format('Y-m-d')) - ->get(); + ->get(); if ($set->count() == 0) { $repetition = new LimitRepetition; $repetition->startdate = $budgetLimit->startdate; @@ -91,7 +91,7 @@ class EventServiceProvider extends ServiceProvider protected function registerDeleteEvents() { TransactionJournal::deleted( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { /** @var Transaction $transaction */ foreach ($journal->transactions()->get() as $transaction) { @@ -100,7 +100,7 @@ class EventServiceProvider extends ServiceProvider } ); PiggyBank::deleting( - function (PiggyBank $piggyBank) { + function(PiggyBank $piggyBank) { $reminders = $piggyBank->reminders()->get(); /** @var Reminder $reminder */ foreach ($reminders as $reminder) { @@ -110,7 +110,7 @@ class EventServiceProvider extends ServiceProvider ); Account::deleted( - function (Account $account) { + function(Account $account) { /** @var Transaction $transaction */ foreach ($account->transactions()->get() as $transaction) { @@ -131,7 +131,7 @@ class EventServiceProvider extends ServiceProvider // move this routine to a filter // in case of repeated piggy banks and/or other problems. PiggyBank::created( - function (PiggyBank $piggyBank) { + function(PiggyBank $piggyBank) { $repetition = new PiggyBankRepetition; $repetition->piggyBank()->associate($piggyBank); $repetition->startdate = is_null($piggyBank->startdate) ? null : $piggyBank->startdate; diff --git a/app/Providers/FireflyServiceProvider.php b/app/Providers/FireflyServiceProvider.php index eff456ea08..ab5d1be9e5 100644 --- a/app/Providers/FireflyServiceProvider.php +++ b/app/Providers/FireflyServiceProvider.php @@ -30,7 +30,7 @@ class FireflyServiceProvider extends ServiceProvider public function boot() { Validator::resolver( - function ($translator, $data, $rules, $messages) { + function($translator, $data, $rules, $messages) { return new FireflyValidator($translator, $data, $rules, $messages); } ); @@ -55,28 +55,28 @@ class FireflyServiceProvider extends ServiceProvider $this->app->bind( - 'preferences', function () { + 'preferences', function() { return new Preferences; } ); $this->app->bind( - 'navigation', function () { + 'navigation', function() { return new Navigation; } ); $this->app->bind( - 'amount', function () { + 'amount', function() { return new Amount; } ); $this->app->bind( - 'steam', function () { + 'steam', function() { return new Steam; } ); $this->app->bind( - 'expandedform', function () { + 'expandedform', function() { return new ExpandedForm; } ); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 4e40f5bec8..b95fa98635 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -44,7 +44,7 @@ class RouteServiceProvider extends ServiceProvider public function map(Router $router) { $router->group( - ['namespace' => $this->namespace], function ($router) { + ['namespace' => $this->namespace], function($router) { /** @noinspection PhpIncludeInspection */ require app_path('Http/routes.php'); } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 0f03b71f3d..8cd51fd77a 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -64,7 +64,7 @@ class AccountRepository implements AccountRepositoryInterface public function getAccounts(array $types) { $result = Auth::user()->accounts()->with( - ['accountmeta' => function (HasMany $query) { + ['accountmeta' => function(HasMany $query) { $query->where('name', 'accountRole'); }] )->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name'); @@ -79,15 +79,15 @@ class AccountRepository implements AccountRepositoryInterface public function getCreditCards() { return Auth::user()->accounts() - ->hasMetaValue('accountRole', 'ccAsset') - ->hasMetaValue('ccType', 'monthlyFull') - ->get( - [ - 'accounts.*', - 'ccType.data as ccType', - 'accountRole.data as accountRole' - ] - ); + ->hasMetaValue('accountRole', 'ccAsset') + ->hasMetaValue('ccType', 'monthlyFull') + ->get( + [ + 'accounts.*', + 'ccType.data as ccType', + 'accountRole.data as accountRole' + ] + ); } /** @@ -132,18 +132,18 @@ class AccountRepository implements AccountRepositoryInterface public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end) { return Auth::user() - ->transactionjournals() - ->with(['transactions']) - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id) - ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id') - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->before($end) - ->after($start) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.id', 'DESC') - ->take(10) - ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']); + ->transactionjournals() + ->with(['transactions']) + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->id) + ->leftJoin('transaction_currencies', 'transaction_currencies.id', '=', 'transaction_journals.transaction_currency_id') + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->before($end) + ->after($start) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.id', 'DESC') + ->take(10) + ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']); } /** @@ -156,13 +156,13 @@ class AccountRepository implements AccountRepositoryInterface { $offset = ($page - 1) * 50; $query = Auth::user() - ->transactionJournals() - ->withRelevantData() - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->where('transactions.account_id', $account->id) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC'); + ->transactionJournals() + ->withRelevantData() + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transactions.account_id', $account->id) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC'); $count = $query->count(); $set = $query->take(50)->offset($offset)->get(['transaction_journals.*']); @@ -213,7 +213,7 @@ class AccountRepository implements AccountRepositoryInterface } $accounts->each( - function (Account $account) use ($start, $end) { + function(Account $account) use ($start, $end) { $account->startBalance = Steam::balance($account, $start, true); $account->endBalance = Steam::balance($account, $end, true); $account->piggyBalance = 0; @@ -251,7 +251,7 @@ class AccountRepository implements AccountRepositoryInterface $end = clone Session::get('end', new Carbon); $accounts->each( - function (Account $account) use ($start, $end) { + function(Account $account) use ($start, $end) { $account->startBalance = Steam::balance($account, $start); $account->endBalance = Steam::balance($account, $end); @@ -289,22 +289,22 @@ class AccountRepository implements AccountRepositoryInterface */ public function getTransfersInRange(Account $account, Carbon $start, Carbon $end) { - $set = TransactionJournal::whereIn( - 'id', function (Builder $q) use ($account, $start, $end) { + $set = TransactionJournal::whereIn( + 'id', function(Builder $q) use ($account, $start, $end) { $q->select('transaction_journals.id') - ->from('transactions') - ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->where('transactions.account_id', $account->id) - ->where('transaction_journals.user_id', Auth::user()->id) - ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) - ->where('transaction_types.type', 'Transfer'); + ->from('transactions') + ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->where('transactions.account_id', $account->id) + ->where('transaction_journals.user_id', Auth::user()->id) + ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) + ->where('transaction_types.type', 'Transfer'); } )->get(); $filtered = $set->filter( - function (TransactionJournal $journal) use ($account) { + function(TransactionJournal $journal) use ($account) { if ($journal->destination_account->id == $account->id) { return $journal; } @@ -342,9 +342,9 @@ class AccountRepository implements AccountRepositoryInterface public function openingBalanceTransaction(Account $account) { return TransactionJournal::accountIs($account) - ->orderBy('transaction_journals.date', 'ASC') - ->orderBy('created_at', 'ASC') - ->first(['transaction_journals.*']); + ->orderBy('transaction_journals.date', 'ASC') + ->orderBy('created_at', 'ASC') + ->first(['transaction_journals.*']); } /** @@ -368,7 +368,7 @@ class AccountRepository implements AccountRepositoryInterface 'name' => $data['name'] . ' initial balance', 'active' => false, ]; - $opposing = $this->storeAccount($opposingData); + $opposing = $this->storeAccount($opposingData); $this->storeInitialBalance($newAccount, $opposing, $data); } @@ -418,13 +418,13 @@ class AccountRepository implements AccountRepositoryInterface 'name' => $data['name'] . ' initial balance', 'active' => false, ]; - $opposing = $this->storeAccount($opposingData); + $opposing = $this->storeAccount($opposingData); $this->storeInitialBalance($account, $opposing, $data); } } else { if ($openingBalance) { // opening balance is zero, should we delete it? - $openingBalance->delete();// delete existing opening balance. + $openingBalance->delete(); // delete existing opening balance. } } @@ -451,7 +451,7 @@ class AccountRepository implements AccountRepositoryInterface if (!$newAccount->isValid()) { // does the account already exist? - $searchData = [ + $searchData = [ 'user_id' => $data['user'], 'account_type_id' => $accountType->id, 'name' => $data['name'] diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 190808cfb0..c537027817 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -25,7 +25,7 @@ class BillRepository implements BillRepositoryInterface * @param Carbon $start * @param Carbon $end * - * @return float + * @return integer */ public function billPaymentsInRange(Bill $bill, Carbon $start, Carbon $end) { @@ -67,7 +67,7 @@ class BillRepository implements BillRepositoryInterface /** * @param Bill $bill * - * @return mixed + * @return boolean|null */ public function destroy(Bill $bill) { @@ -258,7 +258,7 @@ class BillRepository implements BillRepositoryInterface * @param Bill $bill * @param TransactionJournal $journal * - * @return bool + * @return boolean|null */ public function scan(Bill $bill, TransactionJournal $journal) { @@ -331,7 +331,7 @@ class BillRepository implements BillRepositoryInterface * @param Bill $bill * @param array $data * - * @return Bill|static + * @return Bill */ public function update(Bill $bill, array $data) { diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 8a13ce11df..efe12c2eab 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -79,10 +79,10 @@ class BudgetRepository implements BudgetRepositoryInterface /** @var Collection $repetitions */ return LimitRepetition:: leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) - ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->get(['limit_repetitions.*']); + ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) + ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->get(['limit_repetitions.*']); } /** @@ -154,9 +154,9 @@ class BudgetRepository implements BudgetRepositoryInterface $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC'); + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC'); $countQuery = $budget->transactionJournals(); @@ -196,9 +196,9 @@ class BudgetRepository implements BudgetRepositoryInterface public function getLimitAmountOnDate(Budget $budget, Carbon $date) { $repetition = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00')) - ->where('budget_limits.budget_id', $budget->id) - ->first(['limit_repetitions.*']); + ->where('limit_repetitions.startdate', $date->format('Y-m-d 00:00:00')) + ->where('budget_limits.budget_id', $budget->id) + ->first(['limit_repetitions.*']); if ($repetition) { return floatval($repetition->amount); @@ -216,42 +216,42 @@ class BudgetRepository implements BudgetRepositoryInterface public function getWithoutBudget(Carbon $start, Carbon $end) { return Auth::user() - ->transactionjournals() - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->whereNull('budget_transaction_journal.id') - ->before($end) - ->after($start) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->get(['transaction_journals.*']); + ->transactionjournals() + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->whereNull('budget_transaction_journal.id') + ->before($end) + ->after($start) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->get(['transaction_journals.*']); } /** * @param Carbon $start * @param Carbon $end * - * @return mixed + * @return double */ public function getWithoutBudgetSum(Carbon $start, Carbon $end) { $noBudgetSet = Auth::user() - ->transactionjournals() - ->whereNotIn( - 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { - $query - ->select('transaction_journals.id') - ->from('transaction_journals') - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) - ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) - ->whereNotNull('budget_transaction_journal.budget_id'); - } - ) - ->after($start) - ->before($end) - ->transactionTypes(['Withdrawal']) - ->get(['transaction_journals.*'])->sum('amount'); + ->transactionjournals() + ->whereNotIn( + 'transaction_journals.id', function (QueryBuilder $query) use ($start, $end) { + $query + ->select('transaction_journals.id') + ->from('transaction_journals') + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->where('transaction_journals.date', '>=', $start->format('Y-m-d 00:00:00')) + ->where('transaction_journals.date', '<=', $end->format('Y-m-d 00:00:00')) + ->whereNotNull('budget_transaction_journal.budget_id'); + } + ) + ->after($start) + ->before($end) + ->transactionTypes(['Withdrawal']) + ->get(['transaction_journals.*'])->sum('amount'); return floatval($noBudgetSet) * -1; } @@ -272,18 +272,18 @@ class BudgetRepository implements BudgetRepositoryInterface } else { // get all journals in this month where the asset account is NOT shared. $sum = $budget->transactionjournals() - ->before($end) - ->after($start) - ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->leftJoin( - 'account_meta', function (JoinClause $join) { - $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); - } - ) - ->where('account_meta.data', '!=', '"sharedAsset"') - ->get(['transaction_journals.*']) - ->sum('amount'); + ->before($end) + ->after($start) + ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') + ->leftJoin( + 'account_meta', function (JoinClause $join) { + $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); + } + ) + ->where('account_meta.data', '!=', '"sharedAsset"') + ->get(['transaction_journals.*']) + ->sum('amount'); $sum = floatval($sum); } @@ -330,7 +330,7 @@ class BudgetRepository implements BudgetRepositoryInterface * @param Carbon $date * @param $amount * - * @return LimitRepetition|null + * @return BudgetLimit */ public function updateLimitAmount(Budget $budget, Carbon $date, $amount) { diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 1fbb964e42..5bf3dfd1b1 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -49,7 +49,7 @@ class CategoryRepository implements CategoryRepositoryInterface /** @var Collection $set */ $set = Auth::user()->categories()->orderBy('name', 'ASC')->get(); $set->sortBy( - function (Category $category) { + function(Category $category) { return $category->name; } ); @@ -67,16 +67,16 @@ class CategoryRepository implements CategoryRepositoryInterface public function getCategoriesAndExpensesCorrected($start, $end) { $set = Auth::user()->transactionjournals() - ->leftJoin( - 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' - ) - ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') - ->before($end) - ->where('categories.user_id', Auth::user()->id) - ->after($start) - ->transactionTypes(['Withdrawal']) - ->groupBy('categories.id') - ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']); + ->leftJoin( + 'category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id' + ) + ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') + ->before($end) + ->where('categories.user_id', Auth::user()->id) + ->after($start) + ->transactionTypes(['Withdrawal']) + ->groupBy('categories.id') + ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']); $result = []; foreach ($set as $entry) { @@ -143,10 +143,10 @@ class CategoryRepository implements CategoryRepositoryInterface public function getLatestActivity(Category $category) { $latest = $category->transactionjournals() - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->first(); + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->first(); if ($latest) { return $latest->date; } @@ -163,15 +163,15 @@ class CategoryRepository implements CategoryRepositoryInterface public function getWithoutCategory(Carbon $start, Carbon $end) { return Auth::user() - ->transactionjournals() - ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->whereNull('category_transaction_journal.id') - ->before($end) - ->after($start) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->get(['transaction_journals.*']); + ->transactionjournals() + ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->whereNull('category_transaction_journal.id') + ->before($end) + ->after($start) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order', 'ASC') + ->orderBy('transaction_journals.id', 'DESC') + ->get(['transaction_journals.*']); } /** @@ -190,8 +190,8 @@ class CategoryRepository implements CategoryRepositoryInterface // always ignore transfers between accounts! $sum = floatval( $category->transactionjournals() - ->transactionTypes(['Withdrawal']) - ->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount') + ->transactionTypes(['Withdrawal']) + ->before($end)->after($start)->get(['transaction_journals.*'])->sum('amount') ); } else { @@ -204,7 +204,7 @@ class CategoryRepository implements CategoryRepositoryInterface ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin( - 'account_meta', function (JoinClause $join) { + 'account_meta', function(JoinClause $join) { $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole'); } ) diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index cdc0775a46..a7fb12f50a 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -29,7 +29,7 @@ class JournalRepository implements JournalRepositoryInterface /** * @param int $reminderId * - * @return bool + * @return boolean|null */ public function deactivateReminder($reminderId) { @@ -72,7 +72,7 @@ class JournalRepository implements JournalRepositoryInterface * @param TransactionJournal $journal * @param Transaction $transaction * - * @return float + * @return integer */ public function getAmountBefore(TransactionJournal $journal, Transaction $transaction) { @@ -111,7 +111,7 @@ class JournalRepository implements JournalRepositoryInterface */ public function getJournalsOfTypes(array $types, $offset, $page) { - $set = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset) + $set = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset) ->orderBy('date', 'DESC') ->orderBy('order', 'ASC') ->orderBy('id', 'DESC') @@ -240,7 +240,7 @@ class JournalRepository implements JournalRepositoryInterface * @param TransactionJournal $journal * @param array $data * - * @return mixed + * @return TransactionJournal */ public function update(TransactionJournal $journal, array $data) { diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 1cb61bedee..3db4693284 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -33,7 +33,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface /** * @param PiggyBank $piggyBank * - * @return bool + * @return boolean|null */ public function destroy(PiggyBank $piggyBank) { @@ -102,7 +102,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface public function setOrder($id, $order) { $piggyBank = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', Auth::user()->id) - ->where('piggy_banks.id', $id)->first(['piggy_banks.*']); + ->where('piggy_banks.id', $id)->first(['piggy_banks.*']); if ($piggyBank) { $piggyBank->order = $order; $piggyBank->save(); diff --git a/app/Repositories/Reminder/ReminderRepository.php b/app/Repositories/Reminder/ReminderRepository.php index 8db6d0ada0..ae04c59c66 100644 --- a/app/Repositories/Reminder/ReminderRepository.php +++ b/app/Repositories/Reminder/ReminderRepository.php @@ -36,14 +36,14 @@ class ReminderRepository implements ReminderRepositoryInterface $today = new Carbon; // active reminders: $active = Auth::user()->reminders() - ->where('notnow', 0) - ->where('active', 1) - ->where('startdate', '<=', $today->format('Y-m-d 00:00:00')) - ->where('enddate', '>=', $today->format('Y-m-d 00:00:00')) - ->get(); + ->where('notnow', 0) + ->where('active', 1) + ->where('startdate', '<=', $today->format('Y-m-d 00:00:00')) + ->where('enddate', '>=', $today->format('Y-m-d 00:00:00')) + ->get(); $active->each( - function (Reminder $reminder) { + function(Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -58,11 +58,11 @@ class ReminderRepository implements ReminderRepositoryInterface public function getDismissedReminders() { $dismissed = Auth::user()->reminders() - ->where('notnow', 1) - ->get(); + ->where('notnow', 1) + ->get(); $dismissed->each( - function (Reminder $reminder) { + function(Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -77,18 +77,18 @@ class ReminderRepository implements ReminderRepositoryInterface { $expired = Auth::user()->reminders() - ->where('notnow', 0) - ->where('active', 1) - ->where( - function (Builder $q) { - $today = new Carbon; - $q->where('startdate', '>', $today->format('Y-m-d 00:00:00')); - $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00')); - } - )->get(); + ->where('notnow', 0) + ->where('active', 1) + ->where( + function (Builder $q) { + $today = new Carbon; + $q->where('startdate', '>', $today->format('Y-m-d 00:00:00')); + $q->orWhere('enddate', '<', $today->format('Y-m-d 00:00:00')); + } + )->get(); $expired->each( - function (Reminder $reminder) { + function(Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); @@ -106,7 +106,7 @@ class ReminderRepository implements ReminderRepositoryInterface ->get(); $inactive->each( - function (Reminder $reminder) { + function(Reminder $reminder) { $reminder->description = $this->helper->getReminderText($reminder); } ); diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 77b551cc54..c18efc01af 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -64,7 +64,7 @@ class TagRepository implements TagRepositoryInterface * @param Carbon $start * @param Carbon $end * - * @return float + * @return integer */ public function coveredByBalancingActs(Account $account, Carbon $start, Carbon $end) { @@ -109,7 +109,7 @@ class TagRepository implements TagRepositoryInterface /** @var Collection $tags */ $tags = Auth::user()->tags()->get(); $tags->sortBy( - function (Tag $tag) { + function(Tag $tag) { return $tag->tag; } ); diff --git a/app/Services/Registrar.php b/app/Services/Registrar.php index 5f69c7ba24..6f9ffa729a 100644 --- a/app/Services/Registrar.php +++ b/app/Services/Registrar.php @@ -41,9 +41,9 @@ class Registrar implements RegistrarContract { return Validator::make( $data, [ - 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|confirmed|min:6', - ] + 'email' => 'required|email|max:255|unique:users', + 'password' => 'required|confirmed|min:6', + ] ); } diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index 542cd669f3..f2dd884673 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -118,7 +118,7 @@ class Navigation 'year' => 'endOfYear', 'yearly' => 'endOfYear', ]; - $specials = ['mont', 'monthly']; + $specials = ['mont', 'monthly']; $currentEnd = clone $theCurrentEnd; @@ -270,7 +270,7 @@ class Navigation '3M' => 'lastOfQuarter', '1Y' => 'endOfYear', ]; - $end = clone $start; + $end = clone $start; if (isset($functionMap[$range])) { $function = $functionMap[$range]; diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index a493ad0741..7b1e0f42b5 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -25,7 +25,7 @@ class Search implements SearchInterface public function searchAccounts(array $words) { return Auth::user()->accounts()->with('accounttype')->where( - function (EloquentBuilder $q) use ($words) { + function(EloquentBuilder $q) use ($words) { foreach ($words as $word) { $q->orWhere('name', 'LIKE', '%' . e($word) . '%'); } @@ -43,7 +43,7 @@ class Search implements SearchInterface /** @var Collection $set */ $set = Auth::user()->budgets()->get(); $newSet = $set->filter( - function (Budget $b) use ($words) { + function(Budget $b) use ($words) { $found = 0; foreach ($words as $word) { if (!(strpos(strtolower($b->name), strtolower($word)) === false)) { @@ -68,7 +68,7 @@ class Search implements SearchInterface /** @var Collection $set */ $set = Auth::user()->categories()->get(); $newSet = $set->filter( - function (Category $c) use ($words) { + function(Category $c) use ($words) { $found = 0; foreach ($words as $word) { if (!(strpos(strtolower($c->name), strtolower($word)) === false)) { @@ -103,7 +103,7 @@ class Search implements SearchInterface { // decrypted transaction journals: $decrypted = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 0)->where( - function (EloquentBuilder $q) use ($words) { + function(EloquentBuilder $q) use ($words) { foreach ($words as $word) { $q->orWhere('description', 'LIKE', '%' . e($word) . '%'); } @@ -113,7 +113,7 @@ class Search implements SearchInterface // encrypted $all = Auth::user()->transactionjournals()->withRelevantData()->where('encrypted', 1)->get(); $set = $all->filter( - function (TransactionJournal $journal) use ($words) { + function(TransactionJournal $journal) use ($words) { foreach ($words as $word) { $haystack = strtolower($journal->description); $word = strtolower($word); @@ -129,7 +129,7 @@ class Search implements SearchInterface $filtered = $set->merge($decrypted); $filtered->sortBy( - function (TransactionJournal $journal) { + function(TransactionJournal $journal) { return intval($journal->date->format('U')); } ); diff --git a/app/Support/Twig/Budget.php b/app/Support/Twig/Budget.php index 874ca15424..2424f8b0c8 100644 --- a/app/Support/Twig/Budget.php +++ b/app/Support/Twig/Budget.php @@ -21,16 +21,16 @@ class Budget extends Twig_Extension { $functions = []; $functions[] = new Twig_SimpleFunction( - 'spentInRepetitionCorrected', function (LimitRepetition $repetition) { + 'spentInRepetitionCorrected', function(LimitRepetition $repetition) { $sum = Auth::user()->transactionjournals() - ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') - ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') - ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') - ->before($repetition->enddate) - ->after($repetition->startdate) - ->where('limit_repetitions.id', '=', $repetition->id) - ->get(['transaction_journals.*'])->sum('amount'); + ->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') + ->leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budget_transaction_journal.budget_id') + ->leftJoin('limit_repetitions', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') + ->before($repetition->enddate) + ->after($repetition->startdate) + ->where('limit_repetitions.id', '=', $repetition->id) + ->get(['transaction_journals.*'])->sum('amount'); return floatval($sum); } diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index c1bcf09e16..81ea504928 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -31,31 +31,31 @@ class General extends Twig_Extension $filters = []; $filters[] = new Twig_SimpleFilter( - 'formatAmount', function ($string) { + 'formatAmount', function($string) { return App::make('amount')->format($string); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatTransaction', function (Transaction $transaction) { + 'formatTransaction', function(Transaction $transaction) { return App::make('amount')->formatTransaction($transaction); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatAmountPlain', function ($string) { + 'formatAmountPlain', function($string) { return App::make('amount')->format($string, false); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'formatJournal', function ($journal) { + 'formatJournal', function($journal) { return App::make('amount')->formatJournal($journal); }, ['is_safe' => ['html']] ); $filters[] = new Twig_SimpleFilter( - 'balance', function (Account $account = null) { + 'balance', function(Account $account = null) { if (is_null($account)) { return 'NULL'; } @@ -67,7 +67,7 @@ class General extends Twig_Extension // should be a function but OK $filters[] = new Twig_SimpleFilter( - 'getAccountRole', function ($name) { + 'getAccountRole', function($name) { return Config::get('firefly.accountRoles.' . $name); } ); @@ -83,32 +83,32 @@ class General extends Twig_Extension $functions = []; $functions[] = new Twig_SimpleFunction( - 'getCurrencyCode', function () { + 'getCurrencyCode', function() { return App::make('amount')->getCurrencyCode(); } ); $functions[] = new Twig_SimpleFunction( - 'getCurrencySymbol', function () { + 'getCurrencySymbol', function() { return App::make('amount')->getCurrencySymbol(); } ); $functions[] = new Twig_SimpleFunction( - 'phpdate', function ($str) { + 'phpdate', function($str) { return date($str); } ); $functions[] = new Twig_SimpleFunction( - 'env', function ($name, $default) { + 'env', function($name, $default) { return env($name, $default); } ); $functions[] = new Twig_SimpleFunction( - 'activeRoute', function ($context) { + 'activeRoute', function($context) { $args = func_get_args(); $route = $args[1]; $what = isset($args[2]) ? $args[2] : false; diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index 60b4e34ec2..beaafae668 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -26,7 +26,7 @@ class Journal extends Twig_Extension $filters = []; $filters[] = new Twig_SimpleFilter( - 'typeIcon', function (TransactionJournal $journal) { + 'typeIcon', function(TransactionJournal $journal) { $type = $journal->transactionType->type; switch ($type) { @@ -59,7 +59,7 @@ class Journal extends Twig_Extension $functions = []; $functions[] = new Twig_SimpleFunction( - 'invalidJournal', function (TransactionJournal $journal) { + 'invalidJournal', function(TransactionJournal $journal) { if (!isset($journal->transactions[1]) || !isset($journal->transactions[0])) { return true; } @@ -69,7 +69,7 @@ class Journal extends Twig_Extension ); $functions[] = new Twig_SimpleFunction( - 'relevantTags', function (TransactionJournal $journal) { + 'relevantTags', function(TransactionJournal $journal) { if ($journal->tags->count() == 0) { return App::make('amount')->formatJournal($journal); } @@ -82,7 +82,7 @@ class Journal extends Twig_Extension $amount = App::make('amount')->format($journal->actual_amount, false); return ' ' . $tag->tag . ''; + . '"> ' . $tag->tag . ''; } /* @@ -92,7 +92,7 @@ class Journal extends Twig_Extension $amount = App::make('amount')->formatJournal($journal, false); return ' ' . $tag->tag . ''; + . '"> ' . $tag->tag . ''; } /* * AdvancePayment with a withdrawal will show the amount with a link to diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php index 6ff4aafe90..f178aa6316 100644 --- a/app/Support/Twig/PiggyBank.php +++ b/app/Support/Twig/PiggyBank.php @@ -22,7 +22,7 @@ class PiggyBank extends Twig_Extension $functions = []; $functions[] = new Twig_SimpleFunction( - 'currentRelevantRepAmount', function (PB $piggyBank) { + 'currentRelevantRepAmount', function(PB $piggyBank) { return $piggyBank->currentRelevantRep()->currentamount; } ); diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php index 1cb3314cf2..d91c1816e6 100644 --- a/app/Support/Twig/Translation.php +++ b/app/Support/Twig/Translation.php @@ -21,7 +21,7 @@ class Translation extends Twig_Extension $filters = []; $filters[] = new Twig_SimpleFilter( - '_', function ($name) { + '_', function($name) { return trans('firefly.' . $name); From bbf4007c3ef728ee586d158830fef0b6bd47ceb7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 20:59:16 +0200 Subject: [PATCH 13/29] Fixed return type [skip ci] --- app/Repositories/Bill/BillRepository.php | 2 +- app/Repositories/Bill/BillRepositoryInterface.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index c537027817..93f774ed34 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -209,7 +209,7 @@ class BillRepository implements BillRepositoryInterface /** * @param Bill $bill * - * @return Carbon + * @return \Carbon\Carbon */ public function nextExpectedMatch(Bill $bill) { diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 4f2b509786..f2c32e20a7 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -103,7 +103,7 @@ interface BillRepositoryInterface /** * @param Bill $bill * - * @return Carbon|null + * @return \Carbon\Carbon */ public function nextExpectedMatch(Bill $bill); From 1d4938bb094fb9c25cc4716a759eb428465d64bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 26 May 2015 22:12:34 +0200 Subject: [PATCH 14/29] Small fix in error handler. --- app/Exceptions/Handler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 4a9d49b8e1..0c8281c825 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,6 +2,7 @@ use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Symfony\Component\HttpKernel\Exception\HttpException; /** * Class Handler @@ -33,7 +34,7 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $e) { - if ($this->isHttpException($e)) { + if ($e instanceof HttpException) { return $this->renderHttpException($e); } else { return parent::render($request, $e); From 58014f059278242eba529aaf2194c39b967c2303 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 27 May 2015 06:57:02 +0200 Subject: [PATCH 15/29] Extra translation [skip ci] --- resources/lang/en/firefly.php | 1 + resources/lang/nl/firefly.php | 1 + resources/twig/list/categories.twig | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index adc4d7176c..8f89543fa2 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -16,6 +16,7 @@ return [ 'from' => 'From', 'to' => 'To', 'showEverything' => 'Show everything', + 'never' => 'Never', // forms: 'mandatoryFields' => 'Mandatory fields', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index 5035174ae5..baeed28302 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -16,6 +16,7 @@ return [ 'from' => 'Van', 'to' => 'Tot', 'showEverything' => 'Laat alles zien', + 'never' => 'Nooit', // forms: 'mandatoryFields' => 'Verplichte velden', diff --git a/resources/twig/list/categories.twig b/resources/twig/list/categories.twig index 79fbb86ae1..d2a2f6d3c4 100644 --- a/resources/twig/list/categories.twig +++ b/resources/twig/list/categories.twig @@ -29,7 +29,7 @@ {% else %} - Never + {{ 'never'|_ }} {% endif %} From 2ace7c3ca0ab090b154d48e9932b39134fc61e97 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 27 May 2015 07:27:05 +0200 Subject: [PATCH 16/29] Some code cleanup [skip ci] --- app/Http/Controllers/Auth/AuthController.php | 33 ++++++++----- .../Controllers/TransactionController.php | 6 +-- app/Http/Middleware/Reminders.php | 48 ++++++++++--------- app/Models/Account.php | 5 ++ app/Models/Bill.php | 3 ++ app/Models/Category.php | 3 ++ app/Models/TransactionJournal.php | 9 +++- 7 files changed, 67 insertions(+), 40 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 147ca6040a..34dac7bf27 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -1,6 +1,8 @@ auth->login($this->registrar->create($data)); // get the email address - $email = $this->auth->user()->email; + if ($this->auth->user() instanceof User) { + $email = $this->auth->user()->email; - // send email. - Mail::send( - 'emails.registered', [], function(Message $message) use ($email) { - $message->to($email, $email)->subject('Welcome to Firefly III!'); + // send email. + Mail::send( + 'emails.registered', [], function (Message $message) use ($email) { + $message->to($email, $email)->subject('Welcome to Firefly III!'); + } + ); + + // set flash message + Session::flash('success', 'You have registered successfully!'); + Session::flash('gaEventCategory', 'user'); + Session::flash('gaEventAction', 'new-registration'); + + + return redirect($this->redirectPath()); } - ); + App::abort(500, 'Not a user!'); - // set flash message - Session::flash('success', 'You have registered successfully!'); - Session::flash('gaEventCategory', 'user'); - Session::flash('gaEventAction', 'new-registration'); - - - return redirect($this->redirectPath()); + return false; } } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 2ebef96f41..b15f83427c 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -118,7 +118,7 @@ class TransactionController extends Controller */ public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal) { - $what = strtolower($journal->transactiontype->type); + $what = strtolower($journal->transactionType->type); $accounts = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account'])); $budgets = ExpandedForm::makeSelectList(Auth::user()->budgets()->get()); $budgets[0] = trans('form.noBudget'); @@ -153,7 +153,7 @@ class TransactionController extends Controller $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id; } - $preFilled['amount'] = $journal->actualAmount; + $preFilled['amount'] = $journal->actual_amount; $preFilled['account_id'] = $journal->assetAccount->id; $preFilled['expense_account'] = $transactions[0]->account->name; $preFilled['revenue_account'] = $transactions[1]->account->name; @@ -254,7 +254,7 @@ class TransactionController extends Controller $t->after = $t->before + $t->amount; } ); - $subTitle = trans('firefly.' . $journal->transactiontype->type) . ' "' . e($journal->description) . '"'; + $subTitle = trans('firefly.' . $journal->transactionType->type) . ' "' . e($journal->description) . '"'; return view('transactions.show', compact('journal', 'subTitle')); } diff --git a/app/Http/Middleware/Reminders.php b/app/Http/Middleware/Reminders.php index 869b1f170a..9814e448d0 100644 --- a/app/Http/Middleware/Reminders.php +++ b/app/Http/Middleware/Reminders.php @@ -7,6 +7,7 @@ use Carbon\Carbon; use Closure; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\Reminder; +use FireflyIII\User; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; use View; @@ -48,30 +49,33 @@ class Reminders { if ($this->auth->check() && !$request->isXmlHttpRequest()) { // do reminders stuff. - $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get(); - /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface $helper */ - $helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface'); + $reminders = []; + if ($this->auth->user() instanceof User) { + $piggyBanks = $this->auth->user()->piggyBanks()->where('remind_me', 1)->get(); + /** @var \FireflyIII\Helpers\Reminders\ReminderHelperInterface $helper */ + $helper = App::make('FireflyIII\Helpers\Reminders\ReminderHelperInterface'); - /** @var PiggyBank $piggyBank */ - foreach ($piggyBanks as $piggyBank) { - $helper->createReminders($piggyBank, new Carbon); - } - // delete invalid reminders - // this is a construction SQLITE cannot handle :( - if (env('DB_CONNECTION') != 'sqlite') { - Reminder::whereUserId($this->auth->user()->id) - ->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id') - ->whereNull('piggy_banks.id') - ->delete(); - } - - // get and list active reminders: - $reminders = $this->auth->user()->reminders()->today()->get(); - $reminders->each( - function(Reminder $reminder) use ($helper) { - $reminder->description = $helper->getReminderText($reminder); + /** @var PiggyBank $piggyBank */ + foreach ($piggyBanks as $piggyBank) { + $helper->createReminders($piggyBank, new Carbon); } - ); + // delete invalid reminders + // this is a construction SQLITE cannot handle :( + if (env('DB_CONNECTION') != 'sqlite') { + Reminder::whereUserId($this->auth->user()->id) + ->leftJoin('piggy_banks', 'piggy_banks.id', '=', 'remindersable_id') + ->whereNull('piggy_banks.id') + ->delete(); + } + + // get and list active reminders: + $reminders = $this->auth->user()->reminders()->today()->get(); + $reminders->each( + function (Reminder $reminder) use ($helper) { + $reminder->description = $helper->getReminderText($reminder); + } + ); + } View::share('reminders', $reminders); } diff --git a/app/Models/Account.php b/app/Models/Account.php index a47a7f75d7..4f0737450b 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -40,6 +40,11 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalanceEncrypted($value) * @method static \FireflyIII\Models\Account accountTypeIn($types) * @method static \FireflyIII\Models\Account hasMetaValue($name, $value) + * + * @property boolean joinedAccountTypes + * @property mixed startBalance + * @property mixed endBalance + * @property mixed lastActivityDate */ class Account extends Model { diff --git a/app/Models/Bill.php b/app/Models/Bill.php index d7517da9c1..125b25f480 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -44,6 +44,9 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) + * + * @property mixed nextExpectedMatch + * @property mixed lastFoundMatch */ class Bill extends Model { diff --git a/app/Models/Category.php b/app/Models/Category.php index b1cd0f5d71..05c35149fa 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -24,6 +24,9 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value) + * + * @property mixed spent + * @property mixed lastActivity */ class Category extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 212682c5e9..25f45e70c9 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -61,6 +61,11 @@ use Watson\Validating\ValidatingTrait; * @method static \FireflyIII\Models\TransactionJournal transactionTypes($types) * @method static \FireflyIII\Models\TransactionJournal withRelevantData() * @property-read mixed $expense_account + * @property string account_encrypted + * @property bool joinedTransactions + * @property bool joinedTransactionTypes + * @property mixed account_id + * @property mixed name */ class TransactionJournal extends Model { @@ -152,7 +157,7 @@ class TransactionJournal extends Model // loop other deposits, remove from our amount. $others = $advancePayment->transactionJournals()->transactionTypes(['Deposit'])->get(); foreach ($others as $other) { - $amount = bcsub($amount, $other->actualAmount); + $amount = bcsub($amount, $other->actual_amount); } return $amount; @@ -173,7 +178,7 @@ class TransactionJournal extends Model if ($this->transactionType->type == 'Withdrawal') { $transfer = $balancingAct->transactionJournals()->transactionTypes(['Transfer'])->first(); if ($transfer) { - $amount = bcsub($amount, $transfer->actualAmount); + $amount = bcsub($amount, $transfer->actual_amount); return $amount; } From e1cb9d387e681930e2bd01688d3fb0e0f809f8d2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 27 May 2015 07:51:33 +0200 Subject: [PATCH 17/29] Fixed chart and redirect --- app/Http/Controllers/Auth/AuthController.php | 2 +- app/Http/Controllers/Chart/BudgetController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 34dac7bf27..b79ba7b430 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -109,7 +109,7 @@ class AuthController extends Controller } App::abort(500, 'Not a user!'); - return false; + return redirect('/'); } } diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 445db07672..12c1f9e476 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -135,7 +135,7 @@ class BudgetController extends Controller } } - $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end); + $noBudgetExpenses = $repository->getWithoutBudgetSum($start, $end) * -1; $allEntries->push([trans('firefly.noBudget'), 0, 0, $noBudgetExpenses]); foreach ($allEntries as $entry) { From 7eba33e80519702b078323d9e4fe5b7c2b7aa41e Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 27 May 2015 07:58:54 +0200 Subject: [PATCH 18/29] Fixed some issues for scrutiniser [skip ci] --- app/Http/Controllers/TagController.php | 2 +- app/Http/Controllers/TransactionController.php | 4 ++-- app/Models/Account.php | 1 - app/Models/Bill.php | 1 - app/Models/Category.php | 1 - app/Models/Reminder.php | 1 + app/Models/Transaction.php | 2 ++ app/Repositories/Bill/BillRepository.php | 2 +- app/Repositories/Tag/TagRepository.php | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 251a88ea2e..8473f1d5e3 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -164,7 +164,7 @@ class TagController extends Controller $state = $state == 'true' ? true : false; Preferences::set('hideTagHelp', $state); - return Response::json(true); + return Response::json([true]); } /** diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index b15f83427c..223dab527a 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -154,7 +154,7 @@ class TransactionController extends Controller } $preFilled['amount'] = $journal->actual_amount; - $preFilled['account_id'] = $journal->assetAccount->id; + $preFilled['account_id'] = $journal->asset_account->id; $preFilled['expense_account'] = $transactions[0]->account->name; $preFilled['revenue_account'] = $transactions[1]->account->name; $preFilled['account_from_id'] = $transactions[1]->account->id; @@ -236,7 +236,7 @@ class TransactionController extends Controller } } - return Response::json(true); + return Response::json([true]); } diff --git a/app/Models/Account.php b/app/Models/Account.php index 4f0737450b..cdc4c28088 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -40,7 +40,6 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalanceEncrypted($value) * @method static \FireflyIII\Models\Account accountTypeIn($types) * @method static \FireflyIII\Models\Account hasMetaValue($name, $value) - * * @property boolean joinedAccountTypes * @property mixed startBalance * @property mixed endBalance diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 125b25f480..70fab19668 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -44,7 +44,6 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value) - * * @property mixed nextExpectedMatch * @property mixed lastFoundMatch */ diff --git a/app/Models/Category.php b/app/Models/Category.php index 05c35149fa..3497fd9dc6 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value) - * * @property mixed spent * @property mixed lastActivity */ diff --git a/app/Models/Reminder.php b/app/Models/Reminder.php index 5b0b62bcfd..99baf19835 100644 --- a/app/Models/Reminder.php +++ b/app/Models/Reminder.php @@ -38,6 +38,7 @@ use Illuminate\Database\Eloquent\Model; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Reminder whereEncrypted($value) * @method static \FireflyIII\Models\Reminder onDates($start, $end) * @method static \FireflyIII\Models\Reminder today() + * @property string description */ class Reminder extends Model { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 8b375090d3..827f6958e3 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -33,6 +33,8 @@ use Watson\Validating\ValidatingTrait; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmountEncrypted($value) * @method static \FireflyIII\Models\Transaction after($date) * @method static \FireflyIII\Models\Transaction before($date) + * @property mixed before + * @property mixed after */ class Transaction extends Model { diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 93f774ed34..54ee071c66 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -241,7 +241,7 @@ class BillRepository implements BillRepositoryInterface $end = Navigation::endOfPeriod(clone $start, $bill->repeat_freq); $journalCount = $bill->transactionjournals()->before($end)->after($start)->count(); if ($journalCount == 0) { - $finalDate = clone $start; + $finalDate = new Carbon($start->format('Y-m-d')); break; } } diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index c18efc01af..358eeac892 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -323,7 +323,7 @@ class TagRepository implements TagRepositoryInterface $match = true; /** @var TransactionJournal $check */ foreach ($tag->transactionjournals as $check) { - if ($check->assetAccount->id != $journal->assetAccount->id) { + if ($check->asset_account->id != $journal->asset_account->id) { $match = false; } } From eb650ea3ecc0b739a0bb2c87511e3c8444d6d9d3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 27 May 2015 08:36:26 +0200 Subject: [PATCH 19/29] Some code cleanup --- app/Http/Controllers/AccountController.php | 4 ++-- app/Models/Account.php | 4 ++++ app/Models/PiggyBank.php | 1 + app/Models/TransactionJournal.php | 1 + app/Repositories/Account/AccountRepository.php | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b4a87804d2..bddabbd04b 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -199,7 +199,7 @@ class AccountController extends Controller 'user' => Auth::user()->id, 'accountRole' => $request->input('accountRole'), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon($request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), ]; @@ -237,7 +237,7 @@ class AccountController extends Controller 'accountRole' => $request->input('accountRole'), 'virtualBalance' => floatval($request->input('virtualBalance')), 'openingBalance' => floatval($request->input('openingBalance')), - 'openingBalanceDate' => new Carbon($request->input('openingBalanceDate')), + 'openingBalanceDate' => new Carbon((string) $request->input('openingBalanceDate')), 'openingBalanceCurrency' => intval($request->input('balance_currency_id')), 'ccType' => $request->input('ccType'), 'ccMonthlyPaymentDate' => $request->input('ccMonthlyPaymentDate'), diff --git a/app/Models/Account.php b/app/Models/Account.php index cdc4c28088..c621afca8e 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -44,6 +44,10 @@ use Watson\Validating\ValidatingTrait; * @property mixed startBalance * @property mixed endBalance * @property mixed lastActivityDate + * @property mixed piggyBalance + * @property mixed difference + * @propery mixed percentage + * */ class Account extends Model { diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 3a60335bef..a08241d1a1 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -43,6 +43,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value) + * @property PiggyBankRepetition currentRep */ class PiggyBank extends Model { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 25f45e70c9..8aedbd44d2 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -66,6 +66,7 @@ use Watson\Validating\ValidatingTrait; * @property bool joinedTransactionTypes * @property mixed account_id * @property mixed name + * @property mixed symbol */ class TransactionJournal extends Model { diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 8cd51fd77a..e5900e802b 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -350,7 +350,7 @@ class AccountRepository implements AccountRepositoryInterface /** * @param array $data * - * @return Account; + * @return Account */ public function store(array $data) { From ad0319c1882c4d04219a4e70c1cf168913a0340a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 May 2015 06:11:39 +0200 Subject: [PATCH 20/29] Some new translations [skip ci] --- resources/lang/en/form.php | 2 ++ resources/lang/nl/form.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/resources/lang/en/form.php b/resources/lang/en/form.php index 7cc7b2e5bd..aeacd0ebfd 100644 --- a/resources/lang/en/form.php +++ b/resources/lang/en/form.php @@ -38,6 +38,8 @@ return [ 'tag' => 'Tag', 'reminder' => 'Remind me every', 'under' => 'Under', + 'symbol' => 'Symbol', + 'code' => 'Code', 'store_new_withdrawal' => 'Store new withdrawal', 'store_new_deposit' => 'Store new deposit', diff --git a/resources/lang/nl/form.php b/resources/lang/nl/form.php index 7f7d22578c..239641c082 100644 --- a/resources/lang/nl/form.php +++ b/resources/lang/nl/form.php @@ -38,6 +38,8 @@ return [ 'tag' => 'Tag', 'reminder' => 'Herinner me elke', 'under' => 'Onder', + 'symbol' => 'Symbool', + 'code' => 'Code', 'store_new_withdrawal' => 'Nieuwe uitgave opslaan', 'store_new_deposit' => 'Nieuwe inkomsten opslaan', From 67d91545639787b38535eca488f242db653ed36b Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 28 May 2015 06:43:07 +0200 Subject: [PATCH 21/29] Added some new code to implement a permission scheme. --- .env.example | 3 +- app/Http/Controllers/Auth/AuthController.php | 8 + app/Http/Controllers/CurrencyController.php | 29 +- app/Models/Permission.php | 14 + app/Models/Role.php | 14 + app/User.php | 3 +- composer.json | 3 +- composer.lock | 346 +++++++++++------- config/app.php | 6 +- config/breadcrumbs.php | 7 + config/entrust.php | 78 ++++ ...2015_05_28_041652_entrust_setup_tables.php | 74 ++++ database/seeds/DatabaseSeeder.php | 1 + database/seeds/PermissionSeeder.php | 21 ++ tests/controllers/CurrencyControllerTest.php | 25 ++ tests/factories/all.php | 7 + 16 files changed, 485 insertions(+), 154 deletions(-) create mode 100644 app/Models/Permission.php create mode 100644 app/Models/Role.php create mode 100644 config/breadcrumbs.php create mode 100644 config/entrust.php create mode 100644 database/migrations/2015_05_28_041652_entrust_setup_tables.php create mode 100644 database/seeds/PermissionSeeder.php diff --git a/.env.example b/.env.example index 2d57030477..f09ea84584 100644 --- a/.env.example +++ b/.env.example @@ -17,4 +17,5 @@ EMAIL_USERNAME= EMAIL_PASSWORD= ANALYTICS_ID= EMAIL_PRETEND=false -RUNCLEANUP=true \ No newline at end of file +RUNCLEANUP=true +SITE_OWNER=mail@example.com \ No newline at end of file diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index b79ba7b430..a44ab81cbc 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -2,6 +2,7 @@ use App; use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Models\Role; use FireflyIII\User; use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Registrar; @@ -104,6 +105,13 @@ class AuthController extends Controller Session::flash('gaEventCategory', 'user'); Session::flash('gaEventAction', 'new-registration'); + // first user ever? + if (User::count() == 1) { + $admin = Role::where('name', 'owner')->first(); + $this->auth->user()->attachRole($admin); +// $this->auth->user()->roles()->save($admin); + } + return redirect($this->redirectPath()); } diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 521f298185..6f57851cb9 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -1,5 +1,6 @@ name) . '" deleted'); - - $currency->delete(); + if (Auth::user()->hasRole('owner')) { + $currency->delete(); + } return Redirect::to(Session::get('currency.delete.url')); } @@ -146,6 +148,12 @@ class CurrencyController extends Controller $currencies = $repository->get(); $defaultCurrency = $repository->getCurrencyByPreference(Preferences::get('currencyPreference', 'EUR')); + + if (!Auth::user()->hasRole('owner')) { + Session::flash('warning', 'Please ask ' . env('SITE_OWNER') . ' to add, remove or edit currencies.'); + } + + return view('currency.index', compact('currencies', 'defaultCurrency')); } @@ -158,11 +166,11 @@ class CurrencyController extends Controller */ public function store(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository) { - $data = $request->getCurrencyData(); - $currency = $repository->store($data); - - - Session::flash('success', 'Currency "' . $currency->name . '" created'); + $data = $request->getCurrencyData(); + if (Auth::user()->hasRole('owner')) { + $currency = $repository->store($data); + Session::flash('success', 'Currency "' . $currency->name . '" created'); + } if (intval(Input::get('create_another')) === 1) { Session::put('currency.create.fromStore', true); @@ -185,9 +193,10 @@ class CurrencyController extends Controller */ public function update(CurrencyFormRequest $request, CurrencyRepositoryInterface $repository, TransactionCurrency $currency) { - $data = $request->getCurrencyData(); - $currency = $repository->update($currency, $data); - + $data = $request->getCurrencyData(); + if (Auth::user()->hasRole('owner')) { + $currency = $repository->update($currency, $data); + } Session::flash('success', 'Currency "' . e($currency->name) . '" updated.'); diff --git a/app/Models/Permission.php b/app/Models/Permission.php new file mode 100644 index 0000000000..a075f74e01 --- /dev/null +++ b/app/Models/Permission.php @@ -0,0 +1,14 @@ +=5.3.3", "symfony/console": "~2.1", "symfony/filesystem": "~2.1", @@ -36,7 +36,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -49,13 +49,13 @@ "MIT" ], "authors": [ - { - "name": "Graham Campbell", - "email": "graham@mineuk.com" - }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com" + }, + { + "name": "Graham Campbell", + "email": "graham@cachethq.io" } ], "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case", @@ -64,7 +64,7 @@ "class", "preload" ], - "time": "2015-04-15 21:59:30" + "time": "2015-05-26 10:57:51" }, { "name": "danielstjules/stringy", @@ -673,54 +673,6 @@ ], "time": "2014-09-09 13:34:57" }, - { - "name": "fzaninotto/faker", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/010c7efedd88bf31141a02719f51fb44c732d5a0", - "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "extra": { - "branch-alias": [] - }, - "autoload": { - "psr-0": { - "Faker": "src/", - "Faker\\PHPUnit": "test/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2014-06-04 14:43:02" - }, { "name": "grumpydictator/gchart", "version": "1.0.9", @@ -1693,17 +1645,17 @@ }, { "name": "symfony/console", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272" + "reference": "2343f6d8026306bd330e0c987e4c102483c213e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272", - "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272", + "url": "https://api.github.com/repos/symfony/Console/zipball/2343f6d8026306bd330e0c987e4c102483c213e7", + "reference": "2343f6d8026306bd330e0c987e4c102483c213e7", "shasum": "" }, "require": { @@ -1747,21 +1699,21 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-22 14:53:08" }, { "name": "symfony/debug", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", "url": "https://github.com/symfony/Debug.git", - "reference": "ad4511a8fddce7ec163b513ba39a30ea4f32c9e7" + "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Debug/zipball/ad4511a8fddce7ec163b513ba39a30ea4f32c9e7", - "reference": "ad4511a8fddce7ec163b513ba39a30ea4f32c9e7", + "url": "https://api.github.com/repos/symfony/Debug/zipball/4851a041c48e76b91a221db84ab5850daa6a7b33", + "reference": "4851a041c48e76b91a221db84ab5850daa6a7b33", "shasum": "" }, "require": { @@ -1808,11 +1760,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2015-05-08 13:17:44" + "time": "2015-05-20 13:09:45" }, { "name": "symfony/event-dispatcher", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", @@ -1871,17 +1823,17 @@ }, { "name": "symfony/filesystem", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Filesystem", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde" + "reference": "1f8429f72a5bfa58b33fd96824bea146fc4b3f49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/f73904bd2dae525c42ea1f0340c7c98480ecacde", - "reference": "f73904bd2dae525c42ea1f0340c7c98480ecacde", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/1f8429f72a5bfa58b33fd96824bea146fc4b3f49", + "reference": "1f8429f72a5bfa58b33fd96824bea146fc4b3f49", "shasum": "" }, "require": { @@ -1917,21 +1869,21 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-05-08 00:09:07" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/finder", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", "url": "https://github.com/symfony/Finder.git", - "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99" + "reference": "ffedd3e0ff8155188155e9322fe21b9ee012ac14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/704c64c8b12c8882640d5c0330a8414b1e06dc99", - "reference": "704c64c8b12c8882640d5c0330a8414b1e06dc99", + "url": "https://api.github.com/repos/symfony/Finder/zipball/ffedd3e0ff8155188155e9322fe21b9ee012ac14", + "reference": "ffedd3e0ff8155188155e9322fe21b9ee012ac14", "shasum": "" }, "require": { @@ -1967,21 +1919,21 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/http-foundation", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "8a0d00980ef9f6b47ddbf24bdfbf70fead760816" + "reference": "f9b28dcc6d3e50f5568b42dda7292656a9fe8432" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/8a0d00980ef9f6b47ddbf24bdfbf70fead760816", - "reference": "8a0d00980ef9f6b47ddbf24bdfbf70fead760816", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/f9b28dcc6d3e50f5568b42dda7292656a9fe8432", + "reference": "f9b28dcc6d3e50f5568b42dda7292656a9fe8432", "shasum": "" }, "require": { @@ -2021,21 +1973,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-22 14:53:08" }, { "name": "symfony/http-kernel", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "2010194de0a57731af9404c7f97fd300db98b7a3" + "reference": "a9a6f595941fce8dddd64f4e9bf47747cf1515fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/2010194de0a57731af9404c7f97fd300db98b7a3", - "reference": "2010194de0a57731af9404c7f97fd300db98b7a3", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a9a6f595941fce8dddd64f4e9bf47747cf1515fc", + "reference": "a9a6f595941fce8dddd64f4e9bf47747cf1515fc", "shasum": "" }, "require": { @@ -2099,21 +2051,21 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2015-05-11 01:58:49" + "time": "2015-05-27 00:17:10" }, { "name": "symfony/process", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Process", "source": { "type": "git", "url": "https://github.com/symfony/Process.git", - "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562" + "reference": "7856d78ab6cce6e59d02d9e1a873441f6bd21306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/9f3c4baaf840ed849e1b1f7bfd5ae246e8509562", - "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562", + "url": "https://api.github.com/repos/symfony/Process/zipball/7856d78ab6cce6e59d02d9e1a873441f6bd21306", + "reference": "7856d78ab6cce6e59d02d9e1a873441f6bd21306", "shasum": "" }, "require": { @@ -2149,21 +2101,21 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/routing", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "1455ec537940f7428ea6aa9411f3c4bca69413a0" + "reference": "dc9df18a1cfe87de65e270e8f01407ca6d7c39cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/1455ec537940f7428ea6aa9411f3c4bca69413a0", - "reference": "1455ec537940f7428ea6aa9411f3c4bca69413a0", + "url": "https://api.github.com/repos/symfony/Routing/zipball/dc9df18a1cfe87de65e270e8f01407ca6d7c39cb", + "reference": "dc9df18a1cfe87de65e270e8f01407ca6d7c39cb", "shasum": "" }, "require": { @@ -2218,21 +2170,21 @@ "uri", "url" ], - "time": "2015-05-02 15:18:45" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/security-core", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Security/Core", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3" + "reference": "1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/d25c17db741f58c0f615e52006a47f6fb23cd9b3", - "reference": "d25c17db741f58c0f615e52006a47f6fb23cd9b3", + "url": "https://api.github.com/repos/symfony/security-core/zipball/1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0", + "reference": "1ad0ee4b2a1ab32924cd0be397f0196b5d47e5d0", "shasum": "" }, "require": { @@ -2271,32 +2223,32 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Security Component - Core Library", - "homepage": "http://symfony.com", - "time": "2015-03-30 15:54:10" + "homepage": "https://symfony.com", + "time": "2015-05-15 13:53:19" }, { "name": "symfony/translation", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "398e0eedcb89243ad34a10d079a4b6ea4c0b61ff" + "reference": "d030b3d8d9699795dbf8c59e915ef879007a4483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/398e0eedcb89243ad34a10d079a4b6ea4c0b61ff", - "reference": "398e0eedcb89243ad34a10d079a4b6ea4c0b61ff", + "url": "https://api.github.com/repos/symfony/Translation/zipball/d030b3d8d9699795dbf8c59e915ef879007a4483", + "reference": "d030b3d8d9699795dbf8c59e915ef879007a4483", "shasum": "" }, "require": { @@ -2341,11 +2293,11 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2015-05-05 16:51:00" + "time": "2015-05-22 14:37:51" }, { "name": "symfony/var-dumper", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/VarDumper", "source": { "type": "git", @@ -2617,6 +2569,73 @@ "validation" ], "time": "2015-05-23 00:03:54" + }, + { + "name": "zizaco/entrust", + "version": "dev-laravel-5", + "source": { + "type": "git", + "url": "https://github.com/Zizaco/entrust.git", + "reference": "804000c1c535221792b4e173ecdcc02b5681f5ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Zizaco/entrust/zipball/804000c1c535221792b4e173ecdcc02b5681f5ec", + "reference": "804000c1c535221792b4e173ecdcc02b5681f5ec", + "shasum": "" + }, + "require": { + "illuminate/console": "~5.0", + "illuminate/support": "~5.0", + "php": ">=5.4.0" + }, + "require-dev": { + "illuminate/database": "~5.0", + "mockery/mockery": "dev-master", + "phpunit/phpunit": "~4.1", + "sami/sami": "dev-master" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/commands" + ], + "psr-4": { + "Zizaco\\Entrust\\": "src/Entrust/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andrew Elkins", + "homepage": "http://andrewelkins.com" + }, + { + "name": "Zizaco Zizuini", + "email": "zizaco@gmail.com" + }, + { + "name": "Ben Batschelet", + "homepage": "http://github.com/bbatsche" + }, + { + "name": "Michele Angioni", + "email": "michele.angioni@gmail.com" + } + ], + "description": "This package provides a flexible way to add Role-based Permissions to Laravel", + "keywords": [ + "acl", + "auth", + "illuminate", + "laravel", + "permission", + "roles" + ], + "time": "2015-05-25 00:17:51" } ], "packages-dev": [ @@ -2848,6 +2867,54 @@ ], "time": "2014-10-13 12:58:55" }, + { + "name": "fzaninotto/faker", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/010c7efedd88bf31141a02719f51fb44c732d5a0", + "reference": "010c7efedd88bf31141a02719f51fb44c732d5a0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-0": { + "Faker": "src/", + "Faker\\PHPUnit": "test/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2014-06-04 14:43:02" + }, { "name": "guzzle/guzzle", "version": "v3.9.3", @@ -3393,16 +3460,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.0.16", + "version": "2.0.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c" + "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/934fd03eb6840508231a7f73eb8940cf32c3b66c", - "reference": "934fd03eb6840508231a7f73eb8940cf32c3b66c", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c4e8e7725e351184a76544634855b8a9c405a6e3", + "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3", "shasum": "" }, "require": { @@ -3451,7 +3518,7 @@ "testing", "xunit" ], - "time": "2015-04-11 04:35:00" + "time": "2015-05-25 05:11:59" }, { "name": "phpunit/php-file-iterator", @@ -3639,16 +3706,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.6.6", + "version": "4.6.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3afe303d873a4d64c62ef84de491b97b006fbdac" + "reference": "57bf06dd4eebe2a5ced79a8de71509e7d5c18b25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3afe303d873a4d64c62ef84de491b97b006fbdac", - "reference": "3afe303d873a4d64c62ef84de491b97b006fbdac", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/57bf06dd4eebe2a5ced79a8de71509e7d5c18b25", + "reference": "57bf06dd4eebe2a5ced79a8de71509e7d5c18b25", "shasum": "" }, "require": { @@ -3707,7 +3774,7 @@ "testing", "xunit" ], - "time": "2015-04-29 15:18:52" + "time": "2015-05-25 05:18:18" }, { "name": "phpunit/phpunit-mock-objects", @@ -4205,17 +4272,17 @@ }, { "name": "symfony/class-loader", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/ClassLoader", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "695134c9b39559297fa5d1dcff6a9054bb56facb" + "reference": "abf5632a31402ae6ac19cd00683faf603046440a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/695134c9b39559297fa5d1dcff6a9054bb56facb", - "reference": "695134c9b39559297fa5d1dcff6a9054bb56facb", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/abf5632a31402ae6ac19cd00683faf603046440a", + "reference": "abf5632a31402ae6ac19cd00683faf603046440a", "shasum": "" }, "require": { @@ -4252,21 +4319,21 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/config", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Config", "source": { "type": "git", "url": "https://github.com/symfony/Config.git", - "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25" + "reference": "2696c5bc7c31485a482c10865d713de9fcc7aa31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25", - "reference": "b6fddb4aa2daaa2b06f0040071ac131b4a1ecf25", + "url": "https://api.github.com/repos/symfony/Config/zipball/2696c5bc7c31485a482c10865d713de9fcc7aa31", + "reference": "2696c5bc7c31485a482c10865d713de9fcc7aa31", "shasum": "" }, "require": { @@ -4303,11 +4370,11 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-15 13:32:45" }, { "name": "symfony/stopwatch", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Stopwatch", "source": { "type": "git", @@ -4357,7 +4424,7 @@ }, { "name": "symfony/yaml", - "version": "v2.6.7", + "version": "v2.6.8", "target-dir": "Symfony/Component/Yaml", "source": { "type": "git", @@ -4410,6 +4477,7 @@ "minimum-stability": "stable", "stability-flags": { "rcrowe/twigbridge": 20, + "zizaco/entrust": 20, "barryvdh/laravel-debugbar": 0 }, "prefer-stable": false, diff --git a/config/app.php b/config/app.php index f0b8a7a614..7c8c30c9c3 100644 --- a/config/app.php +++ b/config/app.php @@ -139,8 +139,9 @@ return [ 'TwigBridge\ServiceProvider', 'DaveJamesMiller\Breadcrumbs\ServiceProvider', - 'Barryvdh\Debugbar\ServiceProvider', - 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', +// 'Barryvdh\Debugbar\ServiceProvider', +// 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', + 'Zizaco\Entrust\EntrustServiceProvider', /* * Application Service Providers... @@ -210,6 +211,7 @@ return [ 'Steam' => 'FireflyIII\Support\Facades\Steam', 'ExpandedForm' => 'FireflyIII\Support\Facades\ExpandedForm', 'Twig' => 'TwigBridge\Facade\Twig', + 'Entrust' => 'Zizaco\Entrust\EntrustFacade' ], diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php new file mode 100644 index 0000000000..c0ee129b55 --- /dev/null +++ b/config/breadcrumbs.php @@ -0,0 +1,7 @@ + 'breadcrumbs::bootstrap3', + +]; diff --git a/config/entrust.php b/config/entrust.php new file mode 100644 index 0000000000..dbc2cc5bdd --- /dev/null +++ b/config/entrust.php @@ -0,0 +1,78 @@ + 'FireflyIII\Models\Role', + + /* + |-------------------------------------------------------------------------- + | Entrust Roles Table + |-------------------------------------------------------------------------- + | + | This is the roles table used by Entrust to save roles to the database. + | + */ + 'roles_table' => 'roles', + + /* + |-------------------------------------------------------------------------- + | Entrust Permission Model + |-------------------------------------------------------------------------- + | + | This is the Permission model used by Entrust to create correct relations. + | Update the permission if it is in a different namespace. + | + */ + 'permission' => 'FireflyIII\Models\Permission', + + /* + |-------------------------------------------------------------------------- + | Entrust Permissions Table + |-------------------------------------------------------------------------- + | + | This is the permissions table used by Entrust to save permissions to the + | database. + | + */ + 'permissions_table' => 'permissions', + + /* + |-------------------------------------------------------------------------- + | Entrust permission_role Table + |-------------------------------------------------------------------------- + | + | This is the permission_role table used by Entrust to save relationship + | between permissions and roles to the database. + | + */ + 'permission_role_table' => 'permission_role', + + /* + |-------------------------------------------------------------------------- + | Entrust role_user Table + |-------------------------------------------------------------------------- + | + | This is the role_user table used by Entrust to save assigned roles to the + | database. + | + */ + 'role_user_table' => 'role_user', + +]; diff --git a/database/migrations/2015_05_28_041652_entrust_setup_tables.php b/database/migrations/2015_05_28_041652_entrust_setup_tables.php new file mode 100644 index 0000000000..ecc3235b11 --- /dev/null +++ b/database/migrations/2015_05_28_041652_entrust_setup_tables.php @@ -0,0 +1,74 @@ +increments('id'); + $table->string('name')->unique(); + $table->string('display_name')->nullable(); + $table->string('description')->nullable(); + $table->timestamps(); + }); + + // Create table for associating roles to users (Many-to-Many) + Schema::create('role_user', function (Blueprint $table) { + $table->integer('user_id')->unsigned(); + $table->integer('role_id')->unsigned(); + + $table->foreign('user_id')->references('id')->on('users') + ->onUpdate('cascade')->onDelete('cascade'); + $table->foreign('role_id')->references('id')->on('roles') + ->onUpdate('cascade')->onDelete('cascade'); + + $table->primary(['user_id', 'role_id']); + }); + + // Create table for storing permissions + Schema::create('permissions', function (Blueprint $table) { + $table->increments('id'); + $table->string('name')->unique(); + $table->string('display_name')->nullable(); + $table->string('description')->nullable(); + $table->timestamps(); + }); + + // Create table for associating permissions to roles (Many-to-Many) + Schema::create('permission_role', function (Blueprint $table) { + $table->integer('permission_id')->unsigned(); + $table->integer('role_id')->unsigned(); + + $table->foreign('permission_id')->references('id')->on('permissions') + ->onUpdate('cascade')->onDelete('cascade'); + $table->foreign('role_id')->references('id')->on('roles') + ->onUpdate('cascade')->onDelete('cascade'); + + $table->primary(['permission_id', 'role_id']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('permission_role'); + Schema::drop('permissions'); + Schema::drop('role_user'); + Schema::drop('roles'); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 4fc3a0b3d2..b857834dd3 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -20,6 +20,7 @@ class DatabaseSeeder extends Seeder $this->call('AccountTypeSeeder'); $this->call('TransactionCurrencySeeder'); $this->call('TransactionTypeSeeder'); + $this->call('PermissionSeeder'); if (App::environment() == 'testing' || App::environment() == 'homestead' || gethostname() == 'vagrant-firefly-iii') { $this->call('TestDataSeeder'); diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php new file mode 100644 index 0000000000..814b670e8d --- /dev/null +++ b/database/seeds/PermissionSeeder.php @@ -0,0 +1,21 @@ +name = 'owner'; + $owner->display_name = 'Site Owner'; + $owner->description = 'User runs this instance of FF3'; // optional + $owner->save(); + + } + +} \ No newline at end of file diff --git a/tests/controllers/CurrencyControllerTest.php b/tests/controllers/CurrencyControllerTest.php index ebe5c5c4a4..50153b50b3 100644 --- a/tests/controllers/CurrencyControllerTest.php +++ b/tests/controllers/CurrencyControllerTest.php @@ -108,6 +108,11 @@ class CurrencyControllerTest extends TestCase public function testDestroy() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); + $this->be($user); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); @@ -126,6 +131,10 @@ class CurrencyControllerTest extends TestCase public function testDestroyUnable() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); $this->be($user); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); @@ -178,6 +187,10 @@ class CurrencyControllerTest extends TestCase public function testStore() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); $this->be($user); @@ -199,6 +212,10 @@ class CurrencyControllerTest extends TestCase public function testStoreAndReturn() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); $this->be($user); @@ -220,6 +237,10 @@ class CurrencyControllerTest extends TestCase public function testUpdate() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); $this->be($user); @@ -239,6 +260,10 @@ class CurrencyControllerTest extends TestCase public function testUpdateAndReturn() { $user = FactoryMuffin::create('FireflyIII\User'); + $role = FactoryMuffin::create('FireflyIII\Models\Role'); + $role->name = 'owner'; + $role->save(); + $user->attachRole($role); $currency = FactoryMuffin::create('FireflyIII\Models\TransactionCurrency'); $this->be($user); diff --git a/tests/factories/all.php b/tests/factories/all.php index fa4e472d90..f9c35f9047 100644 --- a/tests/factories/all.php +++ b/tests/factories/all.php @@ -29,6 +29,13 @@ if (!class_exists('RandomString')) { } } +FactoryMuffin::define( + 'FireflyIII\Models\Role', + [ + 'name' => 'word', + ] +); + FactoryMuffin::define( 'FireflyIII\Models\Bill', [ From 4ae24225a558b9cfa5e57018a0b033945c013b27 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 31 May 2015 20:23:49 +0200 Subject: [PATCH 22/29] Cleanup some modals. --- public/js/budgets.js | 6 +++--- public/js/piggy-banks.js | 4 ++-- resources/lang/en/firefly.php | 1 + resources/lang/nl/firefly.php | 1 + resources/twig/budgets/income.twig | 10 ++++++---- resources/twig/budgets/index.twig | 7 ------- resources/twig/layout/default.twig | 4 ---- resources/twig/piggy-banks/add.twig | 2 +- resources/twig/piggy-banks/index.twig | 8 -------- 9 files changed, 14 insertions(+), 29 deletions(-) diff --git a/public/js/budgets.js b/public/js/budgets.js index 67a7d325a1..52e80dff01 100644 --- a/public/js/budgets.js +++ b/public/js/budgets.js @@ -188,10 +188,10 @@ $(function () { // //} // -function updateIncome() { +function updateIncome(e) { "use strict"; - $('#monthlyBudgetModal').empty().load('budgets/income', function () { - $('#monthlyBudgetModal').modal('show'); + $('#defaultModal').empty().load('budgets/income', function () { + $('#defaultModal').modal('show'); }); return false; diff --git a/public/js/piggy-banks.js b/public/js/piggy-banks.js index d108c41ef2..36fb5d27ff 100644 --- a/public/js/piggy-banks.js +++ b/public/js/piggy-banks.js @@ -50,8 +50,8 @@ $(function () { function addMoney(e) { "use strict"; var pigID = parseInt($(e.target).data('id')); - $('#moneyManagementModal').empty().load('piggy-banks/add/' + pigID, function () { - $('#moneyManagementModal').modal('show'); + $('#defaultModal').empty().load('piggy-banks/add/' + pigID, function () { + $('#defaultModal').modal('show'); }); return false; diff --git a/resources/lang/en/firefly.php b/resources/lang/en/firefly.php index 8f89543fa2..9f99552a15 100644 --- a/resources/lang/en/firefly.php +++ b/resources/lang/en/firefly.php @@ -35,6 +35,7 @@ return [ 'without_budget_between' => 'Transactions without a budget between :start and :end', 'budget_in_month' => ':name in :month', 'delete_budget' => 'Delete budget ":name"', + 'update_amount' => 'Update amount', // bills: 'delete_bill' => 'Delete bill ":name"', diff --git a/resources/lang/nl/firefly.php b/resources/lang/nl/firefly.php index baeed28302..28f289d678 100644 --- a/resources/lang/nl/firefly.php +++ b/resources/lang/nl/firefly.php @@ -35,6 +35,7 @@ return [ 'without_budget_between' => 'Transacties zonder budget tussen :start en :end', 'budget_in_month' => ':name in :month', 'delete_budget' => 'Verwijder budget ":name"', + 'update_amount' => 'Bedrag bijwerken', // bills: 'delete_bill' => 'Verwijder rekening ":name"', diff --git a/resources/twig/budgets/income.twig b/resources/twig/budgets/income.twig index 12cc983ae0..632d63b742 100644 --- a/resources/twig/budgets/income.twig +++ b/resources/twig/budgets/income.twig @@ -4,18 +4,20 @@ +
-
-
{{ getCurrencySymbol() }}
- +
{{ getCurrencySymbol()|raw }}
+
- +
+ diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig index 5601d04dc3..23cdba38d3 100644 --- a/resources/twig/budgets/index.twig +++ b/resources/twig/budgets/index.twig @@ -145,13 +145,6 @@ {% endif %} - - - - {% endblock %} {% block scripts %} From 8254efbd032d7d18c8548ea676409423387d3693 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 31 May 2015 20:24:06 +0200 Subject: [PATCH 23/29] Fix modal. --- public/js/piggy-banks.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/piggy-banks.js b/public/js/piggy-banks.js index 36fb5d27ff..4eb976fbe4 100644 --- a/public/js/piggy-banks.js +++ b/public/js/piggy-banks.js @@ -60,8 +60,8 @@ function addMoney(e) { function removeMoney(e) { "use strict"; var pigID = parseInt($(e.target).data('id')); - $('#moneyManagementModal').empty().load('piggy-banks/remove/' + pigID, function () { - $('#moneyManagementModal').modal('show'); + $('#defaultModal').empty().load('piggy-banks/remove/' + pigID, function () { + $('#defaultModal').modal('show'); }); return false; From 7559efab775eef168519576dbcc87d7e47d1e8d5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 31 May 2015 20:52:20 +0200 Subject: [PATCH 24/29] Update build thing. --- .travis.yml | 2 ++ app/Validation/FireflyValidator.php | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6650fa78c8..a0ca8e95fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,3 +18,5 @@ after_script: - php vendor/bin/coveralls - CODECLIMATE_REPO_TOKEN=26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61 ./vendor/bin/test-reporter --stdout > codeclimate.json - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports" + - wget https://scrutinizer-ci.com/ocular.phar + - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml \ No newline at end of file diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 10b56e5b47..59de869bd8 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -56,13 +56,9 @@ class FireflyValidator extends Validator } /** - * @param $attribute - * @param $value - * @param $parameters - * * @return bool */ - public function validatePiggyBankReminder($attribute, $value, $parameters) + public function validatePiggyBankReminder() { $array = $this->data; // no reminder? dont care. @@ -99,7 +95,6 @@ class FireflyValidator extends Validator { $type = null; - /** * Switch on different cases on which this method can respond: */ From 7a10217511391c3f089c3e579ad74237c1f02b3c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 31 May 2015 20:53:31 +0200 Subject: [PATCH 25/29] New read me and scrutiniser instructions. --- .scrutinizer.yml | 5 +++++ README.md | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .scrutinizer.yml diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000000..8486eef106 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,5 @@ +# .scrutinizer.yml +tools: + external_code_coverage: + timeout: 1800 # Timeout in seconds. + runs: 2 \ No newline at end of file diff --git a/README.md b/README.md index b65ca45eb0..300ea1d6be 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,10 @@ #### 3.4.2 [![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii) -[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii) +[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102) [![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii) [![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master) -[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii) -![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme) ## About "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared @@ -95,3 +93,7 @@ is adding translations. Questions, ideas, bugs or other things to contribute? [Let me know](https://github.com/JC5/firefly-iii/issues/new)! If you like this tool, feel free to [donate me some beer money](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted). + +[![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii) +[![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii) +![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme) \ No newline at end of file From d5cbc17831445e7e60b548e86dd7a54f0a9c1de5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Jun 2015 17:35:03 +0200 Subject: [PATCH 26/29] Update read me. --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 300ea1d6be..3a14ec5540 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # Firefly III #### 3.4.2 -[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=develop)](https://travis-ci.org/JC5/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) -[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102) -[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii) -[![Coverage Status](https://coveralls.io/repos/JC5/firefly-iii/badge.svg?branch=master)](https://coveralls.io/r/JC5/firefly-iii?branch=master) +[![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) +[![Build Status](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/build.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/build-status/master) + ## About "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared @@ -94,6 +93,8 @@ Questions, ideas, bugs or other things to contribute? [Let me know](https://gith If you like this tool, feel free to [donate me some beer money](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted). +[![SensioLabsInsight](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102/mini.png)](https://insight.sensiolabs.com/projects/d44c7012-5f50-41ad-add8-8445330e4102) +[![Code Climate](https://codeclimate.com/github/JC5/firefly-iii/badges/gpa.svg)](https://codeclimate.com/github/JC5/firefly-iii) [![Project Status](http://stillmaintained.com/JC5/firefly-iii.png?a=b)](http://stillmaintained.com/JC5/firefly-iii) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable.svg)](https://packagist.org/packages/grumpydictator/firefly-iii) -![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme) \ No newline at end of file +![GA](https://ga-beacon.appspot.com/UA-58172398-6/firefly-iii/readme) From 25f248c60af69767ebab1a31fb1a7a62b896cd60 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Jun 2015 17:35:48 +0200 Subject: [PATCH 27/29] New read me [skip ci] --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a14ec5540..8c15cedcdb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# Firefly III -#### 3.4.2 +# Firefly III (3.4.2) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) From 71dcebb7442136d830988d4091e24e10d975f0c5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Jun 2015 17:36:13 +0200 Subject: [PATCH 28/29] New read me [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c15cedcdb..97f930c87a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Firefly III (3.4.2) +# Firefly III (v3.4.2) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) From cdef9c3c7e56ef471f317c7351274fc85cb30ceb Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Jun 2015 17:36:53 +0200 Subject: [PATCH 29/29] New version. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97f930c87a..47d7dac02e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Firefly III (v3.4.2) +# Firefly III (v3.4.3) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master)