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

Removed previous warning suppressions.

Browse Source
This commit is contained in:
James Cole
2014-12-19 21:18:42 +01:00
parent 30ac62ffb7
commit 1a0cbbdb31
45 changed files with 35 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
View File

@@ -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) {