gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 20:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-02 15:10:40 +02:00
parent fa7ab45a40
commit a3c34e6b3c
151 changed files with 802 additions and 990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Import/Object/ImportAccount.php
View File

@@ -49,7 +49,7 @@ class ImportAccount
/** @var int */
private $defaultAccountId = 0;
/** @var string */
private $expectedType = '';
private $expectedType;
/**
* This value is used to indicate the other account ID (the opposing transaction's account),
* if it is know. If so, this particular import account may never return an Account with this ID.
@@ -299,19 +299,19 @@ class ImportAccount
/** @var AccountType $accountType */
$accountType = $this->repository->getAccountType($this->expectedType);
$result = $this->findById($accountType);
if (!is_null($result)) {
if (null !== $result) {
return $result;
}
$result = $this->findByIBAN($accountType);
if (!is_null($result)) {
if (null !== $result) {
return $result;
}
$result = $this->findByName($accountType);
if (!is_null($result)) {
if (null !== $result) {
return $result;
}
@@ -365,7 +365,7 @@ class ImportAccount
Log::debug('Finding a mapped account based on', $array);
$search = intval($array['mapped'] ?? 0);
$search = (int)($array['mapped'] ?? 0.0);
$account = $this->repository->findNull($search);
if (null === $account) {
@@ -401,10 +401,10 @@ class ImportAccount
*/
private function store(): bool
{
if (is_null($this->user)) {
if (null === $this->user) {
throw new FireflyException('ImportAccount cannot continue without user.');
}
if ((is_null($this->defaultAccountId) || 0 === intval($this->defaultAccountId)) && AccountType::ASSET === $this->expectedType) {
if ((null === $this->defaultAccountId || 0 === (int)$this->defaultAccountId) && AccountType::ASSET === $this->expectedType) {
throw new FireflyException('ImportAccount cannot continue without a default account to fall back on.');
}
// 1: find mapped object: