kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-13 07:53:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2950

Browse Source
This commit is contained in:
James Cole
2020-01-04 06:18:36 +01:00
parent 2fb28669ca
commit be565dd2e5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Chart/DoubleReportController.php
View File

@@ -367,18 +367,18 @@ class DoubleReportController extends Controller
* @param Collection $accounts * @param Collection $accounts
* @param int $id * @param int $id
* @param string $name * @param string $name
* @param string $iban * @param null|string $iban
* *
* @return string * @return string
*/ */
private function getCounterpartName(Collection $accounts, int $id, string $name, string $iban): string private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
{ {
/** @var Account $account */ /** @var Account $account */
foreach ($accounts as $account) { foreach ($accounts as $account) {
if ($account->name === $name && $account->id !== $id) { if ($account->name === $name && $account->id !== $id) {
return $account->name; return $account->name;
} }
if ($account->iban === $iban && $account->id !== $id) { if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
return $account->iban; return $account->iban;
} }
} }

6
app/Http/Controllers/Report/DoubleController.php
View File

@@ -776,18 +776,18 @@ class DoubleController extends Controller
* @param Collection $accounts * @param Collection $accounts
* @param int $id * @param int $id
* @param string $name * @param string $name
* @param string $iban * @param string|null $iban
* *
* @return string * @return string
*/ */
private function getCounterpartName(Collection $accounts, int $id, string $name, string $iban): string private function getCounterpartName(Collection $accounts, int $id, string $name, ?string $iban): string
{ {
/** @var Account $account */ /** @var Account $account */
foreach ($accounts as $account) { foreach ($accounts as $account) {
if ($account->name === $name && $account->id !== $id) { if ($account->name === $name && $account->id !== $id) {
return $account->name; return $account->name;
} }
if ($account->iban === $iban && $account->id !== $id) { if (null !== $account->iban && $account->iban === $iban && $account->id !== $id) {
return $account->iban; return $account->iban;
} }
} }