Auto commit for release 'develop' on 2024-04-04

Set date to now when cloning journal

.ci/php-cs-fixer/composer.json

@@ -1,5 +1,5 @@
 {
-  "require": {
-    "friendsofphp/php-cs-fixer": "^3.12"
-  }
+    "require": {
+        "friendsofphp/php-cs-fixer": "^3.12"
+    }
 }

.ci/php-cs-fixer/composer.lock

@@ -538,16 +538,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f"
+                "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f",
-                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fde915cd8e7eb99b3d531d3d5c09531429c3f9e5",
+                "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5",
                 "shasum": ""
             },
             "require": {
@@ -611,7 +611,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.4"
+                "source": "https://github.com/symfony/console/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -627,7 +627,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:20+00:00"
+            "time": "2024-04-01T11:04:53+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -778,16 +778,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224",
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224",
                 "shasum": ""
             },
             "require": {
@@ -834,7 +834,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -850,20 +850,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v7.0.3",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12"
+                "reference": "408105dff4c104454100730bdfd1a9cdd993f04d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12",
-                "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/408105dff4c104454100730bdfd1a9cdd993f04d",
+                "reference": "408105dff4c104454100730bdfd1a9cdd993f04d",
                 "shasum": ""
             },
             "require": {
@@ -897,7 +897,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.0.3"
+                "source": "https://github.com/symfony/filesystem/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -913,7 +913,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-03-21T19:37:36+00:00"
         },
         {
             "name": "symfony/finder",
@@ -1583,16 +1583,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
                 "shasum": ""
             },
             "require": {
@@ -1645,7 +1645,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -1661,7 +1661,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2023-12-19T21:51:00+00:00"
         },
         {
             "name": "symfony/stopwatch",

.ci/phpmd/phpmd.xml

@@ -19,9 +19,9 @@
   ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<ruleset name="pcsg-generated-ruleset"
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         name="pcsg-generated-ruleset"
          xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
          xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
     <description>Firefly III ruleset.</description>

.github/pull_request_template.md

@@ -1,13 +1,19 @@
 <!--
-Before you create a new PR, please consider:
+Thank you for submitting new code to Firefly III, or any of the related projects. Please read the following rules carefully.
 
-1) Pull requests for the MAIN branch will be closed.
-2) DO NOT include translations in your PR. Only English US sentences.
+- Do not submit solutions for problems that are not already reported in an issue
+- Firefly III can't be your learning experience. If you're new to all of this, please go be new somewhere else
+- Do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I don't have time for that.
+- Pull requests for the MAIN branch will be closed.
+- DO NOT include translated strings in your PR.
+
+Perhaps open an issue first, before you open a PR?
+
+See also: https://docs.firefly-iii.org/explanation/support/#contributing-code
 
-Thanks.
 -->
-
-Fixes issue # (if relevant)
+    
+This PR fixes issue # (if relevant).
 
 Changes in this pull request:
 

.github/workflows/close-duplicates.yml

@@ -3,7 +3,7 @@ name: "Issues - Command to close duplicate issues"
 # the workflow to execute on is comments that are newly created
 on:
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 permissions:
   issues: write

.github/workflows/debug-info-actions.yml

@@ -3,9 +3,9 @@ name: 'Issues - Respond to hidden commands'
 # the workflow to execute on is comments that are newly created
 on:
   issues:
-    types: [opened, edited]
+    types: [ opened, edited ]
   issue_comment:
-    types: [created]
+    types: [ created ]
 
 # permissions needed for reacting to IssueOps commands on issues and PRs
 permissions:

.github/workflows/label-actions.yml

@@ -2,11 +2,11 @@ name: 'Issues - Reply to specific labels'
 
 on:
   issues:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]
   pull_request_target:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]
   discussion:
-    types: [labeled, unlabeled]
+    types: [ labeled, unlabeled ]
 
 permissions:
   contents: read

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
         required: true
         default: 'develop'
   schedule:
-    - cron:  '0 3 * * MON,THU'
+    - cron: '0 3 * * MON,THU'
 
 jobs:
   build:
@@ -192,7 +192,7 @@ jobs:
           echo 'Zip and tar...'
           zip -rq $zipName . -x "*.git*" "*.ci*" "*.github*" "*node_modules*" "*output.txt*"
           touch $tarName
-          tar --exclude=$tarName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
+          tar --exclude=$tarName --exclude=$zipName --exclude='./.git' --exclude='./.ci' --exclude='./.github' --exclude='./node_modules' --exclude='./output.txt' -czf $tarName .
 
           # add sha256 sum
           echo 'Sha sum ...'
@@ -211,7 +211,7 @@ jobs:
             echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
             echo "" >> output.txt
-            echo ":warning: Please be careful with this pre-release, as is may not work as expected." >> output.txt
+            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
 
             # create the release:
             echo "Create nightly release."

app/Api/V1/Controllers/Models/Transaction/UpdateController.php

@@ -72,6 +72,11 @@ class UpdateController extends Controller
         app('log')->debug('Now in update routine for transaction group!');
         $data             = $request->getAll();
 
+        // Fixes 8750.
+        foreach ($data['transactions'] as $index => $info) {
+            unset($data['transactions'][$index]['type']);
+        }
+
         $transactionGroup = $this->groupRepository->update($transactionGroup, $data);
         $manager          = $this->getManager();
 

app/Api/V1/Requests/Models/Rule/TestRequest.php

@@ -54,17 +54,13 @@ class TestRequest extends FormRequest
 
     private function getDate(string $field): ?Carbon
     {
-        $value  = $this->query($field);
+        $value = $this->query($field);
         if (is_array($value)) {
             return null;
         }
-        $value  = (string)$value;
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
-        if (false === $result) {
-            return null;
-        }
+        $value = (string)$value;
 
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
     }
 
     private function getAccounts(): array

app/Api/V1/Requests/Models/Rule/TriggerRequest.php

@@ -48,17 +48,13 @@ class TriggerRequest extends FormRequest
 
     private function getDate(string $field): ?Carbon
     {
-        $value  = $this->query($field);
+        $value = $this->query($field);
         if (is_array($value)) {
             return null;
         }
-        $value  = (string)$value;
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
-        if (false === $result) {
-            return null;
-        }
+        $value = (string)$value;
 
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
     }
 
     private function getAccounts(): array

app/Api/V1/Requests/Models/RuleGroup/TestRequest.php

@@ -48,17 +48,13 @@ class TestRequest extends FormRequest
 
     private function getDate(string $field): ?Carbon
     {
-        $value  = $this->query($field);
+        $value = $this->query($field);
         if (is_array($value)) {
             return null;
         }
-        $value  = (string)$value;
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
-        if (false === $result) {
-            return null;
-        }
+        $value = (string)$value;
 
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
     }
 
     private function getAccounts(): array

app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php

@@ -48,17 +48,13 @@ class TriggerRequest extends FormRequest
 
     private function getDate(string $field): ?Carbon
     {
-        $value  = $this->query($field);
+        $value = $this->query($field);
         if (is_array($value)) {
             return null;
         }
-        $value  = (string)$value;
-        $result = null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
-        if (false === $result) {
-            return null;
-        }
+        $value = (string)$value;
 
-        return $result;
+        return null === $this->query($field) ? null : Carbon::createFromFormat('Y-m-d', substr($value, 0, 10));
     }
 
     private function getAccounts(): array

app/Api/V2/Controllers/Summary/BasicController.php

@@ -298,7 +298,7 @@ class BasicController extends Controller
             app('log')->debug(sprintf('Amount left is %s', $left));
 
             // how much left per day?
-            $days                    = (int) $today->diffInDays($end, true) + 1;
+            $days                    = (int)$today->diffInDays($end, true) + 1;
             $perDay                  = '0';
             $perDayNative            = '0';
             if (0 !== $days && bccomp($left, '0') > -1) {

app/Api/V2/Controllers/UserGroup/UpdateController.php

@@ -54,14 +54,6 @@ class UpdateController extends Controller
         );
     }
 
