kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-02 14:50:17 +02:00
parent 379b104778
commit fa7ab45a40
100 changed files with 440 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Rules/BelongsUser.php
View File

@@ -72,11 +72,11 @@ class BelongsUser implements Rule
if (!auth()->check()) {
return true; // @codeCoverageIgnore
}
$attribute = strval($attribute);
$attribute = (string)$attribute;
switch ($attribute) {
case 'piggy_bank_id':
$count = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')
->where('piggy_banks.id', '=', intval($value))
->where('piggy_banks.id', '=', (int)$value)
->where('accounts.user_id', '=', auth()->user()->id)->count();
return $count === 1;
@@ -87,7 +87,7 @@ class BelongsUser implements Rule
return $count === 1;
break;
case 'bill_id':
$count = Bill::where('id', '=', intval($value))->where('user_id', '=', auth()->user()->id)->count();
$count = Bill::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count();
return $count === 1;
case 'bill_name':
@@ -96,12 +96,12 @@ class BelongsUser implements Rule
return $count === 1;
break;
case 'budget_id':
$count = Budget::where('id', '=', intval($value))->where('user_id', '=', auth()->user()->id)->count();
$count = Budget::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count();
return $count === 1;
break;
case 'category_id':
$count = Category::where('id', '=', intval($value))->where('user_id', '=', auth()->user()->id)->count();
$count = Category::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count();
return $count === 1;
break;
@@ -112,7 +112,7 @@ class BelongsUser implements Rule
break;
case 'source_id':
case 'destination_id':
$count = Account::where('id', '=', intval($value))->where('user_id', '=', auth()->user()->id)->count();
$count = Account::where('id', '=', (int)$value)->where('user_id', '=', auth()->user()->id)->count();
return $count === 1;
break;
@@ -143,7 +143,7 @@ class BelongsUser implements Rule
}
$count = 0;
foreach ($objects as $object) {
if (trim(strval($object->$field)) === trim($value)) {
if (trim((string)$object->$field) === trim($value)) {
$count++;
}
}

4
app/Rules/UniqueIban.php
View File

@@ -76,7 +76,7 @@ class UniqueIban implements Rule
if (!auth()->check()) {
return true; // @codeCoverageIgnore
}
if (is_null($this->expectedType)) {
if (null === $this->expectedType) {
return true;
}
$maxCounts = [
@@ -114,7 +114,7 @@ class UniqueIban implements Rule
->accounts()
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
->where('account_types.type', $type);
if (!is_null($this->account)) {
if (null !== $this->account) {
$query->where('accounts.id', '!=', $this->account->id);
}
$result = $query->get(['accounts.*']);