Merge pull request #11726 from firefly-iii/release-1771154592

🤖 Automatically merge the PR into the develop branch.
2026-06-09 03:44:57 +00:00 · 2026-02-15 12:23:20 +01:00
parent ad60974430 4a5281fd80
commit 7fa9e79f2a
13 changed files with 33 additions and 21 deletions
--- 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();
        }

--- 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;
--- 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.
--- a/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php
+++ b/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /*
 * VerifiesDatabaseConnectionTrait.php
 * Copyright (c) 2026 james@firefly-iii.org
@@ -28,19 +31,15 @@ use Illuminate\Support\Facades\Log;

 trait VerifiesDatabaseConnectionTrait
 {
-
    protected function verifyDatabaseConnection(): bool
    {
-        $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');
+        $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;
    }
-
 }
--- 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();
--- 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                   = [];
--- 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;
--- 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    = [];
--- 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          = [];
--- 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   = [];
--- 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'];
--- 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 = [];
--- 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.