-    public function useUserGroup(UserGroup $userGroup): JsonResponse
-    {
-        // group validation is already in place, so can just update the user.
-        $this->repository->useUserGroup($userGroup);
-
-        return response()->json([], 204);
-    }
-
     public function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse
     {
         $all         = $request->getAll();
@@ -87,4 +79,12 @@ class UpdateController extends Controller
             ->header('Content-Type', self::CONTENT_TYPE)
         ;
     }
+
+    public function useUserGroup(UserGroup $userGroup): JsonResponse
+    {
+        // group validation is already in place, so can just update the user.
+        $this->repository->useUserGroup($userGroup);
+
+        return response()->json([], 204);
+    }
 }

app/Console/Commands/Correction/MigratePreferences.php

@@ -30,20 +30,10 @@ use Symfony\Component\Console\Command\Command as CommandAlias;
 
 class MigratePreferences extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature   = 'firefly-iii:migrate-preferences';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Give Firefly III preferences a user group ID so they can be made administration specific.';
 
+    protected $signature   = 'firefly-iii:migrate-preferences';
+
     /**
      * Execute the console command.
      */

app/Console/Commands/Export/ExportData.php

@@ -191,7 +191,7 @@ class ExportData extends Command
                 $this->friendlyError(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
                 $error = true;
             }
