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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-06 17:00:16 +02:00
parent 8572280b7b
commit 38d0f0427f
61 changed files with 419 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Support/Form/AccountForm.php
View File

@@ -43,9 +43,9 @@ class AccountForm
/**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -94,9 +94,9 @@ class AccountForm
/**
* Grouped dropdown list of all accounts that are valid as the destination of a withdrawal.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -116,11 +116,10 @@ class AccountForm
/**
* Check list of asset accounts.
*
* @param string $name
* @param array $options
* @param string $name
* @param array|null $options
*
* @return string
*
*/
public function assetAccountCheckList(string $name, array $options = null): string
{
@@ -137,7 +136,7 @@ class AccountForm
unset($options['class']);
try {
$html = prefixView('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render assetAccountCheckList(): %s', $e->getMessage()));
$html = 'Could not render assetAccountCheckList.';
}
@@ -148,9 +147,9 @@ class AccountForm
/**
* Basic list of asset accounts.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -164,9 +163,9 @@ class AccountForm
/**
* Same list but all liabilities as well.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/

53
app/Support/Form/CurrencyForm.php
View File

@@ -22,8 +22,8 @@
declare(strict_types=1);
namespace FireflyIII\Support\Form;
use Amount as Amt;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Illuminate\Support\Collection;
@@ -42,9 +42,9 @@ class CurrencyForm
use FormSupport;
/**
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -54,13 +54,12 @@ class CurrencyForm
}
/**
* @param string $name
* @param string $view
* @param mixed $value
* @param array $options
* @param string $name
* @param string $view
* @param mixed $value
* @param array|null $options
*
* @return string
*
*/
protected function currencyField(string $name, string $view, $value = null, array $options = null): string
{
@@ -77,7 +76,7 @@ class CurrencyForm
// perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount)
$preFilled = session('preFilled');
$key = 'amount_currency_id_' . $name;
$sentCurrencyId = isset($preFilled[$key]) ? (int)$preFilled[$key] : $defaultCurrency->id;
$sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $defaultCurrency->id;
Log::debug(sprintf('Sent currency ID is %d', $sentCurrencyId));
@@ -96,7 +95,7 @@ class CurrencyForm
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';
}
@@ -107,12 +106,11 @@ class CurrencyForm
/**
* TODO describe and cleanup.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
* @throws FireflyException
*/
public function balanceAll(string $name, $value = null, array $options = null): string
{
@@ -122,13 +120,12 @@ class CurrencyForm
/**
* TODO cleanup and describe better.
*
* @param string $name
* @param string $view
* @param mixed $value
* @param array $options
* @param string $name
* @param string $view
* @param mixed $value
* @param array|null $options
*
* @return string
*
*/
protected function allCurrencyField(string $name, string $view, $value = null, array $options = null): string
{
@@ -145,7 +142,7 @@ class CurrencyForm
// perhaps the currency has been sent to us in the field $amount_currency_id_$name (amount_currency_id_amount)
$preFilled = session('preFilled');
$key = 'amount_currency_id_' . $name;
$sentCurrencyId = isset($preFilled[$key]) ? (int)$preFilled[$key] : $defaultCurrency->id;
$sentCurrencyId = array_key_exists($key, $preFilled) ? (int)$preFilled[$key] : $defaultCurrency->id;
Log::debug(sprintf('Sent currency ID is %d', $sentCurrencyId));
@@ -164,7 +161,7 @@ class CurrencyForm
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';
}
@@ -175,9 +172,9 @@ class CurrencyForm
/**
* TODO cleanup and describe.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -200,9 +197,9 @@ class CurrencyForm
/**
* TODO cleanup and describe.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/

36
app/Support/Form/FormSupport.php
View File

@@ -37,10 +37,10 @@ use Throwable;
trait FormSupport
{
/**
* @param string $name
* @param array $list
* @param mixed $selected
* @param array $options
* @param string $name
* @param array|null $list
* @param mixed $selected
* @param array|null $options
*
* @return string
*/
@@ -54,7 +54,7 @@ trait FormSupport
unset($options['autocomplete'], $options['placeholder']);
try {
$html = prefixView('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
} catch (Throwable $e) {
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
$html = 'Could not render select.';
}
@@ -63,15 +63,15 @@ trait FormSupport
}
/**
* @param $name
* @param $options
* @param string $name
* @param array|null $options
*
* @return string
*/
protected function label(string $name, array $options = null): string
{
$options = $options ?? [];
if (isset($options['label'])) {
if (array_key_exists('label', $options)) {
return $options['label'];
}
$name = str_replace('[]', '', $name);
@@ -80,9 +80,9 @@ trait FormSupport
}
/**
* @param $name
* @param $label
* @param array $options
* @param string $name
* @param mixed $label
* @param array|null $options
*
* @return array
*/
@@ -99,7 +99,7 @@ trait FormSupport
}
/**
* @param $name
* @param string $name
*
* @return string
*/
@@ -118,8 +118,8 @@ trait FormSupport
}
/**
* @param string $name
* @param $value
* @param string $name
* @param mixed|null $value
*
* @return mixed
*/
@@ -127,14 +127,14 @@ trait FormSupport
{
if (app('session')->has('preFilled')) {
$preFilled = session('preFilled');
$value = isset($preFilled[$name]) && null === $value ? $preFilled[$name] : $value;
$value = array_key_exists($name, $preFilled) && null === $value ? $preFilled[$name] : $value;
}
try {
if (null !== request()->old($name)) {
$value = request()->old($name);
}
} catch (RuntimeException $e) {
} catch (RuntimeException $e) { // @phpstan-ignore-line
// don't care about session errors.
Log::debug(sprintf('Run time: %s', $e->getMessage()));
}
@@ -163,8 +163,8 @@ trait FormSupport
$date = null;
try {
$date = today(config('app.timezone'));
} catch (Exception $e) {
$e->getMessage();
} catch (Exception $e) { // @phpstan-ignore-line
// @ignoreException
}
return $date;

6
app/Support/Form/PiggyBankForm.php
View File

@@ -37,9 +37,9 @@ class PiggyBankForm
/**
* TODO cleanup and describe.
*
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/

8
app/Support/Form/RuleForm.php
View File

@@ -36,9 +36,9 @@ class RuleForm
use FormSupport;
/**
* @param string $name
* @param mixed $value
* @param array $options
* @param string $name
* @param mixed $value
* @param array|null $options
*
* @return string
*/
@@ -79,7 +79,7 @@ class RuleForm
];
/** @var RuleGroup $group */
foreach ($list as $group) {
if (isset($options['hidden']) && (int)$options['hidden'] !== $group->id) {
if (array_key_exists('hidden', $options) && (int)$options['hidden'] !== $group->id) {
$array[$group->id] = $group->title;
}
}