IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix phpstan errors

Browse Source
This commit is contained in:
James Cole 2023-11-26 12:24:37 +01:00
parent 938446ede3
commit 846c60fb85
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
10 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.ci/phpmd/composer.lock generated
View File

@ -396,16 +396,16 @@
},
{
"name": "symfony/config",
"version": "v6.3.2",
"version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
"reference": "b47ca238b03e7b0d7880ffd1cf06e8d637ca1467"
"reference": "b7a63887960359e5b59b15826fa9f9be10acbe88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/config/zipball/b47ca238b03e7b0d7880ffd1cf06e8d637ca1467",
"reference": "b47ca238b03e7b0d7880ffd1cf06e8d637ca1467",
"url": "https://api.github.com/repos/symfony/config/zipball/b7a63887960359e5b59b15826fa9f9be10acbe88",
"reference": "b7a63887960359e5b59b15826fa9f9be10acbe88",
"shasum": ""
},
"require": {
@ -451,7 +451,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/config/tree/v6.3.2"
"source": "https://github.com/symfony/config/tree/v6.3.8"
},
"funding": [
{
@ -467,20 +467,20 @@
"type": "tidelift"
}
],
"time": "2023-07-19T20:22:16+00:00"
"time": "2023-11-09T08:28:21+00:00"
},
{
"name": "symfony/dependency-injection",
"version": "v6.3.5",
"version": "v6.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
"reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993"
"reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed62b3bf98346e1f45529a7b6be2196739bb993",
"reference": "2ed62b3bf98346e1f45529a7b6be2196739bb993",
"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/1f30f545c4151f611148fc19e28d54d39e0a00bc",
"reference": "1f30f545c4151f611148fc19e28d54d39e0a00bc",
"shasum": ""
},
"require": {
@ -532,7 +532,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/dependency-injection/tree/v6.3.5"
"source": "https://github.com/symfony/dependency-injection/tree/v6.3.8"
},
"funding": [
{
@ -548,11 +548,11 @@
"type": "tidelift"
}
],
"time": "2023-09-25T16:46:40+00:00"
"time": "2023-10-31T08:07:48+00:00"
},
{
"name": "symfony/deprecation-contracts",
"version": "v3.3.0",
"version": "v3.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/deprecation-contracts.git",
@ -599,7 +599,7 @@
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
"source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0"
},
"funding": [
{
@ -847,16 +847,16 @@
},
{
"name": "symfony/service-contracts",
"version": "v3.3.0",
"version": "v3.4.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
"reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
"reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
"reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
"url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
"reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838",
"shasum": ""
},
"require": {
@ -909,7 +909,7 @@
"standards"
],
"support": {
"source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
"source": "https://github.com/symfony/service-contracts/tree/v3.4.0"
},
"funding": [
{
@ -925,7 +925,7 @@
"type": "tidelift"
}
],
"time": "2023-05-23T14:45:45+00:00"
"time": "2023-07-30T20:28:31+00:00"
},
{
"name": "symfony/var-exporter",

18
.ci/phpmd/phpmd.xml
View File

@ -32,10 +32,22 @@
<!-- clean code -->
<!-- <rule ref="rulesets/codesize.xml" /> -->
<rule ref="rulesets/design.xml" />
<rule ref="rulesets/unusedcode.xml" />
<rule ref="rulesets/design.xml/NumberOfChildren">
<properties>
<!-- TODO we want to be at minimum 15. But we start high, and drop the bar slowly. -->
<property name="minimum" value="256"/>
</properties>
</rule>
<rule ref="rulesets/design.xml/CouplingBetweenObjects">
<properties>
<!-- TODO we want to be at minimum 13. But we start high, and drop the bar slowly. -->
<property name="minimum" value="256"/>
</properties>
</rule>
<rule ref="rulesets/naming.xml/ShortMethodName">
@ -55,7 +67,7 @@
<rule ref="rulesets/codesize.xml/NPathComplexity">
<properties>
<!-- TODO we want to be at a value of 128. But we start high, and drop the bar slowly. -->
<property name="minimum" value="100000"/>
<property name="minimum" value="2267200"/>
</properties>
</rule>
<rule ref="rulesets/codesize.xml/ExcessiveMethodLength">
@ -67,7 +79,7 @@
<rule ref="rulesets/codesize.xml/ExcessiveParameterList">
<properties>
<!-- TODO we want to be at a value of 4. But we start high, and drop the bar slowly. -->
<property name="minimum" value="5"/>
<property name="minimum" value="12"/>
</properties>
</rule>

2
app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php
View File

@ -59,7 +59,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
'currency_code' => $availableBudget->transactionCurrency->code,
'currency_symbol' => $availableBudget->transactionCurrency->symbol,
'currency_name' => $availableBudget->transactionCurrency->name,
'currency_decimal_places' => (int)$availableBudget->transactionCurrency->decimal_places,
'currency_decimal_places' => $availableBudget->transactionCurrency->decimal_places,
'native_id' => $default->id,
'native_code' => $default->code,
'native_symbol' => $default->symbol,

4
app/Services/Internal/Support/CreditRecalculateService.php
View File

@ -197,7 +197,7 @@ class CreditRecalculateService
$startOfDebt = $this->repository->getOpeningBalanceAmount($account) ?? '0';
$leftOfDebt = app('steam')->positive($startOfDebt);
$currency = $this->repository->getAccountCurrency($account);
$decimals = (int)($currency?->decimal_places ?? 2);
$decimals = $currency?->decimal_places ?? 2;
app('log')->debug(sprintf('Start of debt is "%s", so initial left of debt is "%s"', app('steam')->bcround($startOfDebt, $decimals), app('steam')->bcround($leftOfDebt, $decimals)));
/** @var AccountMetaFactory $factory */
@ -274,7 +274,7 @@ class CreditRecalculateService
$foreignCurrency = $transaction->foreignCurrency;
$accountCurrency = $this->repository->getAccountCurrency($account);
$groupId = $journal->transaction_group_id;
$decimals = (int)$accountCurrency->decimal_places;
$decimals = $accountCurrency->decimal_places;
$type = $journal->transactionType->type;
/** @var Transaction $destTransaction */
$destTransaction = $journal->transactions()->where('amount', '>', '0')->first();

2
app/Support/Amount.php
View File

@ -51,7 +51,7 @@ class Amount
*/
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = null): string
{
return $this->formatFlat($format->symbol, (int)$format->decimal_places, $amount, $coloured);
return $this->formatFlat($format->symbol, $format->decimal_places, $amount, $coloured);
}
/**

4
app/Transformers/RecurrenceTransformer.php
View File

@ -174,7 +174,7 @@ class RecurrenceTransformer extends AbstractTransformer
$foreignCurrencyId = (int)$transaction->foreign_currency_id;
$foreignCurrencyCode = $transaction->foreignCurrency->code;
$foreignCurrencySymbol = $transaction->foreignCurrency->symbol;
$foreignCurrencyDp = (int)$transaction->foreignCurrency->decimal_places;
$foreignCurrencyDp = $transaction->foreignCurrency->decimal_places;
}
// source info:
@ -208,7 +208,7 @@ class RecurrenceTransformer extends AbstractTransformer
'currency_id' => (string)$transaction->transaction_currency_id,
'currency_code' => $transaction->transactionCurrency->code,
'currency_symbol' => $transaction->transactionCurrency->symbol,
'currency_decimal_places' => (int)$transaction->transactionCurrency->decimal_places,
'currency_decimal_places' => $transaction->transactionCurrency->decimal_places,
'foreign_currency_id' => null === $foreignCurrencyId ? null : (string)$foreignCurrencyId,
'foreign_currency_code' => $foreignCurrencyCode,
'foreign_currency_symbol' => $foreignCurrencySymbol,

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

@ -149,7 +149,7 @@ class AccountTransformer extends AbstractTransformer
'native_currency_id' => (string)$this->default->id,
'native_currency_code' => $this->default->code,
'native_currency_symbol' => $this->default->symbol,
'native_currency_decimal_places' => (int)$this->default->decimal_places,
'native_currency_decimal_places' => $this->default->decimal_places,
// balance:
'current_balance' => $balance,

8
app/Transformers/V2/BillTransformer.php
View File

@ -136,7 +136,7 @@ class BillTransformer extends AbstractTransformer
$foreignCurrencyCode = $currencies[$foreignCurrencyId]->code;
$foreignCurrencyName = $currencies[$foreignCurrencyId]->name;
$foreignCurrencySymbol = $currencies[$foreignCurrencyId]->symbol;
$foreignCurrencyDp = (int)$currencies[$foreignCurrencyId]->decimal_places;
$foreignCurrencyDp = $currencies[$foreignCurrencyId]->decimal_places;
}
$this->paidDates[$billId][] = [
@ -147,11 +147,11 @@ class BillTransformer extends AbstractTransformer
'currency_code' => $currencies[$currencyId]->code,
'currency_name' => $currencies[$currencyId]->name,
'currency_symbol' => $currencies[$currencyId]->symbol,
'currency_decimal_places' => (int)$currencies[$currencyId]->decimal_places,
'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
'native_currency_id' => $currencies[$currencyId]->id,
'native_currency_code' => $currencies[$currencyId]->code,
'native_currency_symbol' => $currencies[$currencyId]->symbol,
'native_currency_decimal_places' => (int)$currencies[$currencyId]->decimal_places,
'native_currency_decimal_places' => $currencies[$currencyId]->decimal_places,
'foreign_currency_id' => $foreignCurrencyId,
'foreign_currency_code' => $foreignCurrencyCode,
'foreign_currency_name' => $foreignCurrencyName,
@ -212,7 +212,7 @@ class BillTransformer extends AbstractTransformer
'native_currency_code' => $this->default->code,
'native_currency_name' => $this->default->name,
'native_currency_symbol' => $this->default->symbol,
'native_currency_decimal_places' => (int)$this->default->decimal_places,
'native_currency_decimal_places' => $this->default->decimal_places,
'date' => $bill->date->toAtomString(),
'end_date' => $bill->end_date?->toAtomString(),
'extension_date' => $bill->extension_date?->toAtomString(),

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

@ -212,7 +212,7 @@ class PiggyBankTransformer extends AbstractTransformer
'native_currency_id' => (string)$this->default->id,
'native_currency_code' => $this->default->code,
'native_currency_symbol' => $this->default->symbol,
'native_currency_decimal_places' => (int)$this->default->decimal_places,
'native_currency_decimal_places' => $this->default->decimal_places,
'current_amount' => $currentAmount,
'native_current_amount' => $nativeCurrentAmount,
'target_amount' => $targetAmount,

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

@ -193,7 +193,7 @@ class TransactionGroupTransformer extends AbstractTransformer
'native_currency_code' => $this->default->code,
'native_currency_name' => $this->default->name,
'native_currency_symbol' => $this->default->symbol,
'native_currency_decimal_places' => (int)$this->default->decimal_places,
'native_currency_decimal_places' => $this->default->decimal_places,
// foreign currency amount:
'foreign_currency_id' => $this->stringFromArray($transaction, 'foreign_currency_id', null),