Merge pull request #11769 from firefly-iii/release-1771605618

🤖 Automatically merge the PR into the develop branch.
🤖 Auto commit for release 'develop' on 2026-02-20
2026-02-21 10:59:30 +00:00 · 2026-02-20 17:40:27 +01:00 · 2026-02-20 17:40:18 +01:00 · 2026-02-20 17:35:59 +01:00 · 2026-02-20 17:33:53 +01:00
14 changed files with 35 additions and 21 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -402,16 +402,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.94.1",
+            "version": "v3.94.2",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "d1a3634e29916367b885250e1fc4dfd5ffe3b091"
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d1a3634e29916367b885250e1fc4dfd5ffe3b091",
-                "reference": "d1a3634e29916367b885250e1fc4dfd5ffe3b091",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/7787ceff91365ba7d623ec410b8f429cdebb4f63",
+                "reference": "7787ceff91365ba7d623ec410b8f429cdebb4f63",
                "shasum": ""
            },
            "require": {
@@ -494,7 +494,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.94.2"
            },
            "funding": [
                {
@@ -502,7 +502,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-02-18T12:24:42+00:00"
+            "time": "2026-02-20T16:13:53+00:00"
        },
        {
            "name": "psr/container",
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ on:
      phpversion:
        description: 'PHP version'
        required: true
-        default: '8.4'
+        default: '8.5'
  schedule:
    - cron: '0 3 * * MON'

@@ -42,7 +42,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: ${{ github.event.inputs.phpversion || '8.4' }}
+          php-version: ${{ github.event.inputs.phpversion || '8.5' }}
          extensions: mbstring, intl, zip, bcmath
      - name: Switch and pull
        run: |
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -80,13 +80,13 @@ abstract class Controller extends BaseController
        View::share('FF_VERSION', config('firefly.version'));
        View::share('FF_BUILD_TIME', config('firefly.build_time'));

-        // this breaks when running < php 8.5 and is totally intentional.
-        //        $input            = ' James is cool';
-        //        $output           = $input
-        //            |> trim(...)
-        //            |> (fn (string $string) => str_replace(' ', '-', $string))
-        //            |> (fn (string $string) => str_replace(['.', '/', '…'], '', $string))
-        //            |> strtolower(...);
+        // this breaks when running < PHP 8.5 and is totally intentional.
+        $input            = ' James is cool';
+        $output           = $input
+            |> trim(...)
+            |> (fn (string $string) => str_replace(' ', '-', $string))
+            |> (fn (string $string) => str_replace(['.', '/', '…'], '', $string))
+            |> strtolower(...);

        // is webhooks enabled?
        View::share(
--- a/app/Support/Export/ExportDataGenerator.php
+++ b/app/Support/Export/ExportDataGenerator.php
@@ -168,6 +168,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
@@ -80,6 +80,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
@@ -120,6 +121,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
@@ -80,6 +80,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
@@ -82,6 +82,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
@@ -122,6 +123,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
@@ -77,6 +77,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
@@ -117,6 +118,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
@@ -86,6 +86,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
@@ -133,6 +133,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
@@ -82,6 +82,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
@@ -122,6 +123,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/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
        }
    ],
    "require": {
-        "php": ">=8.4",
+        "php": ">=8.5",
        "ext-bcmath": "*",
        "ext-curl": "*",
        "ext-fileinfo": "*",
@@ -197,7 +197,7 @@
            "php-http/discovery": true
        },
        "platform": {
-            "php": "8.4"
+            "php": "8.5"
        },
        "audit": {
            "ignore": {
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "6c4181d945517372c00358f3828806bc",
+    "content-hash": "350d2b33cd703d3e5731ff7501e20d7c",
    "packages": [
        {
            "name": "bacon/bacon-qr-code",
@@ -13140,7 +13140,7 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
-        "php": ">=8.4",
+        "php": ">=8.5",
        "ext-bcmath": "*",
        "ext-curl": "*",
        "ext-fileinfo": "*",
@@ -13159,7 +13159,7 @@
    },
    "platform-dev": {},
    "platform-overrides": {
-        "php": "8.4"
+        "php": "8.5"
    },
    "plugin-api-version": "2.9.0"
 }
--- 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-20',
-    'build_time'                           => 1771595732,
+    'build_time'                           => 1771605484,
    'api_version'                          => '2.1.0', // field is no longer used.
    'db_version'                           => 28, // field is no longer used.
Author	SHA1	Message	Date
github-actions[bot]	828b965c98	Merge pull request #11769 from firefly-iii/release-1771605618 🤖 Automatically merge the PR into the develop branch.	2026-02-20 17:40:27 +01:00
JC5	c008cd41db	🤖 Auto commit for release 'develop' on 2026-02-20	2026-02-20 17:40:18 +01:00
James Cole	accac89ffb	Upgrade job to PHP 8.5	2026-02-20 17:35:59 +01:00
James Cole	fb79e3b08c	Push Firefly III to PHP 8.5	2026-02-20 17:33:53 +01:00