kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Various code quality improvements.

Browse Source
This commit is contained in:
James Cole
2020-08-01 17:51:52 +02:00
parent ae7cd76d87
commit 1169c5c5e2
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Factory/BillFactory.php
View File

@@ -59,15 +59,15 @@ class BillFactory
/**
* @param array $data
*
* @throws FireflyException
* @return Bill|null
* @throws FireflyException
*/
public function create(array $data): ?Bill
{
/** @var TransactionCurrencyFactory $factory */
$factory = app(TransactionCurrencyFactory::class);
/** @var TransactionCurrency $currency */
$currency = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null));
$currency = $factory->find((int)($data['currency_id'] ?? null), (string)($data['currency_code'] ?? null));
if (null === $currency) {
$currency = app('amount')->getDefaultCurrencyByUser($this->user);
@@ -95,8 +95,8 @@ class BillFactory
throw new FireflyException('400000: Could not store bill.');
}
if (isset($data['notes'])) {
$this->updateNote($bill, $data['notes']);
if (array_key_exists('notes', $data)) {
$this->updateNote($bill, (string)$data['notes']);
}
$objectGroupTitle = $data['object_group'] ?? '';
@@ -108,7 +108,7 @@ class BillFactory
}
}
// try also with ID:
$objectGroupId = (int) ($data['object_group_id'] ?? 0);
$objectGroupId = (int)($data['object_group_id'] ?? 0);
if (0 !== $objectGroupId) {
$objectGroup = $this->findObjectGroupById($objectGroupId);
if (null !== $objectGroup) {
@@ -128,8 +128,8 @@ class BillFactory
*/
public function find(?int $billId, ?string $billName): ?Bill
{
$billId = (int) $billId;
$billName = (string) $billName;
$billId = (int)$billId;
$billName = (string)$billName;
$bill = null;
// first find by ID:
if ($billId > 0) {

30
app/Factory/TransactionJournalFactory.php
View File

@@ -57,8 +57,8 @@ class TransactionJournalFactory
use JournalServiceTrait;
private AccountRepositoryInterface $accountRepository;
private AccountValidator $accountValidator;
private BillRepositoryInterface $billRepository;
private AccountValidator $accountValidator;
private BillRepositoryInterface $billRepository;
/** @var CurrencyRepositoryInterface */
private $currencyRepository;
/** @var bool */
@@ -87,7 +87,7 @@ class TransactionJournalFactory
{
$this->errorOnHash = false;
// TODO move valid meta fields to config.
$this->fields = [
$this->fields = [
// sepa
'sepa_cc', 'sepa_ct_op', 'sepa_ct_id',
'sepa_db', 'sepa_country', 'sepa_ep',
@@ -128,9 +128,9 @@ class TransactionJournalFactory
*
* @param array $data
*
* @throws DuplicateTransactionException
* @throws FireflyException
* @return Collection
* @throws FireflyException
* @throws DuplicateTransactionException
*/
public function create(array $data): Collection
{
@@ -246,9 +246,9 @@ class TransactionJournalFactory
/**
* @param NullArrayObject $row
*
* @throws FireflyException
* @throws DuplicateTransactionException
* @return TransactionJournal|null
* @throws DuplicateTransactionException
* @throws FireflyException
*/
private function createJournal(NullArrayObject $row): ?TransactionJournal
{
@@ -306,10 +306,10 @@ class TransactionJournalFactory
Log::debug('Now calling getAccount for the destination.');
$destinationAccount = $this->getAccount($type->type, 'destination', $destInfo);
Log::debug('Done with getAccount(2x)');
$currency = $this->getCurrencyByAccount($type->type, $currency, $sourceAccount, $destinationAccount);
$foreignCurrency = $this->compareCurrencies($currency, $foreignCurrency);
$foreignCurrency = $this->getForeignByAccount($type->type, $foreignCurrency, $destinationAccount);
$description = $this->getDescription($description);
$currency = $this->getCurrencyByAccount($type->type, $currency, $sourceAccount, $destinationAccount);
$foreignCurrency = $this->compareCurrencies($currency, $foreignCurrency);
$foreignCurrency = $this->getForeignByAccount($type->type, $foreignCurrency, $destinationAccount);
$description = $this->getDescription($description);
/** Create a basic journal. */
$journal = TransactionJournal::create(
@@ -596,8 +596,8 @@ class TransactionJournalFactory
$this->accountValidator->setTransactionType($transactionType);
// validate source account.
$sourceId = isset($data['source_id']) ? (int) $data['source_id'] : null;
$sourceName = isset($data['source_name']) ? (string) $data['source_name'] : null;
$sourceId = array_key_exists('source_id', $data) ? (int) $data['source_id'] : null;
$sourceName = array_key_exists('source_name', $data) ? (string) $data['source_name'] : null;
$validSource = $this->accountValidator->validateSource($sourceId, $sourceName, null);
// do something with result:
@@ -606,8 +606,8 @@ class TransactionJournalFactory
}
Log::debug('Source seems valid.');
// validate destination account
$destinationId = isset($data['destination_id']) ? (int) $data['destination_id'] : null;
$destinationName = isset($data['destination_name']) ? (string) $data['destination_name'] : null;
$destinationId = array_key_exists('destination_id', $data) ? (int) $data['destination_id'] : null;
$destinationName = array_key_exists('destination_name', $data) ? (string) $data['destination_name'] : null;
$validDestination = $this->accountValidator->validateDestination($destinationId, $destinationName, null);
// do something with result:
if (false === $validDestination) {