-            if (false === $date) {
+            if (null === $date) {
                 $this->friendlyError(sprintf('%s date "%s" must be formatted YYYY-MM-DD.', $field, $this->option('start')));
 
                 throw new FireflyException(sprintf('%s date "%s" must be formatted YYYY-MM-DD.', $field, $this->option('start')));

app/Console/Commands/System/LaravelPassportKeys.php

@@ -32,24 +32,13 @@ class LaravelPassportKeys extends Command
 {
     use ShowsFriendlyMessages;
 
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature   = 'firefly-iii:laravel-passport-keys';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Calls the Laravel "passport:keys" but doesn\'t exit 1.';
+    protected $signature   = 'firefly-iii:laravel-passport-keys';
 
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): int
     {
         Artisan::call('passport:keys --no-interaction', []);
         $result = Artisan::output();

app/Console/Commands/Tools/ApplyRules.php

@@ -285,7 +285,7 @@ class ApplyRules extends Command
         if (null !== $endString && '' !== $endString) {
             $inputEnd = Carbon::createFromFormat('Y-m-d', $endString);
         }
-        if (false === $inputEnd || false === $inputStart) {
+        if (null === $inputEnd || null === $inputStart) {
             Log::error('Could not parse start or end date in verifyInputDate().');
 
             return;

app/Handlers/Events/UserEventHandler.php

@@ -405,7 +405,7 @@ class UserEventHandler
             }
             // clean up old entries (6 months)
             $carbon = Carbon::createFromFormat('Y-m-d H:i:s', $preference[$index]['time']);
-            if (false !== $carbon && $carbon->diffInMonths(today(), true) > 6) {
+            if (null !== $carbon && $carbon->diffInMonths(today(), true) > 6) {
                 app('log')->debug(sprintf('Entry for %s is very old, remove it.', $row['ip']));
                 unset($preference[$index]);
             }

app/Http/Controllers/Budget/BudgetLimitController.php

@@ -128,7 +128,7 @@ class BudgetLimitController extends Controller
         $start    = Carbon::createFromFormat('Y-m-d', $request->get('start'));
         $end      = Carbon::createFromFormat('Y-m-d', $request->get('end'));
 
-        if (false === $start || false === $end) {
+        if (null === $start || null === $end) {
             return response()->json([]);
         }
 

app/Http/Controllers/HomeController.php

@@ -79,10 +79,10 @@ class HomeController extends Controller
             app('log')->error(sprintf('End could not parse date string "%s" so ignore it.', $stringEnd));
             $end = Carbon::now()->endOfMonth();
         }
-        if (false === $start) {
+        if (null === $start) {
             $start = Carbon::now()->startOfMonth();
         }
-        if (false === $end) {
+        if (null === $end) {
             $end = Carbon::now()->endOfMonth();
         }
 

app/Http/Controllers/Json/BoxController.php

@@ -130,7 +130,7 @@ class BoxController extends Controller
                 $boxTitle         = (string)trans('firefly.left_to_spend');
                 $activeDaysLeft   = $this->activeDaysLeft($start, $end);   // see method description.
                 $display          = 1;                                     // not overspent
-                $leftPerDayAmount = 0 === (int) $activeDaysLeft ? $leftToSpendAmount : bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
+                $leftPerDayAmount = 0 === $activeDaysLeft ? $leftToSpendAmount : bcdiv($leftToSpendAmount, (string)$activeDaysLeft);
                 app('log')->debug(sprintf('Left to spend per day is %s', $leftPerDayAmount));
             }
         }

app/Http/Controllers/Json/RecurrenceController.php

@@ -81,7 +81,7 @@ class RecurrenceController extends Controller
         $skip                          = $skip < 0 || $skip > 31 ? 0 : $skip;
         $weekend                       = $weekend < 1 || $weekend > 4 ? 1 : $weekend;
 
-        if (false === $start || false === $end || false === $firstDate || false === $endDate) {
+        if (null === $start || null === $end || null === $firstDate || null === $endDate) {
             return response()->json();
         }
 
@@ -112,7 +112,7 @@ class RecurrenceController extends Controller
         $actualEnd                     = clone $end;
 
         if ('until_date' === $endsAt) {
-            $actualEnd   = $endDate ?? clone $end;
+            $actualEnd   = $endDate;
             $occurrences = $this->recurring->getOccurrencesInRange($repetition, $actualStart, $actualEnd);
         }
         if ('times' === $endsAt) {
@@ -155,7 +155,7 @@ class RecurrenceController extends Controller
         } catch (InvalidFormatException $e) {
             $date = Carbon::today(config('app.timezone'));
         }
-        if (false === $date) {
+        if (null === $date) {
             return response()->json();
         }
         $date->startOfDay();

app/Http/Controllers/PreferencesController.php

@@ -223,8 +223,8 @@ class PreferencesController extends Controller
 
         // same for locale:
         if (!auth()->user()->hasRole('demo')) {
-            /** @var Preference $locale */
-            $locale = $request->get('locale');
+            $locale = (string) $request->get('locale');
+            $locale = '' === $locale ? null : $locale;
             app('preferences')->set('locale', $locale);
         }
 

app/Http/Controllers/ProfileController.php

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Http\Controllers;
 
-use Auth;
 use FireflyIII\Events\UserChangedEmail;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Exceptions\ValidationException;
@@ -467,9 +466,7 @@ class ProfileController extends Controller
         if (is_array($secret)) {
             $secret = null;
         }
-        if (is_int($secret)) {
-            $secret = (string)$secret;
-        }
+        $secret     = (string)$secret;
 
         $repository->setMFACode($user, $secret);
 

app/Jobs/DownloadExchangeRates.php

@@ -119,7 +119,7 @@ class DownloadExchangeRates implements ShouldQueue
             return;
         }
         $date       = Carbon::createFromFormat('Y-m-d', $json['date'], config('app.timezone'));
-        if (false === $date) {
+        if (null === $date) {
             return;
         }
         $this->saveRates($currency, $date, $json['rates']);

app/Jobs/WarnAboutBills.php

@@ -128,7 +128,7 @@ class WarnAboutBills implements ShouldQueue
         $today  = clone $this->date;
         $carbon = clone $bill->{$field};
 
-        return (int) $today->diffInDays($carbon);
+        return (int)$today->diffInDays($carbon);
     }
 
     private function sendWarning(Bill $bill, string $field): void

app/Models/Preference.php

@@ -36,13 +36,13 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 /**
  * FireflyIII\Models\Preference
  *
- * @property int                   $id
- * @property null|Carbon           $created_at
- * @property null|Carbon           $updated_at
- * @property int                   $user_id
- * @property string                $name
- * @property null|array|int|string $data
- * @property User                  $user
+ * @property int                        $id
+ * @property null|Carbon                $created_at
+ * @property null|Carbon                $updated_at
+ * @property int                        $user_id
+ * @property string                     $name
+ * @property null|array|bool|int|string $data
+ * @property User                       $user
  *
  * @method static Builder|Preference newModelQuery()
  * @method static Builder|Preference newQuery()

app/Providers/AppServiceProvider.php

@@ -69,7 +69,10 @@ class AppServiceProvider extends ServiceProvider
             if ('' === $firstParam && str_contains($name, $route)) {
                 return true;
             }
-            $params     = Route::getCurrentRoute()->parameters() ?? [];
+
+            /** @var null|array $params */
+            $params     = Route::getCurrentRoute()->parameters();
+            $params ??= [];
             $objectType = $params['objectType'] ?? '';
             if ($objectType === $firstParam && str_contains($name, $route)) {
                 return true;

app/Repositories/Budget/BudgetRepository.php

@@ -183,21 +183,21 @@ class BudgetRepository implements BudgetRepositoryInterface
         //    |-----------|
         //  |----------------|
         if ($start->gte($limit->start_date) && $end->lte($limit->end_date)) {
-            return (int) $start->diffInDays($end, true) + 1; // add one day
+            return (int)$start->diffInDays($end, true) + 1; // add one day
         }
         // limit starts earlier and limit ends first:
         //    |-----------|
         // |-------|
         if ($limit->start_date->lte($start) && $limit->end_date->lte($end)) {
             // return days in the range $start-$limit_end
-            return (int) $start->diffInDays($limit->end_date, true) + 1; // add one day, the day itself
+            return (int)$start->diffInDays($limit->end_date, true) + 1; // add one day, the day itself
         }
         // limit starts later and limit ends earlier
         //    |-----------|
         //           |-------|
         if ($limit->start_date->gte($start) && $limit->end_date->gte($end)) {
             // return days in the range $limit_start - $end
-            return (int) $limit->start_date->diffInDays($end, true) + 1; // add one day, the day itself
+            return (int)$limit->start_date->diffInDays($end, true) + 1; // add one day, the day itself
         }
 
         return 0;

app/Repositories/Budget/OperationsRepository.php

@@ -51,7 +51,7 @@ class OperationsRepository implements OperationsRepositoryInterface
         $total = '0';
         $count = 0;
         foreach ($budget->budgetlimits as $limit) {
-            $diff   = (int) $limit->start_date->diffInDays($limit->end_date, true);
+            $diff   = (int)$limit->start_date->diffInDays($limit->end_date, true);
             $diff   = 0 === $diff ? 1 : $diff;
             $amount = $limit->amount;
             $perDay = bcdiv($amount, (string)$diff);

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -301,7 +301,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
         if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) {
             $now             = today(config('app.timezone'));
             $startDate       = null !== $piggyBank->startdate && $piggyBank->startdate->gte($now) ? $piggyBank->startdate : $now;
-            $diffInMonths    = (int) $startDate->diffInMonths($piggyBank->targetdate);
+            $diffInMonths    = (int)$startDate->diffInMonths($piggyBank->targetdate);
             $remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount);
 
             // more than 1 month to go and still need money to save:

app/Repositories/Recurring/RecurringRepository.php

@@ -473,10 +473,10 @@ class RecurringRepository implements RecurringRepositoryInterface
         if ('yearly' === $repetition->repetition_type) {
             $today       = today(config('app.timezone'))->endOfYear();
             $repDate     = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment);
-            if (false === $repDate) {
+            if (null === $repDate) {
                 $repDate = clone $today;
             }
-            $diffInYears = (int) $today->diffInYears($repDate, true);
+            $diffInYears = (int)$today->diffInYears($repDate, true);
             $repDate->addYears($diffInYears); // technically not necessary.
             $string      = $repDate->isoFormat((string)trans('config.month_and_day_no_year_js'));
 

app/Repositories/User/UserRepository.php

@@ -242,6 +242,30 @@ class UserRepository implements UserRepositoryInterface
         return false;
     }
 
+    #[\Override]
+    public function getUserGroups(User $user): Collection
+    {
+        $memberships = $user->groupMemberships()->get();
+        $set         = [];
+        $collection  = new Collection();
+
+        /** @var GroupMembership $membership */
+        foreach ($memberships as $membership) {
+            /** @var null|UserGroup $group */
+            $group = $membership->userGroup()->first();
+            if (null !== $group) {
+                $groupId       = $group->id;
+                if (in_array($groupId, array_keys($set), true)) {
+                    continue;
+                }
+                $set[$groupId] = $group;
+            }
+        }
+        $collection->push(...$set);
+
+        return $collection;
+    }
+
     public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser
     {
         $now                  = today(config('app.timezone'));
@@ -392,28 +416,4 @@ class UserRepository implements UserRepositoryInterface
 
         return null !== $invitee;
     }
-
-    #[\Override]
-    public function getUserGroups(User $user): Collection
-    {
-        $memberships = $user->groupMemberships()->get();
-        $set         = [];
-        $collection  = new Collection();
-
-        /** @var GroupMembership $membership */
-        foreach ($memberships as $membership) {
-            /** @var null|UserGroup $group */
-            $group = $membership->userGroup()->first();
-            if (null !== $group) {
-                $groupId       = (int)$group->id;
-                if (in_array($groupId, $set, true)) {
-                    continue;
-                }
-                $set[$groupId] = $group;
-            }
-        }
-        $collection->push(...$set);
-
-        return $collection;
-    }
 }

app/Repositories/User/UserRepositoryInterface.php

@@ -59,8 +59,6 @@ interface UserRepositoryInterface
 
     public function changeStatus(User $user, bool $isBlocked, string $code): bool;
 
-    public function getUserGroups(User $user): Collection;
-
     /**
      * Returns a count of all users.
      */
@@ -96,6 +94,8 @@ interface UserRepositoryInterface
      */
     public function getUserData(User $user): array;
 
+    public function getUserGroups(User $user): Collection;
+
     public function hasRole(null|Authenticatable|User $user, string $role): bool;
 
     public function inviteUser(null|Authenticatable|User $user, string $email): InvitedUser;

app/Repositories/UserGroup/UserGroupRepository.php

@@ -106,8 +106,8 @@ class UserGroupRepository implements UserGroupRepositoryInterface
             /** @var null|UserGroup $group */
             $group = $membership->userGroup()->first();
             if (null !== $group) {
-                $groupId       = (int)$group->id;
-                if (in_array($groupId, $set, true)) {
+                $groupId       = $group->id;
+                if (in_array($groupId, array_keys($set), true)) {
                     continue;
                 }
                 $set[$groupId] = $group;

app/Repositories/UserGroup/UserGroupRepositoryInterface.php

@@ -38,8 +38,6 @@ interface UserGroupRepositoryInterface
 
     public function get(): Collection;
 
-    public function useUserGroup(UserGroup $userGroup): void;
-
     public function getAll(): Collection;
 
     public function setUser(null|Authenticatable|User $user): void;
@@ -49,4 +47,6 @@ interface UserGroupRepositoryInterface
     public function update(UserGroup $userGroup, array $data): UserGroup;
 
     public function updateMembership(UserGroup $userGroup, array $data): UserGroup;
+
+    public function useUserGroup(UserGroup $userGroup): void;
 }

app/Repositories/UserGroups/Account/AccountRepositoryInterface.php

@@ -63,6 +63,8 @@ interface AccountRepositoryInterface
      */
     public function getMetaValue(Account $account, string $field): ?string;
 
+    public function getUserGroup(): UserGroup;
+
     /**
      * Reset order types of the mentioned accounts.
      */
@@ -74,7 +76,5 @@ interface AccountRepositoryInterface
 
     public function setUserGroup(UserGroup $userGroup): void;
 
-    public function getUserGroup(): UserGroup;
-
     public function update(Account $account, array $data): Account;
 }

app/Services/FireflyIIIOrg/Update/UpdateRequest.php

@@ -117,7 +117,7 @@ class UpdateRequest implements UpdateRequestInterface
         // parse response a bit. No message yet.
         $response          = $json['firefly_iii'][$channel];
         $date              = Carbon::createFromFormat('Y-m-d', $response['date']);
-        if (false === $date) {
+        if (null === $date) {
             $date = today(config('app.timezone'));
         }
         $return['version'] = $response['version'];

app/Services/Internal/Update/GroupCloneService.php

@@ -54,7 +54,7 @@ class GroupCloneService
     {
         $newJournal                       = $journal->replicate();
         $newJournal->transaction_group_id = $newGroup->id;
-        $newJournal->date                 = today(config('app.timezone'));
+        $newJournal->date                 = now();
         $newJournal->save();
 
         foreach ($journal->transactions as $transaction) {

app/Services/Internal/Update/JournalUpdateService.php

@@ -187,7 +187,7 @@ class JournalUpdateService
 
         // make new account validator.
         $expectedType = $this->getExpectedType();
-        app('log')->debug(sprintf('Expected type (new or unchanged) is %s', $expectedType));
+        app('log')->debug(sprintf('(a) Expected type (new or unchanged) is %s', $expectedType));
 
         // make a new validator.
         /** @var AccountValidator $validator */
@@ -273,7 +273,7 @@ class JournalUpdateService
 
         // make new account validator.
         $expectedType      = $this->getExpectedType();
-        app('log')->debug(sprintf('Expected type (new or unchanged) is %s', $expectedType));
+        app('log')->debug(sprintf('(b) Expected type (new or unchanged) is %s', $expectedType));
 
         // make a new validator.
         /** @var AccountValidator $validator */
@@ -404,7 +404,7 @@ class JournalUpdateService
 
         // make new account validator.
         $expectedType = $this->getExpectedType();
-        app('log')->debug(sprintf('Expected type (new or unchanged) is %s', $expectedType));
+        app('log')->debug(sprintf('(c) Expected type (new or unchanged) is %s', $expectedType));
 
         try {
             $result = $this->getAccount($expectedType, 'destination', $destInfo);

app/Support/Authentication/RemoteUserGuard.php

@@ -146,7 +146,7 @@ class RemoteUserGuard implements Guard
         return $this->user?->id;
     }
 
-    public function setUser(null|Authenticatable|User $user): void
+    public function setUser(null|Authenticatable|User $user): void // @phpstan-ignore-line
     {
         app('log')->debug(sprintf('Now at %s', __METHOD__));
         if ($user instanceof User) {

app/Support/Authentication/RemoteUserProvider.php

@@ -36,6 +36,14 @@ use Illuminate\Contracts\Auth\UserProvider;
  */
 class RemoteUserProvider implements UserProvider
 {
+    #[\Override]
+    public function rehashPasswordIfRequired(Authenticatable $user, array $credentials, bool $force = false): void
+    {
+        app('log')->debug(sprintf('Now at %s', __METHOD__));
+
+        throw new FireflyException(sprintf('Did not implement %s', __METHOD__));
+    }
+
     /**
      * @throws FireflyException
      *
@@ -120,12 +128,4 @@ class RemoteUserProvider implements UserProvider
 
         throw new FireflyException(sprintf('C) Did not implement %s', __METHOD__));
     }
-
-    #[\Override]
-    public function rehashPasswordIfRequired(Authenticatable $user, array $credentials, bool $force = false): void
-    {
-        app('log')->debug(sprintf('Now at %s', __METHOD__));
-
-        throw new FireflyException(sprintf('Did not implement %s', __METHOD__));
-    }
 }

app/Support/Http/Controllers/DateCalculation.php

@@ -46,7 +46,7 @@ trait DateCalculation
             $difference = $today->diffInDays($end);
         }
 
-        return (int) (0 === $difference ? 1 : $difference);
+        return (int)(0 === $difference ? 1 : $difference);
     }
 
     /**
@@ -63,7 +63,7 @@ trait DateCalculation
             $difference = $start->diffInDays($today, true) + 1;
         }
 
-        return (int) $difference;
+        return (int)$difference;
     }
 
     protected function calculateStep(Carbon $start, Carbon $end): string

app/Support/Http/Controllers/RequestInformation.php

@@ -145,14 +145,14 @@ trait RequestInformation
         $attributes['location'] ??= '';
         $attributes['accounts']  = AccountList::routeBinder($attributes['accounts'] ?? '', new Route('get', '', []));
         $date                    = Carbon::createFromFormat('Ymd', $attributes['startDate']);
-        if (false === $date) {
+        if (null === $date) {
             $date = today(config('app.timezone'));
         }
         $date->startOfMonth();
         $attributes['startDate'] = $date;
 
         $date2                   = Carbon::createFromFormat('Ymd', $attributes['endDate']);
-        if (false === $date2) {
+        if (null === $date2) {
             $date2 = today(config('app.timezone'));
         }
         $date2->endOfDay();

app/Support/Navigation.php

@@ -188,7 +188,7 @@ class Navigation
             Log::debug(sprintf('Function is ->%s()', $function));
             if (array_key_exists($function, $parameterMap)) {
                 Log::debug(sprintf('Parameter map, function becomes ->%s(%s)', $function, implode(', ', $parameterMap[$function])));
-                $date->{$function}($parameterMap[$function][0]);
+                $date->{$function}($parameterMap[$function][0]); // @phpstan-ignore-line
                 Log::debug(sprintf('Result is "%s"', $date->toIso8601String()));
 
                 return $date;
@@ -274,7 +274,7 @@ class Navigation
 
                 /** @var Carbon $tEnd */
                 $tEnd       = session('end', today(config('app.timezone'))->endOfMonth());
-                $diffInDays = (int) $tStart->diffInDays($tEnd, true);
+                $diffInDays = (int)$tStart->diffInDays($tEnd, true);
             }
             Log::debug(sprintf('Diff in days is %d', $diffInDays));
             $currentEnd->addDays($diffInDays);
@@ -327,7 +327,7 @@ class Navigation
     {
         $endOfMonth = $date->copy()->endOfMonth();
 
-        return (int) $date->diffInDays($endOfMonth, true);
+        return (int)$date->diffInDays($endOfMonth, true);
     }
 
     public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int
@@ -677,7 +677,7 @@ class Navigation
 
             /** @var Carbon $tEnd */
             $tEnd       = session('end', today(config('app.timezone'))->endOfMonth());
-            $diffInDays = (int) $tStart->diffInDays($tEnd, true);
+            $diffInDays = (int)$tStart->diffInDays($tEnd, true);
             $date->subDays($diffInDays * $subtract);
 
             return $date;

app/Support/ParseDateString.php

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Support;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterface;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Exceptions\FireflyException;
 use Illuminate\Support\Facades\Log;
@@ -122,12 +123,12 @@ class ParseDateString
     {
         $today = today(config('app.timezone'))->startOfDay();
 
-        return match ($keyword) {
+        return match ($keyword) { // @phpstan-ignore-line
             default                 => $today,
             'yesterday'             => $today->subDay(),
             'tomorrow'              => $today->addDay(),
-            'start of this week'    => $today->startOfWeek(Carbon::MONDAY),
-            'end of this week'      => $today->endOfWeek(Carbon::SUNDAY),
+            'start of this week'    => $today->startOfWeek(CarbonInterface::MONDAY),
+            'end of this week'      => $today->endOfWeek(CarbonInterface::SUNDAY),
             'start of this month'   => $today->startOfMonth(),
             'end of this month'     => $today->endOfMonth(),
             'start of this quarter' => $today->startOfQuarter(),

app/Support/Preferences.php

@@ -89,6 +89,17 @@ class Preferences
         return $this->setForUser($user, $name, $default);
     }
 
+    private function getUserGroupId(User $user, string $preferenceName): ?int
+    {
+        $groupId = null;
+        $items   = config('firefly.admin_specific_prefs') ?? [];
+        if (in_array($preferenceName, $items, true)) {
+            $groupId = (int)$user->user_group_id;
+        }
+
+        return $groupId;
+    }
+
     public function delete(string $name): bool
     {
         $fullName = sprintf('preference%s%s', auth()->user()->id, $name);
@@ -215,7 +226,7 @@ class Preferences
 
     public function set(string $name, null|array|bool|int|string $value): Preference
     {
-        /** @var User $user */
+        /** @var null|User $user */
         $user = auth()->user();
         if (null === $user) {
             // make new preference, return it:
@@ -228,15 +239,4 @@ class Preferences
 
         return $this->setForUser($user, $name, $value);
     }
-
-    private function getUserGroupId(User $user, string $preferenceName): ?int
-    {
-        $groupId = null;
-        $items   = config('firefly.admin_specific_prefs');
-        if (in_array($preferenceName, $items, true)) {
-            $groupId = (int)$user->user_group_id;
-        }
-
-        return $groupId;
-    }
 }

app/Support/Request/ConvertsDataTypes.php

@@ -250,7 +250,7 @@ trait ConvertsDataTypes
 
                 return null;
             }
-            if (false === $carbon) {
+            if (null === $carbon) {
                 app('log')->error(sprintf('[2] "%s" is of an invalid format.', $value));
 
                 return null;

app/TransactionRules/Expressions/ActionExpression.php

@@ -29,7 +29,7 @@ use Symfony\Component\ExpressionLanguage\SyntaxError;
 
 class ActionExpression
 {
-    private static array $NAMES
+    private static array       $NAMES
         = [
             //        'transaction_group_id',
             //        'user_id',

app/Transformers/AccountTransformer.php

@@ -185,7 +185,7 @@ class AccountTransformer extends AbstractTransformer
             // try classic date:
             if (10 === strlen($monthlyPaymentDate)) {
                 $object             = Carbon::createFromFormat('!Y-m-d', $monthlyPaymentDate, config('app.timezone'));
-                if (false === $object) {
+                if (null === $object) {
                     $object = today(config('app.timezone'));
                 }
                 $monthlyPaymentDate = $object->toAtomString();
@@ -212,7 +212,7 @@ class AccountTransformer extends AbstractTransformer
         }
         if (null !== $openingBalanceDate) {
             $object             = Carbon::createFromFormat('Y-m-d H:i:s', $openingBalanceDate, config('app.timezone'));
-            if (false === $object) {
+            if (null === $object) {
                 $object = today(config('app.timezone'));
             }
             $openingBalanceDate = $object->toAtomString();

app/Transformers/BillTransformer.php

@@ -82,7 +82,7 @@ class BillTransformer extends AbstractTransformer
         $payDatesFormatted = [];
         foreach ($paidData as $object) {
             $date                = Carbon::createFromFormat('!Y-m-d', $object['date'], config('app.timezone'));
-            if (false === $date) {
+            if (null === $date) {
                 $date = today(config('app.timezone'));
             }
             $object['date']      = $date->toAtomString();
@@ -91,7 +91,7 @@ class BillTransformer extends AbstractTransformer
 
         foreach ($payDates as $string) {
             $date                = Carbon::createFromFormat('!Y-m-d', $string, config('app.timezone'));
-            if (false === $date) {
+            if (null === $date) {
                 $date = today(config('app.timezone'));
             }
             $payDatesFormatted[] = $date->toAtomString();
@@ -104,7 +104,7 @@ class BillTransformer extends AbstractTransformer
 
         if (null !== $firstPayDate) {
             $nemDate = Carbon::createFromFormat('!Y-m-d', $firstPayDate, config('app.timezone'));
-            if (false === $nemDate) {
+            if (null === $nemDate) {
                 $nemDate = today(config('app.timezone'));
             }
             $nem     = $nemDate->toAtomString();
@@ -129,7 +129,7 @@ class BillTransformer extends AbstractTransformer
             $current = $payDatesFormatted[0] ?? null;
             if (null !== $current && !$nemDate->isToday()) {
                 $temp2   = Carbon::createFromFormat('Y-m-d\TH:i:sP', $current);
-                if (false === $temp2) {
+                if (null === $temp2) {
                     $temp2 = today(config('app.timezone'));
                 }
                 $nemDiff = trans('firefly.bill_expected_date', ['date' => $temp2->diffForHumans(today(config('app.timezone')), CarbonInterface::DIFF_RELATIVE_TO_NOW)]);

app/Transformers/V2/PiggyBankTransformer.php

@@ -248,7 +248,7 @@ class PiggyBankTransformer extends AbstractTransformer
         if (bccomp($currentAmount, $targetAmount) < 1) {
             $now             = today(config('app.timezone'));
             $startDate       = null !== $startDate && $startDate->gte($now) ? $startDate : $now;
-            $diffInMonths    = (int) $startDate->diffInMonths($targetDate);
+            $diffInMonths    = (int)$startDate->diffInMonths($targetDate);
             $remainingAmount = bcsub($targetAmount, $currentAmount);
 
             // more than 1 month to go and still need money to save:

app/Transformers/V2/TransactionGroupTransformer.php

@@ -462,7 +462,7 @@ class TransactionGroupTransformer extends AbstractTransformer
         //        app('log')->debug(sprintf('Now in date("%s")', $string));
         if (10 === strlen($string)) {
             $res = Carbon::createFromFormat('Y-m-d', $string, config('app.timezone'));
-            if (false === $res) {
+            if (null === $res) {
                 return null;
             }
 
@@ -473,7 +473,7 @@ class TransactionGroupTransformer extends AbstractTransformer
         }
         if (19 === strlen($string) && str_contains($string, 'T')) {
             $res = Carbon::createFromFormat('Y-m-d\TH:i:s', substr($string, 0, 19), config('app.timezone'));
-            if (false === $res) {
+            if (null === $res) {
                 return null;
             }
 
@@ -482,7 +482,7 @@ class TransactionGroupTransformer extends AbstractTransformer
 
         // 2022-01-01 01:01:01
         $res = Carbon::createFromFormat('Y-m-d H:i:s', substr($string, 0, 19), config('app.timezone'));
-        if (false === $res) {
+        if (null === $res) {
             return null;
         }
 

app/Transformers/V2/UserGroupTransformer.php

@@ -35,9 +35,9 @@ use Illuminate\Support\Collection;
  */
 class UserGroupTransformer extends AbstractTransformer
 {
+    private array $inUse;
     private array $memberships;
     private array $membershipsVisible;
-    private array $inUse;
 
     public function __construct()
     {
@@ -84,13 +84,13 @@ class UserGroupTransformer extends AbstractTransformer
     public function transform(UserGroup $userGroup): array
     {
         return [
-            'id'                     => $userGroup->id,
-            'created_at'             => $userGroup->created_at->toAtomString(),
-            'updated_at'             => $userGroup->updated_at->toAtomString(),
-            'in_use'                 => $this->inUse[$userGroup->id] ?? false,
-            'title'                  => $userGroup->title,
-            'can_see_members'        => $this->membershipsVisible[$userGroup->id] ?? false,
-            'members'                => $this->memberships[$userGroup->id] ?? [],
+            'id'              => $userGroup->id,
+            'created_at'      => $userGroup->created_at->toAtomString(),
+            'updated_at'      => $userGroup->updated_at->toAtomString(),
+            'in_use'          => $this->inUse[$userGroup->id] ?? false,
+            'title'           => $userGroup->title,
+            'can_see_members' => $this->membershipsVisible[$userGroup->id] ?? false,
+            'members'         => $this->memberships[$userGroup->id] ?? [],
         ];
         // if the user has a specific role in this group, then collect the memberships.
     }

composer.lock

@@ -1670,16 +1670,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.1.1",
+            "version": "v11.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec"
+                "reference": "a1750156b671f37cba702380107e2d22161c31e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
-                "reference": "1437cea6d2b04cbc83743fbb208e1a01efccd9ec",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/a1750156b671f37cba702380107e2d22161c31e3",
+                "reference": "a1750156b671f37cba702380107e2d22161c31e3",
                 "shasum": ""
             },
             "require": {
@@ -1871,7 +1871,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-03-28T15:07:18+00:00"
+            "time": "2024-04-02T14:01:33+00:00"
         },
         {
             "name": "laravel/passport",
@@ -5481,16 +5481,16 @@
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.5.0",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada"
+                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada",
-                "reference": "e23f4e8ce6644dc3d68b9d8a0aed3beaca0d6ada",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
+                "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
                 "shasum": ""
             },
             "require": {
@@ -5569,7 +5569,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-29T14:14:55+00:00"
+            "time": "2024-04-02T06:30:22+00:00"
         },
         {
             "name": "spatie/period",
@@ -5627,16 +5627,16 @@
         },
         {
             "name": "symfony/cache",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "fc822951dd360a593224bb2cef90a087d0dff60f"
+                "reference": "2d0d3f92c74c445410d05374908b03e0a1131e2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f",
-                "reference": "fc822951dd360a593224bb2cef90a087d0dff60f",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/2d0d3f92c74c445410d05374908b03e0a1131e2b",
+                "reference": "2d0d3f92c74c445410d05374908b03e0a1131e2b",
                 "shasum": ""
             },
             "require": {
@@ -5703,7 +5703,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v7.0.4"
+                "source": "https://github.com/symfony/cache/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -5719,20 +5719,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:20+00:00"
+            "time": "2024-03-27T19:55:25+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "1d74b127da04ffa87aa940abe15446fa89653778"
+                "reference": "2c9db6509a1b21dad229606897639d3284f54b2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778",
-                "reference": "1d74b127da04ffa87aa940abe15446fa89653778",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/2c9db6509a1b21dad229606897639d3284f54b2a",
+                "reference": "2c9db6509a1b21dad229606897639d3284f54b2a",
                 "shasum": ""
             },
             "require": {
@@ -5779,7 +5779,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -5795,7 +5795,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-09-25T12:52:38+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/clock",
@@ -5873,16 +5873,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f"
+                "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f",
-                "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fde915cd8e7eb99b3d531d3d5c09531429c3f9e5",
+                "reference": "fde915cd8e7eb99b3d531d3d5c09531429c3f9e5",
                 "shasum": ""
             },
             "require": {
@@ -5946,7 +5946,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.0.4"
+                "source": "https://github.com/symfony/console/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -5962,7 +5962,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:20+00:00"
+            "time": "2024-04-01T11:04:53+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -6098,16 +6098,16 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "677b24759decff69e65b1e9d1471d90f95ced880"
+                "reference": "46a4cc138f799886d4bd70477c55c699d3e9dfc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/677b24759decff69e65b1e9d1471d90f95ced880",
-                "reference": "677b24759decff69e65b1e9d1471d90f95ced880",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/46a4cc138f799886d4bd70477c55c699d3e9dfc8",
+                "reference": "46a4cc138f799886d4bd70477c55c699d3e9dfc8",
                 "shasum": ""
             },
             "require": {
@@ -6153,7 +6153,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v7.0.4"
+                "source": "https://github.com/symfony/error-handler/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -6169,7 +6169,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-22T20:27:20+00:00"
+            "time": "2024-03-19T11:57:22+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -6253,16 +6253,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/4e64b49bf370ade88e567de29465762e316e4224",
+                "reference": "4e64b49bf370ade88e567de29465762e316e4224",
                 "shasum": ""
             },
             "require": {
@@ -6309,7 +6309,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -6325,7 +6325,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/expression-language",
@@ -6456,22 +6456,22 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v7.0.5",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b"
+                "reference": "6e70473909f46fe5dd3b994a0f1b20ecb6b2f858"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/425f462a59d8030703ee04a9e1c666575ed5db3b",
-                "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/6e70473909f46fe5dd3b994a0f1b20ecb6b2f858",
+                "reference": "6e70473909f46fe5dd3b994a0f1b20ecb6b2f858",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/http-client-contracts": "^3",
+                "symfony/http-client-contracts": "^3.4.1",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
@@ -6489,7 +6489,7 @@
                 "amphp/http-client": "^4.2.1",
                 "amphp/http-tunnel": "^1.0",
                 "amphp/socket": "^1.1",
-                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
@@ -6528,7 +6528,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v7.0.5"
+                "source": "https://github.com/symfony/http-client/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -6544,20 +6544,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-02T12:46:12+00:00"
+            "time": "2024-04-01T20:49:44+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.4.0",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654"
+                "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654",
-                "reference": "1ee70e699b41909c209a0c930f11034b93578654",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e",
+                "reference": "b6b5c876b3a4ed74460e2c5ac53bbce2f12e2a7e",
                 "shasum": ""
             },
             "require": {
@@ -6606,7 +6606,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -6622,20 +6622,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-30T20:28:31+00:00"
+            "time": "2024-04-01T18:51:09+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "439fdfdd344943254b1ef6278613e79040548045"
+                "reference": "8789625dcf36e5fbf753014678a1e090f1bc759c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/439fdfdd344943254b1ef6278613e79040548045",
-                "reference": "439fdfdd344943254b1ef6278613e79040548045",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8789625dcf36e5fbf753014678a1e090f1bc759c",
+                "reference": "8789625dcf36e5fbf753014678a1e090f1bc759c",
                 "shasum": ""
             },
             "require": {
@@ -6683,7 +6683,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.0.4"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -6699,20 +6699,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-08T19:22:56+00:00"
+            "time": "2024-03-19T11:46:48+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.0.5",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "37c24ca28f65e3121a68f3dd4daeb36fb1fa2a72"
+                "reference": "34c872391046d59af804af62d4573b829cfe4824"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/37c24ca28f65e3121a68f3dd4daeb36fb1fa2a72",
-                "reference": "37c24ca28f65e3121a68f3dd4daeb36fb1fa2a72",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/34c872391046d59af804af62d4573b829cfe4824",
+                "reference": "34c872391046d59af804af62d4573b829cfe4824",
                 "shasum": ""
             },
             "require": {
@@ -6795,7 +6795,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.0.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -6811,20 +6811,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-03-04T21:05:24+00:00"
+            "time": "2024-04-03T06:12:25+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "72e16d87bf50a3ce195b9470c06bb9d7b816ea85"
+                "reference": "eb0c3187c7ddfde12d8aa0e1fa5fb29e730a41e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/72e16d87bf50a3ce195b9470c06bb9d7b816ea85",
-                "reference": "72e16d87bf50a3ce195b9470c06bb9d7b816ea85",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/eb0c3187c7ddfde12d8aa0e1fa5fb29e730a41e0",
+                "reference": "eb0c3187c7ddfde12d8aa0e1fa5fb29e730a41e0",
                 "shasum": ""
             },
             "require": {
@@ -6875,7 +6875,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.0.4"
+                "source": "https://github.com/symfony/mailer/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -6891,7 +6891,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-03T21:34:19+00:00"
+            "time": "2024-03-28T09:20:36+00:00"
         },
         {
             "name": "symfony/mailgun-mailer",
@@ -6964,16 +6964,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.0.3",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "c1ffe24ba6fdc3e3f0f3fcb93519103b326a3716"
+                "reference": "99362408c9abdf8c7cadcf0529b6fc8b16f5ace2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/c1ffe24ba6fdc3e3f0f3fcb93519103b326a3716",
-                "reference": "c1ffe24ba6fdc3e3f0f3fcb93519103b326a3716",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/99362408c9abdf8c7cadcf0529b6fc8b16f5ace2",
+                "reference": "99362408c9abdf8c7cadcf0529b6fc8b16f5ace2",
                 "shasum": ""
             },
             "require": {
@@ -6993,6 +6993,7 @@
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
                 "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
                 "symfony/property-access": "^6.4|^7.0",
                 "symfony/property-info": "^6.4|^7.0",
                 "symfony/serializer": "^6.4|^7.0"
@@ -7027,7 +7028,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.0.3"
+                "source": "https://github.com/symfony/mime/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -7043,7 +7044,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-30T08:34:29+00:00"
+            "time": "2024-03-21T19:37:36+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -7819,16 +7820,16 @@
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v7.0.3",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "d9fadaf9541d7c01c307e48905d7ce1dbee6bf38"
+                "reference": "fbc500cbcb64d3ea7469f019ab7aa717b320ff3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d9fadaf9541d7c01c307e48905d7ce1dbee6bf38",
-                "reference": "d9fadaf9541d7c01c307e48905d7ce1dbee6bf38",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/fbc500cbcb64d3ea7469f019ab7aa717b320ff3f",
+                "reference": "fbc500cbcb64d3ea7469f019ab7aa717b320ff3f",
                 "shasum": ""
             },
             "require": {
@@ -7882,7 +7883,7 @@
                 "psr-7"
             ],
             "support": {
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.0.3"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -7898,20 +7899,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T15:02:46+00:00"
+            "time": "2024-03-28T09:20:36+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v7.0.5",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "ba6bf07d43289c6a4b4591ddb75bc3bc5f069c19"
+                "reference": "cded64e5bbf9f31786f1055fcc76718fdd77519c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/ba6bf07d43289c6a4b4591ddb75bc3bc5f069c19",
-                "reference": "ba6bf07d43289c6a4b4591ddb75bc3bc5f069c19",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/cded64e5bbf9f31786f1055fcc76718fdd77519c",
+                "reference": "cded64e5bbf9f31786f1055fcc76718fdd77519c",
                 "shasum": ""
             },
             "require": {
@@ -7963,7 +7964,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.0.5"
+                "source": "https://github.com/symfony/routing/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -7979,20 +7980,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-27T12:34:35+00:00"
+            "time": "2024-03-28T21:02:11+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0"
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0",
-                "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/11bbf19a0fb7b36345861e85c5768844c552906e",
+                "reference": "11bbf19a0fb7b36345861e85c5768844c552906e",
                 "shasum": ""
             },
             "require": {
@@ -8045,7 +8046,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -8061,7 +8062,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2023-12-19T21:51:00+00:00"
         },
         {
             "name": "symfony/string",
@@ -8245,16 +8246,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.4.1",
+            "version": "v3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7"
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7",
-                "reference": "06450585bf65e978026bda220cdebca3f867fde7",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
+                "reference": "43810bdb2ddb5400e5c5e778e27b210a0ca83b6b",
                 "shasum": ""
             },
             "require": {
@@ -8303,7 +8304,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.4.2"
             },
             "funding": [
                 {
@@ -8319,7 +8320,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-26T14:02:43+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
         },
         {
             "name": "symfony/uid",
@@ -8397,16 +8398,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670"
+                "reference": "66d13dc207d5dab6b4f4c2b5460efe1bea29dbfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e03ad7c1535e623edbb94c22cc42353e488c6670",
-                "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/66d13dc207d5dab6b4f4c2b5460efe1bea29dbfb",
+                "reference": "66d13dc207d5dab6b4f4c2b5460efe1bea29dbfb",
                 "shasum": ""
             },
             "require": {
@@ -8460,7 +8461,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.0.4"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -8476,26 +8477,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-15T11:33:06+00:00"
+            "time": "2024-03-19T11:57:22+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v7.0.4",
+            "version": "v7.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41"
+                "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
-                "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/c74c568d2a15a1d407cf40d61ea82bc2d521e27b",
+                "reference": "c74c568d2a15a1d407cf40d61ea82bc2d521e27b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.2"
             },
             "require-dev": {
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
                 "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
@@ -8534,7 +8537,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v7.0.4"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.0.6"
             },
             "funding": [
                 {
@@ -8550,7 +8553,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-26T10:35:24+00:00"
+            "time": "2024-03-20T21:25:22+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -8897,16 +8900,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.13.0",
+            "version": "v3.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a"
+                "reference": "da425a64d9d3bf4730e9f050e2771b9c37fe7649"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
-                "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/da425a64d9d3bf4730e9f050e2771b9c37fe7649",
+                "reference": "da425a64d9d3bf4730e9f050e2771b9c37fe7649",
                 "shasum": ""
             },
             "require": {
@@ -8965,7 +8968,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.0"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.2"
             },
             "funding": [
                 {
@@ -8977,7 +8980,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-04-01T16:39:30+00:00"
+            "time": "2024-04-03T19:25:19+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
@@ -9606,16 +9609,16 @@
         },
         {
             "name": "maximebf/debugbar",
-            "version": "v1.22.1",
+            "version": "v1.22.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc"
+                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
-                "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
+                "reference": "7aa9a27a0b1158ed5ad4e7175e8d3aee9a818b96",
                 "shasum": ""
             },
             "require": {
@@ -9668,9 +9671,9 @@
             ],
             "support": {
                 "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.1"
+                "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.3"
             },
-            "time": "2024-04-01T10:44:20+00:00"
+            "time": "2024-04-03T19:39:26+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -10235,16 +10238,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.27.0",
+            "version": "1.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
-                "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
                 "shasum": ""
             },
             "require": {
@@ -10276,9 +10279,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.28.0"
             },
-            "time": "2024-03-21T13:14:53+00:00"
+            "time": "2024-04-03T18:51:33+00:00"
         },
         {
             "name": "phpstan/phpstan",

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-04-02',
+    'version'                      => 'develop/2024-04-04',
     'api_version'                  => '2.0.13',
     'db_version'                   => 24,
 

database/migrations/2016_10_09_150037_expand_transactions_table.php

@@ -21,7 +21,6 @@
  */
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -46,7 +45,7 @@ class ExpandTransactionsTable extends Migration
                         $table->dropColumn('identifier');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not drop column "identifier": %s', $e->getMessage()));
                 app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2016_12_28_203205_changes_for_v431.php

@@ -21,7 +21,6 @@
  */
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -74,7 +73,7 @@ class ChangesForV431 extends Migration
                         $table->renameColumn('start_date', 'startdate');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -89,7 +88,7 @@ class ChangesForV431 extends Migration
                         $table->dropColumn('end_date');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -103,7 +102,7 @@ class ChangesForV431 extends Migration
                         $table->dropColumn('decimal_places');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -141,7 +140,7 @@ class ChangesForV431 extends Migration
                         $table->renameColumn('startdate', 'start_date');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -171,7 +170,7 @@ class ChangesForV431 extends Migration
                         $table->dropColumn('repeats');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -184,7 +183,7 @@ class ChangesForV431 extends Migration
                         $table->dropColumn('repeat_freq');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2017_04_13_163623_changes_for_v440.php

@@ -21,7 +21,6 @@
  */
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -53,7 +52,7 @@ class ChangesForV440 extends Migration
                     }
                 }
             );
-        } catch (ColumnDoesNotExist|QueryException $e) {
+        } catch (QueryException $e) {
             app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
             app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
         }

database/migrations/2017_06_02_105232_changes_for_v450.php

@@ -21,7 +21,6 @@
  */
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -47,7 +46,7 @@ class ChangesForV450 extends Migration
                         $table->dropColumn('foreign_amount');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -75,7 +74,7 @@ class ChangesForV450 extends Migration
                         $table->dropColumn('foreign_currency_id');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2017_11_04_170844_changes_for_v470a.php

@@ -21,7 +21,6 @@
  */
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -47,7 +46,7 @@ class ChangesForV470a extends Migration
                         $table->dropColumn('reconciled');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2018_03_19_141348_changes_for_v472.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -61,7 +60,7 @@ class ChangesForV472 extends Migration
                         $table->dropColumn('order');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -83,7 +82,7 @@ class ChangesForV472 extends Migration
                         $table->dropColumn('notes');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2018_04_07_210913_changes_for_v473.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -52,7 +51,7 @@ class ChangesForV473 extends Migration
                         $table->dropColumn('transaction_currency_id');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -66,7 +65,7 @@ class ChangesForV473 extends Migration
                         $table->dropColumn('strict');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2018_09_05_195147_changes_for_v477.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -52,7 +51,7 @@ class ChangesForV477 extends Migration
                         $table->dropColumn(['transaction_currency_id']);
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2018_11_06_172532_changes_for_v479.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -47,7 +46,7 @@ class ChangesForV479 extends Migration
                         $table->dropColumn(['enabled']);
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2019_03_11_223700_fix_ldap_configuration.php

@@ -21,7 +21,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -47,7 +46,7 @@ class FixLdapConfiguration extends Migration
                         $table->dropColumn(['objectguid']);
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2019_03_22_183214_changes_for_v480.php

@@ -21,7 +21,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -57,7 +56,7 @@ class ChangesForV480 extends Migration
 
                         try {
                             $table->dropColumn('transaction_group_id');
-                        } catch (ColumnDoesNotExist|QueryException $e) {
+                        } catch (QueryException $e) {
                             app('log')->error(sprintf('Could not drop column: %s', $e->getMessage()));
                             app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.');
                         }
@@ -77,7 +76,7 @@ class ChangesForV480 extends Migration
                     static function (Blueprint $table): void {
                         try {
                             $table->dropColumn('stop_processing');
-                        } catch (ColumnDoesNotExist|QueryException $e) {
+                        } catch (QueryException $e) {
                             app('log')->error(sprintf('Could not drop column: %s', $e->getMessage()));
                             app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.');
                         }
@@ -97,7 +96,7 @@ class ChangesForV480 extends Migration
                     static function (Blueprint $table): void {
                         try {
                             $table->dropColumn('mfa_secret');
-                        } catch (ColumnDoesNotExist|QueryException $e) {
+                        } catch (QueryException $e) {
                             app('log')->error(sprintf('Could not drop column: %s', $e->getMessage()));
                             app('log')->error('If the column does not exist, this is not an problem. Otherwise, please open a GitHub discussion.');
                         }

database/migrations/2020_06_30_202620_changes_for_v530a.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -48,7 +47,7 @@ class ChangesForV530a extends Migration
                         $table->dropColumn('order');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2020_07_24_162820_changes_for_v540.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -48,7 +47,7 @@ class ChangesForV540 extends Migration
                         $table->dropColumn('provider');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -62,7 +61,7 @@ class ChangesForV540 extends Migration
                         $table->dropColumn('order');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -76,7 +75,7 @@ class ChangesForV540 extends Migration
                         $table->dropColumn('end_date');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -89,7 +88,7 @@ class ChangesForV540 extends Migration
                         $table->dropColumn('extension_date');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2020_11_12_070604_changes_for_v550.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -76,7 +75,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('budget_limit_id');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -95,7 +94,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('period');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }
@@ -108,7 +107,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('generated');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2021_03_12_061213_changes_for_v550b2.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -51,7 +50,7 @@ class ChangesForV550b2 extends Migration
                         }
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2021_05_09_064644_add_ldap_columns_to_users_table.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -43,7 +42,7 @@ class AddLdapColumnsToUsersTable extends Migration
                         $table->dropColumn(['domain']);
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2021_08_28_073733_user_groups.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -72,7 +71,7 @@ class UserGroups extends Migration
                             }
                         }
                     );
-                } catch (ColumnDoesNotExist|QueryException $e) {
+                } catch (QueryException $e) {
                     app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                     app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
                 }
@@ -92,7 +91,7 @@ class UserGroups extends Migration
                         }
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (QueryException $e) {
                 app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
                 app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
             }

database/migrations/2022_08_21_104626_add_user_groups.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -69,7 +68,7 @@ return new class () extends Migration {
                     }
                 }
             );
-        } catch (ColumnDoesNotExist|QueryException $e) {
+        } catch (QueryException $e) {
             app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
             app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
         }

database/migrations/2023_08_11_192521_upgrade_og_table.php

@@ -22,7 +22,6 @@
 
 declare(strict_types=1);
 
-use Doctrine\DBAL\Schema\Exception\ColumnDoesNotExist;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\QueryException;
 use Illuminate\Database\Schema\Blueprint;
@@ -71,7 +70,7 @@ return new class () extends Migration {
                     }
                 }
             );
-        } catch (ColumnDoesNotExist|QueryException $e) {
+        } catch (QueryException $e) {
             app('log')->error(sprintf('Could not execute query: %s', $e->getMessage()));
             app('log')->error('If the column or index already exists (see error), this is not an problem. Otherwise, please open a GitHub discussion.');
         }

package-lock.json

@@ -69,9 +69,9 @@
             "integrity": "sha512-fU6wDpK0//dJLp5pwojuTUQPi4nVZ4iTBF1yaQw+6NXeGi0ma7rz7IOS6Idw0XXE3ELKGTuO7QUJmxxdL7kykw=="
         },
         "node_modules/@babel/runtime": {
-            "version": "7.24.1",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
-            "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==",
+            "version": "7.24.4",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz",
+            "integrity": "sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -432,9 +432,9 @@
             }
         },
         "node_modules/@fortawesome/fontawesome-free": {
-            "version": "6.5.1",
-            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz",
-            "integrity": "sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==",
+            "version": "6.5.2",
+            "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.2.tgz",
+            "integrity": "sha512-hRILoInAx8GNT5IMkrtIt9blOdrqHOnPBH+k70aWUAqPZPgopb9G5EQJFpaBx/S8zp2fC+mPW349Bziuk1o28Q==",
             "hasInstallScript": true,
             "engines": {
                 "node": ">=6"
@@ -479,9 +479,9 @@
             "integrity": "sha512-AG2gQ0amzsdNR9+hebBGBJtOth4/GPWNiFPnNqrBLLH/jLQsbTEUnKsGj0Kg4a8aqmxJfpvjdNaK58FCQ16O1g=="
         },
         "node_modules/alpinejs": {
-            "version": "3.13.7",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.7.tgz",
-            "integrity": "sha512-rcTyjTANbsePq1hb7eSekt3qjI94HLGeO6JaRjCssCVbIIc+qBrc7pO5S/+2JB6oojIibjM6FA+xRI3zhGPZIg==",
+            "version": "3.13.8",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.8.tgz",
+            "integrity": "sha512-XolbBJryCndomtaHd/KHQjQeD/L72FJxy/YhLLFD4Lr7zzGcpcbg+UgXteMR2pYg1KhRUr6V4O3GfN1zJAmRWw==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -1606,9 +1606,9 @@
             }
         },
         "node_modules/sass": {
-            "version": "1.72.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz",
-            "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==",
+            "version": "1.74.1",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
+            "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",

resources/assets/v2/sass/app.scss

@@ -26,6 +26,12 @@ $danger: #CD5029 !default;
 $primary: #1E6581 !default;
 $success: #64B624 !default;
 
+/*
+Remove bottom margin from unstyled lists
+ */
+.list-no-margin {margin-bottom: 0;}
+.list-no-margin li.list-indent {margin-left:1.6em;}
+
 .hover-footer {
     overflow-x:hidden;
     width:100%;

resources/lang/fr_FR/validation.php

@@ -300,7 +300,7 @@ return [
 
     // no access to administration:
     'no_access_user_group'            => 'Vous n\'avez pas les droits d\'accès corrects pour cette administration.',
-    'administration_owner_rename'     => 'You can\'t rename your standard administration.',
+    'administration_owner_rename'     => 'Vous ne pouvez pas renommer votre administration standard.',
 ];
 
 /*