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

chore: code cleanup.

Browse Source
This commit is contained in:
James Cole
2023-05-29 13:56:55 +02:00
parent 7f7644c92f
commit 1b52147a05
295 changed files with 12418 additions and 12324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Transformers/V2/AccountTransformer.php
View File

@@ -73,19 +73,6 @@ class AccountTransformer extends AbstractTransformer
}
}
/**
* @return Carbon
*/
private function getDate(): Carbon
{
$date = today(config('app.timezone'));
if (null !== $this->parameters->get('date')) {
$date = $this->parameters->get('date');
}
return $date;
}
/**
* Transform the account.
*
@@ -146,4 +133,17 @@ class AccountTransformer extends AbstractTransformer
],
];
}
/**
* @return Carbon
*/
private function getDate(): Carbon
{
$date = today(config('app.timezone'));
if (null !== $this->parameters->get('date')) {
$date = $this->parameters->get('date');
}
return $date;
}
}

102
app/Transformers/V2/TransactionGroupTransformer.php
View File

@@ -104,17 +104,52 @@ class TransactionGroupTransformer extends AbstractTransformer
}
/**
* @param array $transactions
* @return array
* @param string|null $string
* @return Carbon|null
*/
private function transformTransactions(array $transactions): array
private function date(?string $string): ?Carbon
{
$return = [];
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return[] = $this->transformTransaction($transaction);
if (null === $string) {
return null;
}
return $return;
Log::debug(sprintf('Now in date("%s")', $string));
if (10 === strlen($string)) {
return Carbon::createFromFormat('Y-m-d', $string, config('app.timezone'));
}
// 2022-01-01 01:01:01
return Carbon::createFromFormat('Y-m-d H:i:s', substr($string, 0, 19), config('app.timezone'));
}
/**
* TODO also in the old transformer.
*
* @param NullArrayObject $array
* @param string $key
* @param string|null $default
*
* @return string|null
*/
private function stringFromArray(NullArrayObject $array, string $key, ?string $default): ?string
{
//Log::debug(sprintf('%s: %s', $key, var_export($array[$key], true)));
if (null === $array[$key] && null === $default) {
return null;
}
if (0 === $array[$key]) {
return $default;
}
if ('0' === $array[$key]) {
return $default;
}
if (null !== $array[$key]) {
return (string)$array[$key];
}
if (null !== $default) {
return $default;
}
return null;
}
private function transformTransaction(array $transaction): array
@@ -229,51 +264,16 @@ class TransactionGroupTransformer extends AbstractTransformer
}
/**
* TODO also in the old transformer.
*
* @param NullArrayObject $array
* @param string $key
* @param string|null $default
*
* @return string|null
* @param array $transactions
* @return array
*/
private function stringFromArray(NullArrayObject $array, string $key, ?string $default): ?string
private function transformTransactions(array $transactions): array
{
//Log::debug(sprintf('%s: %s', $key, var_export($array[$key], true)));
if (null === $array[$key] && null === $default) {
return null;
$return = [];
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return[] = $this->transformTransaction($transaction);
}
if (0 === $array[$key]) {
return $default;
}
if ('0' === $array[$key]) {
return $default;
}
if (null !== $array[$key]) {
return (string)$array[$key];
}
if (null !== $default) {
return $default;
}
return null;
}
/**
* @param string|null $string
* @return Carbon|null
*/
private function date(?string $string): ?Carbon
{
if (null === $string) {
return null;
}
Log::debug(sprintf('Now in date("%s")', $string));
if (10 === strlen($string)) {
return Carbon::createFromFormat('Y-m-d', $string, config('app.timezone'));
}
// 2022-01-01 01:01:01
return Carbon::createFromFormat('Y-m-d H:i:s', substr($string, 0, 19), config('app.timezone'));
return $return;
}
}