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 issues.

Browse Source
This commit is contained in:
James Cole 2025-01-03 15:04:15 +01:00
parent 394d0eabef
commit 7f6c03ce17
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
10 changed files with 18 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/Correction/ConvertsDatesToUTC.php
View File

@ -74,7 +74,7 @@ class ConvertsDatesToUTC extends Command
*/
public function handle(): int
{
$this->friendlyWarning('Please do not use this command.');
$this->friendlyWarning('Please do not use this command right now.');
return 0;
@ -124,8 +124,8 @@ class ConvertsDatesToUTC extends Command
/** @var Carbon $date */
$date = Carbon::parse($item->{$field}, $item->{$timezoneField});
$date->setTimezone('UTC');
$item->{$field} = $date->format('Y-m-d H:i:s');
$item->{$timezoneField} = 'UTC';
$item->{$field} = $date->format('Y-m-d H:i:s'); // @phpstan-ignore-line
$item->{$timezoneField} = 'UTC'; // @phpstan-ignore-line
$item->save();
}
);

2
app/Console/Commands/Correction/CorrectsNativeAmounts.php
View File

@ -62,7 +62,7 @@ class CorrectsNativeAmounts extends Command
*/
public function handle(): int
{
if (!config('cer.enabled')) {
if (false === config('cer.enabled')) {
$this->friendlyInfo('This command will not run because currency exchange rates are disabled.');
return 0;

2
app/Console/Commands/Correction/CorrectsUnevenAmount.php
View File

@ -50,7 +50,7 @@ class CorrectsUnevenAmount extends Command
$this->convertOldStyleTransfers();
$this->fixUnevenAmounts();
$this->matchCurrencies();
if (config('firefly.feature_flags.running_balance_column')) {
if (true === config('firefly.feature_flags.running_balance_column')) {
$this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.');
AccountBalanceCalculator::recalculateAll(false);
$this->friendlyInfo('Done recalculating transaction running balance columns.');

20
app/Console/Commands/System/CreatesDatabase.php
View File

@ -43,17 +43,17 @@ class CreatesDatabase extends Command
*/
public function handle(): int
{
if ('mysql' !== env('DB_CONNECTION', 'mysql')) {
$this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
if ('mysql' !== config('database.default')) {
$this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', config('database.default')));
return 0;
}
// try to set up a raw connection:
$exists = false;
$dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
$dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', config('database.mysql.host'), config('database.mysql.port'));
if ('' !== env('DB_SOCKET', '')) {
$dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET', ''));
$dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', config('database.mysql.unix_socket'));
}
$this->friendlyLine(sprintf('DSN is %s', $dsn));
@ -65,7 +65,7 @@ class CreatesDatabase extends Command
// when it fails, display error
try {
$pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
$pdo = new \PDO($dsn, config('database.mysql.username'), config('database.mysql.password'), $options);
} catch (\PDOException $e) {
$this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
@ -79,19 +79,19 @@ class CreatesDatabase extends Command
// slightly more complex but less error-prone.
foreach ($stmt as $row) {
$name = $row['Database'] ?? false;
if ($name === env('DB_DATABASE')) {
if ($name === config('database.mysql.database')) {
$exists = true;
}
}
if (false === $exists) {
$this->friendlyError(sprintf('Database "%s" does not exist.', env('DB_DATABASE')));
$this->friendlyError(sprintf('Database "%s" does not exist.', config('database.mysql.database')));
// try to create it.
$pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', env('DB_DATABASE')));
$this->friendlyInfo(sprintf('Created database "%s"', env('DB_DATABASE')));
$pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', config('database.mysql.database')));
$this->friendlyInfo(sprintf('Created database "%s"', config('database.mysql.database')));
}
if (true === $exists) {
$this->friendlyInfo(sprintf('Database "%s" exists.', env('DB_DATABASE')));
$this->friendlyInfo(sprintf('Database "%s" exists.', config('database.mysql.database')));
}
return 0;

2
app/Console/Commands/System/CreatesFirstUser.php
View File

@ -43,7 +43,7 @@ class CreatesFirstUser extends Command
*/
public function handle(): int
{
if ('testing' !== env('APP_ENV', 'local')) {
if ('testing' !== config('app.env')) {
$this->friendlyError('This command only works in the testing environment.');
return 1;

4
app/Handlers/Observer/TransactionObserver.php
View File

@ -39,7 +39,7 @@ class TransactionObserver
public function created(Transaction $transaction): void
{
Log::debug('Observe "created" of a transaction.');
if (config('firefly.feature_flags.running_balance_column')) {
if (true === config('firefly.feature_flags.running_balance_column')) {
if (1 === bccomp($transaction->amount, '0') && true === self::$recalculate) {
Log::debug('Trigger recalculateForJournal');
AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
@ -57,7 +57,7 @@ class TransactionObserver
public function updated(Transaction $transaction): void
{
// Log::debug('Observe "updated" of a transaction.');
if (config('firefly.feature_flags.running_balance_column') && true === self::$recalculate) {
if (true === config('firefly.feature_flags.running_balance_column') && true === self::$recalculate) {
if (1 === bccomp($transaction->amount, '0')) {
Log::debug('Trigger recalculateForJournal');
AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);

11
app/Support/Facades/Amount.php
View File

@ -28,17 +28,6 @@ use FireflyIII\User;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Facade;
/**
* Class Amount.
*
* @method string formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true)
* @method Collection getAllCurrencies()
* @method Collection getCurrencies()
* @method string getCurrencyCode()
* @method string getCurrencySymbol()
* @method TransactionCurrency getDefaultCurrency()
* @method TransactionCurrency getDefaultCurrencyByUser(User $user)
*/
class Amount extends Facade
{
/**

9
app/Support/Facades/FireflyConfig.php
View File

@ -26,15 +26,6 @@ namespace FireflyIII\Support\Facades;
use FireflyIII\Models\Configuration;
use Illuminate\Support\Facades\Facade;
/**
* Class FireflyConfig.
*
* @method null|Configuration get($name, $default = null)
* @method Configuration set(string $name, $value)
* @method delete(string $name)
* @method null|Configuration getFresh(string $name, $default = null)
* @method Configuration put(string $name, $value)
*/
class FireflyConfig extends Facade
{
/**

14
app/Support/Facades/Preferences.php
View File

@ -28,20 +28,6 @@ use FireflyIII\User;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Facade;
/**
* Class Preferences.
*
* @method Collection beginsWith(User $user, string $search)
* @method bool delete(string $name)
* @method Collection findByName(string $name)
* @method Preference get(string $name, $value = null)
* @method array getArrayForUser(User $user, array $list)
* @method null|Preference getForUser(User $user, string $name, $default = null)
* @method string lastActivity()
* @method void mark()
* @method Preference set(string $name, $value)
* @method Preference setForUser(User $user, string $name, $value)
*/
class Preferences extends Facade
{
public function __construct()

15
app/Support/Facades/Steam.php
View File

@ -28,21 +28,6 @@ use FireflyIII\Models\Account;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Facade;
/**
* Class Steam.
*
* @method string balance(Account $account, Carbon $date)
* @method string balanceIgnoreVirtual(Account $account, Carbon $date)
* @method array balanceInRange(Account $account, Carbon $start, Carbon $end)
* @method array balancesByAccounts(Collection $accounts, Carbon $date)
* @method decrypt(int $isEncrypted, string $value)
* @method array getLastActivities(array $accounts)
* @method string negative(string $amount)
* @method null|string opposite(string $amount = null)
* @method int phpBytes(string $string)
* @method string positive(string $amount)
* @method array balancesPerCurrencyByAccounts(Collection $accounts, Carbon $date)
*/
class Steam extends Facade
{
/**