diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index 3e8c04fe4d..3319e298eb 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -63,7 +63,7 @@ class UpdateRequest extends FormRequest { /** @var TransactionCurrency $currency */ $currency = $this->route()->parameter('currency_code'); - if(is_string($currency)) { + if (is_string($currency)) { $currency = TransactionCurrency::whereCode($currency)->first(); } diff --git a/app/Console/Commands/System/CreatesDatabase.php b/app/Console/Commands/System/CreatesDatabase.php index 93fc7f44fc..1ab2288f55 100644 --- a/app/Console/Commands/System/CreatesDatabase.php +++ b/app/Console/Commands/System/CreatesDatabase.php @@ -37,7 +37,7 @@ class CreatesDatabase extends Command protected $description = 'Tries to create the database if it doesn\'t exist yet.'; - protected $signature = 'firefly-iii:create-database'; + protected $signature = 'firefly-iii:create-database'; public function handle(): int { @@ -53,15 +53,15 @@ class CreatesDatabase extends Command return 0; } // try to set up a raw connection: - $exists = false; - $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT')); + $exists = false; + $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT')); - if ('' !== (string)env('DB_SOCKET')) { + if ('' !== (string) env('DB_SOCKET')) { $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET')); } $this->friendlyLine(sprintf('DSN is %s', $dsn)); - $options = [ + $options = [ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, PDO::ATTR_EMULATE_PREPARES => false, @@ -69,7 +69,7 @@ class CreatesDatabase extends Command // when it fails, display error try { - $pdo = new PDO($dsn, (string)env('DB_USERNAME'), (string)env('DB_PASSWORD'), $options); + $pdo = new PDO($dsn, (string) env('DB_USERNAME'), (string) env('DB_PASSWORD'), $options); } catch (PDOException $e) { $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage())); @@ -79,7 +79,7 @@ class CreatesDatabase extends Command // only continue when no error. // with PDO, try to list DB's ( /** @var array $stmt */ - $stmt = $pdo->query('SHOW DATABASES;'); + $stmt = $pdo->query('SHOW DATABASES;'); // slightly more complex but less error-prone. foreach ($stmt as $row) { $name = $row['Database'] ?? false; diff --git a/app/Console/Commands/Tools/VerifiesDatabaseConnection.php b/app/Console/Commands/Tools/VerifiesDatabaseConnection.php index 7169faaf17..871ba2456d 100644 --- a/app/Console/Commands/Tools/VerifiesDatabaseConnection.php +++ b/app/Console/Commands/Tools/VerifiesDatabaseConnection.php @@ -26,7 +26,6 @@ namespace FireflyIII\Console\Commands\Tools; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use Illuminate\Console\Command; -use Illuminate\Support\Facades\Log; class VerifiesDatabaseConnection extends Command { @@ -38,7 +37,7 @@ class VerifiesDatabaseConnection extends Command * * @var string */ - protected $signature = 'firefly-iii:verify-database-connection'; + protected $signature = 'firefly-iii:verify-database-connection'; /** * The console command description. diff --git a/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php b/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php index f50a9b455f..e5fd504f9a 100644 --- a/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php +++ b/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php @@ -1,4 +1,7 @@ 'SELECT * FROM pg_catalog.pg_tables;', - 'sqlite' => 'SELECT name FROM sqlite_schema;', - 'mysql' => 'SHOW TABLES;', - ]; - $default = config('database.default'); + $loops = 30; + $loop = 0; + $queries = ['pgsql' => 'SELECT * FROM pg_catalog.pg_tables;', 'sqlite' => 'SELECT name FROM sqlite_schema;', 'mysql' => 'SHOW TABLES;']; + $default = config('database.default'); if (!array_key_exists($default, $queries)) { $this->friendlyWarning(sprintf('Cannot validate database connection for "%s"', $default)); + return true; } $query = $queries[$default]; @@ -61,7 +60,7 @@ trait VerifiesDatabaseConnectionTrait } ++$loop; } + return $connected; } - } diff --git a/app/Support/Export/ExportDataGenerator.php b/app/Support/Export/ExportDataGenerator.php index 21e0670ae7..2ec25d9402 100644 --- a/app/Support/Export/ExportDataGenerator.php +++ b/app/Support/Export/ExportDataGenerator.php @@ -140,6 +140,8 @@ class ExportDataGenerator // @phpstan-ignore-line + // @phpstan-ignore-line + public function __construct() { $this->accounts = new Collection(); diff --git a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php index 928c94fbc8..9371b8f82d 100644 --- a/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php +++ b/app/Support/JsonApi/Enrichments/AvailableBudgetEnrichment.php @@ -66,6 +66,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private readonly bool $convertToPrimary; // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line @@ -92,6 +93,7 @@ class AvailableBudgetEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $currencies = []; private array $currencyIds = []; private array $ids = []; diff --git a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php index 48fc2f998f..e324d19e7c 100644 --- a/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php +++ b/app/Support/JsonApi/Enrichments/BudgetLimitEnrichment.php @@ -66,6 +66,7 @@ class BudgetLimitEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $currencies = []; private array $currencyIds = []; private Carbon $end; diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php index 702de40cf4..3d9e21c089 100644 --- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php +++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php @@ -68,6 +68,7 @@ class PiggyBankEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $accounts = []; // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line @@ -94,6 +95,7 @@ class PiggyBankEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $amounts = []; private Collection $collection; private array $currencies = []; diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php index eb5c36ca65..6d4a0a0e93 100644 --- a/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php +++ b/app/Support/JsonApi/Enrichments/PiggyBankEventEnrichment.php @@ -63,6 +63,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $accountIds = []; // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line @@ -89,6 +90,7 @@ class PiggyBankEventEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private Collection $collection; private array $currencies = []; private array $groupIds = []; diff --git a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php index 6ffd425955..0ec7b3250a 100644 --- a/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php +++ b/app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php @@ -72,6 +72,7 @@ class SubscriptionEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private readonly bool $convertToPrimary; private ?Carbon $end = null; private array $mappedObjects = []; diff --git a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php index f5c9c7b6f3..4408455b9e 100644 --- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php +++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php @@ -105,6 +105,8 @@ class TransactionGroupEnrichment implements EnrichmentInterface // @phpstan-ignore-line + // @phpstan-ignore-line + public function __construct() { $this->dateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date']; diff --git a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php index f6ae42eb0d..f5a7251df0 100644 --- a/app/Support/JsonApi/Enrichments/WebhookEnrichment.php +++ b/app/Support/JsonApi/Enrichments/WebhookEnrichment.php @@ -68,6 +68,7 @@ class WebhookEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $ids = []; // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line @@ -94,6 +95,7 @@ class WebhookEnrichment implements EnrichmentInterface // @phpstan-ignore-line // @phpstan-ignore-line // @phpstan-ignore-line + // @phpstan-ignore-line private array $responses = []; private array $triggers = []; private array $webhookDeliveries = []; diff --git a/config/firefly.php b/config/firefly.php index d495d99f12..01ddec4690 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -79,7 +79,7 @@ return [ // see cer.php for exchange rates feature flag. ], 'version' => 'develop/2026-02-15', - 'build_time' => 1771152837, + 'build_time' => 1771154471, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used.