diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index a06c89b76a..a60f99a696 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -11,9 +11,6 @@ use FireflyIII\Shared\Preferences\PreferencesInterface as Pref; * TODO Find out what constitutes proper camelCase * TODO How is object coupling counted? * - * @SuppressWarnings("CamelCase") - * @SuppressWarnings("TooManyMethods") - * @SuppressWarnings("CouplingBetweenObjects") */ class BudgetController extends BaseController { diff --git a/app/controllers/CategoryController.php b/app/controllers/CategoryController.php index 80913165b4..94e9c9409f 100644 --- a/app/controllers/CategoryController.php +++ b/app/controllers/CategoryController.php @@ -6,8 +6,6 @@ use FireflyIII\Exception\FireflyException; * * TODO Find out what constitutes proper camelCase * - * @SuppressWarnings("CamelCase") - * * Class CategoryController */ class CategoryController extends BaseController diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 659628e16d..61dfe4db66 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -3,8 +3,6 @@ use Carbon\Carbon; use Grumpydictator\Gchart\GChart as GChart; /** - * @SuppressWarnings("CamelCase") - * * Class GoogleChartController */ class GoogleChartController extends BaseController @@ -33,7 +31,7 @@ class GoogleChartController extends BaseController $this->_chart->addColumn('Day of month', 'date'); $this->_chart->addColumn('Balance for ' . $account->name, 'number'); - // TODO this can be combined in some method, it's + // TODO this can be combined in some method, it's coming up quite often, is it? $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end'); $count = $account->transactions()->count(); @@ -48,6 +46,7 @@ class GoogleChartController extends BaseController $start = new Carbon($first->date); $end = new Carbon($last->date); } + // todo until this part. $current = clone $start; @@ -117,55 +116,31 @@ class GoogleChartController extends BaseController $bdt = App::make('FireflyIII\Database\Budget\Budget'); $budgets = $bdt->get(); - /* - * Loop budgets: - */ /** @var Budget $budget */ foreach ($budgets as $budget) { - - /* - * Is there a repetition starting on this particular date? We can use that. - */ /** @var \LimitRepetition $repetition */ $repetition = $bdt->repetitionOnStartingOnDate($budget, Session::get('start', Carbon::now()->startOfMonth())); - - /* - * If there is, use it. Otherwise, forget it. - */ if (is_null($repetition)) { // use the session start and end for our search query $searchStart = Session::get('start', Carbon::now()->startOfMonth()); $searchEnd = Session::get('end'); - // the limit is zero: - $limit = 0; - + $limit = 0; // the limit is zero: } else { // use the limit's start and end for our search query $searchStart = $repetition->startdate; $searchEnd = $repetition->enddate; - // the limit is the repetitions limit: - $limit = floatval($repetition->amount); + $limit = floatval($repetition->amount); // the limit is the repetitions limit: } - /* - * No matter the result of the search for the repetition, get all the transactions associated - * with the budget, and sum up the expenses made. - */ $expenses = floatval($budget->transactionjournals()->before($searchEnd)->after($searchStart)->lessThan(0)->sum('amount')) * -1; if ($expenses > 0) { $this->_chart->addRow($budget->name, $limit, $expenses); } } - /* - * Finally, get all transactions WITHOUT a budget and add those as well. - * (yes this method is oddly specific). - */ $noBudgetSet = $bdt->transactionsWithoutBudgetInDateRange(Session::get('start', Carbon::now()->startOfMonth()), Session::get('end')); $sum = $noBudgetSet->sum('amount') * -1; $this->_chart->addRow('No budget', 0, $sum); - - $this->_chart->generate(); return Response::json($this->_chart->getData()); diff --git a/app/controllers/ProfileController.php b/app/controllers/ProfileController.php index cd4e638f1f..b11bd1b5e6 100644 --- a/app/controllers/ProfileController.php +++ b/app/controllers/ProfileController.php @@ -27,7 +27,6 @@ class ProfileController extends BaseController /** * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View - * @SuppressWarnings("CyclomaticComplexity") */ public function postChangePassword() { diff --git a/app/controllers/ReportController.php b/app/controllers/ReportController.php index 837c71e466..96e806fa0b 100644 --- a/app/controllers/ReportController.php +++ b/app/controllers/ReportController.php @@ -5,8 +5,6 @@ use FireflyIII\Database\TransactionJournal\TransactionJournal as TransactionJour use FireflyIII\Report\ReportInterface as Report; /** - * @SuppressWarnings("CamelCase") - * * * Class ReportController */ @@ -52,9 +50,6 @@ class ReportController extends BaseController * @param $year * @param $month * - * @SuppressWarnings("CyclomaticComplexity") - * @SuppressWarnings("MethodLength") - * * @return \Illuminate\View\View */ public function unbalanced($year, $month) diff --git a/app/database/migrations/2014_06_27_163032_create_users_table.php b/app/database/migrations/2014_06_27_163032_create_users_table.php index ef3ebbabbe..3c72c3ab6c 100644 --- a/app/database/migrations/2014_06_27_163032_create_users_table.php +++ b/app/database/migrations/2014_06_27_163032_create_users_table.php @@ -5,8 +5,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateUsersTable - * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateUsersTable extends Migration { diff --git a/app/database/migrations/2014_06_27_163145_create_account_types_table.php b/app/database/migrations/2014_06_27_163145_create_account_types_table.php index 3c81582a50..7d90098389 100644 --- a/app/database/migrations/2014_06_27_163145_create_account_types_table.php +++ b/app/database/migrations/2014_06_27_163145_create_account_types_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateAccountTypesTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateAccountTypesTable extends Migration { diff --git a/app/database/migrations/2014_06_27_163259_create_accounts_table.php b/app/database/migrations/2014_06_27_163259_create_accounts_table.php index 8a7251f61f..71d3cd8a37 100644 --- a/app/database/migrations/2014_06_27_163259_create_accounts_table.php +++ b/app/database/migrations/2014_06_27_163259_create_accounts_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateAccountsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateAccountsTable extends Migration { diff --git a/app/database/migrations/2014_06_27_163817_create_components_table.php b/app/database/migrations/2014_06_27_163817_create_components_table.php index 605ef98205..2c4852f02c 100644 --- a/app/database/migrations/2014_06_27_163817_create_components_table.php +++ b/app/database/migrations/2014_06_27_163817_create_components_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateComponentsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateComponentsTable extends Migration { diff --git a/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php b/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php index 6c6e6f8c09..5ac466d43e 100644 --- a/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php +++ b/app/database/migrations/2014_06_27_163818_create_piggybanks_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreatePiggybanksTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreatePiggybanksTable extends Migration { diff --git a/app/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php b/app/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php index 8cecacf2e8..a6444da219 100644 --- a/app/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php +++ b/app/database/migrations/2014_06_27_164042_create_transaction_currencies_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateTransactionCurrenciesTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateTransactionCurrenciesTable extends Migration { diff --git a/app/database/migrations/2014_06_27_164512_create_transaction_types_table.php b/app/database/migrations/2014_06_27_164512_create_transaction_types_table.php index 568704210e..77a3d9924c 100644 --- a/app/database/migrations/2014_06_27_164512_create_transaction_types_table.php +++ b/app/database/migrations/2014_06_27_164512_create_transaction_types_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateTransactionTypesTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateTransactionTypesTable extends Migration { diff --git a/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php b/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php index e37936f210..c3e9aea81b 100644 --- a/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php +++ b/app/database/migrations/2014_06_27_164619_create_recurring_transactions_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateRecurringTransactionsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateRecurringTransactionsTable extends Migration { diff --git a/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php b/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php index 7f751797c4..b44af8769c 100644 --- a/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php +++ b/app/database/migrations/2014_06_27_164620_create_transaction_journals_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateTransactionJournalsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateTransactionJournalsTable extends Migration { diff --git a/app/database/migrations/2014_06_27_164836_create_transactions_table.php b/app/database/migrations/2014_06_27_164836_create_transactions_table.php index 38453f93b6..74765c1910 100644 --- a/app/database/migrations/2014_06_27_164836_create_transactions_table.php +++ b/app/database/migrations/2014_06_27_164836_create_transactions_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateTransactionsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateTransactionsTable extends Migration { diff --git a/app/database/migrations/2014_06_27_165344_create_component_transaction_table.php b/app/database/migrations/2014_06_27_165344_create_component_transaction_table.php index 6b1322cc66..d5f73f8444 100644 --- a/app/database/migrations/2014_06_27_165344_create_component_transaction_table.php +++ b/app/database/migrations/2014_06_27_165344_create_component_transaction_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateComponentTransactionTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateComponentTransactionTable extends Migration { diff --git a/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php b/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php index ba819428d3..2069e961a9 100644 --- a/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php +++ b/app/database/migrations/2014_07_05_171326_create_component_transaction_journal_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateComponentTransactionJournalTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateComponentTransactionJournalTable extends Migration { diff --git a/app/database/migrations/2014_07_06_123842_create_preferences_table.php b/app/database/migrations/2014_07_06_123842_create_preferences_table.php index 058c530f2a..61f12090a2 100644 --- a/app/database/migrations/2014_07_06_123842_create_preferences_table.php +++ b/app/database/migrations/2014_07_06_123842_create_preferences_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreatePreferencesTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreatePreferencesTable extends Migration { diff --git a/app/database/migrations/2014_07_09_204843_create_session_table.php b/app/database/migrations/2014_07_09_204843_create_session_table.php index c4423f33cf..3100f7e9b8 100644 --- a/app/database/migrations/2014_07_09_204843_create_session_table.php +++ b/app/database/migrations/2014_07_09_204843_create_session_table.php @@ -5,7 +5,6 @@ use Illuminate\Database\Migrations\Migration; /** * Class CreateSessionTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateSessionTable extends Migration { diff --git a/app/database/migrations/2014_07_17_183717_create_limits_table.php b/app/database/migrations/2014_07_17_183717_create_limits_table.php index fb3dbe3660..fced678780 100644 --- a/app/database/migrations/2014_07_17_183717_create_limits_table.php +++ b/app/database/migrations/2014_07_17_183717_create_limits_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateLimitsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateLimitsTable extends Migration { diff --git a/app/database/migrations/2014_07_19_055011_create_limit_repeat_table.php b/app/database/migrations/2014_07_19_055011_create_limit_repeat_table.php index e69902a3eb..1240cf3657 100644 --- a/app/database/migrations/2014_07_19_055011_create_limit_repeat_table.php +++ b/app/database/migrations/2014_07_19_055011_create_limit_repeat_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateLimitRepeatTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateLimitRepeatTable extends Migration { diff --git a/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php b/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php index b5aade01a5..512387e29b 100644 --- a/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php +++ b/app/database/migrations/2014_08_06_044416_create_component_recurring_transaction_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateComponentRecurringTransactionTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateComponentRecurringTransactionTable extends Migration { diff --git a/app/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php b/app/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php index 5a8fa36282..d285d99487 100644 --- a/app/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php +++ b/app/database/migrations/2014_08_12_173919_create_piggybank_repetitions_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreatePiggyInstance * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreatePiggybankRepetitionsTable extends Migration { diff --git a/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php b/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php index f598185157..480f09d658 100644 --- a/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php +++ b/app/database/migrations/2014_08_18_100330_create_piggybank_events_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreatePiggybankEventsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreatePiggybankEventsTable extends Migration { diff --git a/app/database/migrations/2014_08_23_113221_create_reminders_table.php b/app/database/migrations/2014_08_23_113221_create_reminders_table.php index 7a3cbc0997..8d231aac04 100644 --- a/app/database/migrations/2014_08_23_113221_create_reminders_table.php +++ b/app/database/migrations/2014_08_23_113221_create_reminders_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateRemindersTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateRemindersTable extends Migration { diff --git a/app/database/migrations/2014_11_10_172053_create_account_meta_table.php b/app/database/migrations/2014_11_10_172053_create_account_meta_table.php index e465b7a5eb..0cbc84ae4d 100644 --- a/app/database/migrations/2014_11_10_172053_create_account_meta_table.php +++ b/app/database/migrations/2014_11_10_172053_create_account_meta_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateAccountMetaTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateAccountMetaTable extends Migration { diff --git a/app/database/migrations/2014_11_29_135749_create_transaction_groups_table.php b/app/database/migrations/2014_11_29_135749_create_transaction_groups_table.php index 31dca7cda5..acba3c84ce 100644 --- a/app/database/migrations/2014_11_29_135749_create_transaction_groups_table.php +++ b/app/database/migrations/2014_11_29_135749_create_transaction_groups_table.php @@ -6,7 +6,6 @@ use Illuminate\Database\Schema\Blueprint; /** * Class CreateTransactionGroupsTable * - * @SuppressWarnings(PHPMD.ShortMethodName) */ class CreateTransactionGroupsTable extends Migration { diff --git a/app/database/migrations/2014_12_13_190730_changes_for_v321.php b/app/database/migrations/2014_12_13_190730_changes_for_v321.php index 5b7f33e267..6e44cf697a 100644 --- a/app/database/migrations/2014_12_13_190730_changes_for_v321.php +++ b/app/database/migrations/2014_12_13_190730_changes_for_v321.php @@ -4,7 +4,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; /** - * SuppressWarnings(PHPMD.ShortMethodName) * Down: * 1. Create new Components based on Budgets. * 2. Create new Components based on Categories diff --git a/app/lib/FireflyIII/Database/Account/Account.php b/app/lib/FireflyIII/Database/Account/Account.php index 586ad3d087..8be9cf9766 100644 --- a/app/lib/FireflyIII/Database/Account/Account.php +++ b/app/lib/FireflyIII/Database/Account/Account.php @@ -459,13 +459,13 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent */ - public function find($id) + public function find($objectId) { - return $this->getUser()->accounts()->find($id); + return $this->getUser()->accounts()->find($objectId); } /** diff --git a/app/lib/FireflyIII/Database/AccountType/AccountType.php b/app/lib/FireflyIII/Database/AccountType/AccountType.php index 53b52918af..97d126668c 100644 --- a/app/lib/FireflyIII/Database/AccountType/AccountType.php +++ b/app/lib/FireflyIII/Database/AccountType/AccountType.php @@ -71,12 +71,12 @@ class AccountType implements CUD, CommonDatabaseCalls /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Database/Budget/Budget.php b/app/lib/FireflyIII/Database/Budget/Budget.php index bb9677462b..cd241657dc 100644 --- a/app/lib/FireflyIII/Database/Budget/Budget.php +++ b/app/lib/FireflyIII/Database/Budget/Budget.php @@ -100,13 +100,13 @@ class Budget implements CUD, CommonDatabaseCalls, BudgetInterface /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent */ - public function find($id) + public function find($objectId) { - return $this->getUser()->budgets()->find($id); + return $this->getUser()->budgets()->find($objectId); } /** diff --git a/app/lib/FireflyIII/Database/Category/Category.php b/app/lib/FireflyIII/Database/Category/Category.php index 8e0d5d000f..811f1615c6 100644 --- a/app/lib/FireflyIII/Database/Category/Category.php +++ b/app/lib/FireflyIII/Database/Category/Category.php @@ -107,12 +107,12 @@ class Category implements CUD, CommonDatabaseCalls /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php b/app/lib/FireflyIII/Database/CommonDatabaseCalls.php index cfd1214c8f..21374952b1 100644 --- a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php +++ b/app/lib/FireflyIII/Database/CommonDatabaseCalls.php @@ -16,11 +16,11 @@ interface CommonDatabaseCalls /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent */ - public function find($id); + public function find($objectId); /** * Finds an account type using one of the "$what"'s: expense, asset, revenue, opening, etc. @@ -39,10 +39,10 @@ interface CommonDatabaseCalls public function get(); /** - * @param array $ids + * @param array $objectIds * * @return Collection */ - public function getByIds(array $ids); + public function getByIds(array $objectIds); } \ No newline at end of file diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php index 7d9c2d4464..e5f030eb45 100644 --- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php +++ b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php @@ -89,10 +89,6 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface * * Ignore PHPMD rules because Laravel 5.0 will make this method superfluous anyway. * - * @SuppressWarnings("Cyclomatic") - * @SuppressWarnings("NPath") - * @SuppressWarnings("MethodLength") - * * @param array $model * * @return array @@ -175,14 +171,14 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent */ - public function find($id) + public function find($objectId) { return \Piggybank:: - leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $id)->where('accounts.user_id', $this->getUser()->id) + leftJoin('accounts', 'accounts.id', '=', 'piggybanks.account_id')->where('piggybanks.id', '=', $objectId)->where('accounts.user_id', $this->getUser()->id) ->first(['piggybanks.*']); } @@ -246,6 +242,7 @@ class PiggyBank implements CUD, CommonDatabaseCalls, PiggyBankInterface if ($date >= $rep->startdate && $date <= $rep->targetdate) { return $rep; } + return null; } ); if ($repetitions->count() == 0) { diff --git a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php index 9c7f774893..1d0b136137 100644 --- a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php +++ b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php @@ -153,9 +153,6 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface * * * ignored because this method will be gone soon. - * @SuppressWarnings("Cyclomatic") - * @SuppressWarnings("NPath") - * @SuppressWarnings("MethodLength") * * @param array $model * @@ -250,12 +247,12 @@ class RepeatedExpense implements CUD, CommonDatabaseCalls, PiggyBankInterface /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php index 446a0926f4..b2b6301430 100644 --- a/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php +++ b/app/lib/FireflyIII/Database/RecurringTransaction/RecurringTransaction.php @@ -103,9 +103,6 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac * errors/warnings/successes. * * ignored because this method will be gone soon. - * @SuppressWarnings("Cyclomatic") - * @SuppressWarnings("NPath") - * @SuppressWarnings("MethodLength") * * @param array $model * @@ -169,12 +166,12 @@ class RecurringTransaction implements CUD, CommonDatabaseCalls, RecurringTransac /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Database/Transaction/Transaction.php b/app/lib/FireflyIII/Database/Transaction/Transaction.php index 76b3152c36..5abd79306c 100644 --- a/app/lib/FireflyIII/Database/Transaction/Transaction.php +++ b/app/lib/FireflyIII/Database/Transaction/Transaction.php @@ -96,12 +96,12 @@ class Transaction implements CUD, CommonDatabaseCalls /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php index 1953566272..b3d8937c6f 100644 --- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php +++ b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php @@ -108,7 +108,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData $this->storeCategory($data, $model); /* - * TODO move to transaction thing. * Now we can update the transactions related to this journal. */ $amount = floatval($data['amount']); @@ -136,9 +135,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData * errors/warnings/successes. * * ignored because this method will be gone soon. - * @SuppressWarnings("Cyclomatic") - * @SuppressWarnings("NPath") - * @SuppressWarnings("MethodLength") * * @param array $model * @@ -256,27 +252,6 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData break; } - // if (isset($model['to_id']) && intval($model['to_id']) < 1) { - // $errors->add('account_to', 'Invalid to-account'); - // } - // - // if (isset($model['from_id']) && intval($model['from_id']) < 1) { - // $errors->add('account_from', 'Invalid from-account'); - // - // } - // if (isset($model['account_id']) && intval($model['account_id']) < 1) { - // $errors->add('account_id', 'Invalid account!'); - // } - // if (isset($model['to']) && !($model['to'] instanceof \Account)) { - // $errors->add('account_to', 'Invalid to-account'); - // } - // if (isset($model['from']) && !($model['from'] instanceof \Account)) { - // $errors->add('account_from', 'Invalid from-account'); - // } - // if (!isset($model['amount']) || (isset($model['amount']) && floatval($model['amount']) < 0)) { - // $errors->add('amount', 'Invalid amount'); - // } - $validator = \Validator::make([$model], \TransactionJournal::$rules); if ($validator->invalid()) { @@ -419,13 +394,13 @@ class TransactionJournal implements TransactionJournalInterface, CUD, CommonData /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent */ - public function find($id) + public function find($objectId) { - return $this->getUser()->transactionjournals()->find($id); + return $this->getUser()->transactionjournals()->find($objectId); } /** diff --git a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php index a38b3f6be5..1ac0a546c7 100644 --- a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php +++ b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php @@ -73,12 +73,12 @@ class TransactionType implements CUD, CommonDatabaseCalls /** * Returns an object with id $id. * - * @param int $id + * @param int $objectId * * @return \Eloquent * @throws NotImplementedException */ - public function find($id) + public function find($objectId) { // TODO: Implement find() method. throw new NotImplementedException; diff --git a/app/lib/FireflyIII/Report/Report.php b/app/lib/FireflyIII/Report/Report.php index 968481fe0c..8638ae20b0 100644 --- a/app/lib/FireflyIII/Report/Report.php +++ b/app/lib/FireflyIII/Report/Report.php @@ -12,7 +12,6 @@ use Illuminate\Support\Collection; /** * Class Report * - * @SuppressWarnings("CamelCase") * * @package FireflyIII\Report */ diff --git a/app/lib/FireflyIII/Shared/Toolkit/Date.php b/app/lib/FireflyIII/Shared/Toolkit/Date.php index 40d179e897..347a9b3c85 100644 --- a/app/lib/FireflyIII/Shared/Toolkit/Date.php +++ b/app/lib/FireflyIII/Shared/Toolkit/Date.php @@ -9,7 +9,6 @@ use FireflyIII\Exception\FireflyException; * Class Date * * @package FireflyIII\Shared\Toolkit - * @SuppressWarnings("ExcessiveClassComplexity") */ class Date { @@ -17,7 +16,6 @@ class Date * @param Carbon $theDate * @param $repeatFreq * @param $skip - * @SuppressWarnings("Cyclomatic") * * @return Carbon * @throws FireflyException @@ -63,7 +61,6 @@ class Date /** * @param Carbon $theCurrentEnd * @param $repeatFreq - * @SuppressWarnings("Cyclomatic") * * @return mixed * @throws FireflyException @@ -106,8 +103,6 @@ class Date * @param Carbon $theCurrentEnd * @param $repeatFreq * @param Carbon $maxDate - * @SuppressWarnings("Cyclomatic") - * @SuppressWarnings("MethodLength") * * @return mixed * @throws FireflyException @@ -156,7 +151,6 @@ class Date /** * @param Carbon $date * @param $repeatFrequency - * @SuppressWarnings("Cyclomatic") * * @return string * @throws FireflyException @@ -191,7 +185,6 @@ class Date /** * @param Carbon $theDate * @param $repeatFreq - * @SuppressWarnings("Cyclomatic") * * @return Carbon * @throws FireflyException @@ -238,7 +231,6 @@ class Date * @param Carbon $theDate * @param $repeatFreq * @param int $subtract - * @SuppressWarnings("Cyclomatic") * * @return Carbon * @throws FireflyException diff --git a/app/lib/FireflyIII/Shared/Toolkit/Filter.php b/app/lib/FireflyIII/Shared/Toolkit/Filter.php index a1eca8c741..0db6bb5d8a 100644 --- a/app/lib/FireflyIII/Shared/Toolkit/Filter.php +++ b/app/lib/FireflyIII/Shared/Toolkit/Filter.php @@ -63,7 +63,6 @@ class Filter /** * @param $range * @param Carbon $start - * @SuppressWarnings("Cyclomatic") * * @return Carbon * @throws FireflyException @@ -189,7 +188,6 @@ class Filter /** * @param $range * @param Carbon $date - * @SuppressWarnings("CyclomaticComplexity") * * @return Carbon * @throws FireflyException diff --git a/app/lib/FireflyIII/Shared/Toolkit/Form.php b/app/lib/FireflyIII/Shared/Toolkit/Form.php index a3a7d58376..c610ab8657 100644 --- a/app/lib/FireflyIII/Shared/Toolkit/Form.php +++ b/app/lib/FireflyIII/Shared/Toolkit/Form.php @@ -16,7 +16,6 @@ class Form * * @param Collection $set * @param bool $addEmpty - * @SuppressWarnings("CyclomaticComplexity") * * @return mixed */ diff --git a/app/models/Component.php b/app/models/Component.php index 80157f7c1f..726e80e68e 100644 --- a/app/models/Component.php +++ b/app/models/Component.php @@ -1,7 +1,4 @@ 0) { return '€ ' . $string . ''; } - if ($amount < 0) { - return '€ ' . $string . ''; - } + + return '€ ' . $string . ''; } return '€ ' . $string;