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

chore: reformat code.

Browse Source
This commit is contained in:
James Cole
2023-06-21 12:34:58 +02:00
parent 8d87abde64
commit 3dcb35710b
799 changed files with 23319 additions and 22173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Transformers/V2/AbstractTransformer.php
View File

@@ -36,7 +36,7 @@ abstract class AbstractTransformer extends TransformerAbstract
protected ParameterBag $parameters;
/**
* @param Collection $objects
* @param Collection $objects
* @return void
*/
abstract public function collectMetaData(Collection $objects): void;
@@ -51,7 +51,7 @@ abstract class AbstractTransformer extends TransformerAbstract
}
/**
* @param ParameterBag $parameters
* @param ParameterBag $parameters
*/
final public function setParameters(ParameterBag $parameters): void
{

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

@@ -73,10 +73,23 @@ 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.
*
* @param Account $account
* @param Account $account
*
* @return array
*/
@@ -128,22 +141,9 @@ class AccountTransformer extends AbstractTransformer
'links' => [
[
'rel' => 'self',
'uri' => '/accounts/'.$account->id,
'uri' => '/accounts/' . $account->id,
],
],
];
}
/**
* @return Carbon
*/
private function getDate(): Carbon
{
$date = today(config('app.timezone'));
if (null !== $this->parameters->get('date')) {
$date = $this->parameters->get('date');
}
return $date;
}
}

4
app/Transformers/V2/BudgetLimitTransformer.php
View File

@@ -49,7 +49,7 @@ class BudgetLimitTransformer extends AbstractTransformer
/**
* Include Budget
*
* @param BudgetLimit $limit
* @param BudgetLimit $limit
*
* @return Item
*/
@@ -61,7 +61,7 @@ class BudgetLimitTransformer extends AbstractTransformer
/**
* Transform the note.
*
* @param BudgetLimit $budgetLimit
* @param BudgetLimit $budgetLimit
*
* @return array
*/

4
app/Transformers/V2/BudgetTransformer.php
View File

@@ -58,7 +58,7 @@ class BudgetTransformer extends AbstractTransformer
/**
* Transform a budget.
*
* @param Budget $budget
* @param Budget $budget
*
* @return array
*/
@@ -117,7 +117,7 @@ class BudgetTransformer extends AbstractTransformer
}
/**
* @param array $array
* @param array $array
*
* @return array
*/

2
app/Transformers/V2/PreferenceTransformer.php
View File

@@ -42,7 +42,7 @@ class PreferenceTransformer extends AbstractTransformer
/**
* Transform the preference
*
* @param Preference $preference
* @param Preference $preference
*
* @return array
*/

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

@@ -80,7 +80,7 @@ class TransactionGroupTransformer extends AbstractTransformer
}
/**
* @param array $group
* @param array $group
*
* @return array
*/
@@ -104,52 +104,17 @@ class TransactionGroupTransformer extends AbstractTransformer
}
/**
* @param string|null $string
* @return Carbon|null
* @param array $transactions
* @return array
*/
private function date(?string $string): ?Carbon
private function transformTransactions(array $transactions): array
{
if (null === $string) {
return null;
$return = [];
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return[] = $this->transformTransaction($transaction);
}
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;
return $return;
}
private function transformTransaction(array $transaction): array
@@ -264,16 +229,51 @@ class TransactionGroupTransformer extends AbstractTransformer
}
/**
* @param array $transactions
* @return array
* TODO also in the old transformer.
*
* @param NullArrayObject $array
* @param string $key
* @param string|null $default
*
* @return string|null
*/
private function transformTransactions(array $transactions): array
private function stringFromArray(NullArrayObject $array, string $key, ?string $default): ?string
{
$return = [];
/** @var array $transaction */
foreach ($transactions as $transaction) {
$return[] = $this->transformTransaction($transaction);
//Log::debug(sprintf('%s: %s', $key, var_export($array[$key], true)));
if (null === $array[$key] && null === $default) {
return null;
}
return $return;
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'));
}
}