Upgrade to laravel 11

app/Providers/AccountServiceProvider.php

@@ -31,13 +31,14 @@ use FireflyIII\Repositories\Account\OperationsRepository;
 use FireflyIII\Repositories\Account\OperationsRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepository as AdminAccountRepository;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface as AdminAccountRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class AccountServiceProvider.
  */
-class AccountServiceProvider extends ServiceProvider
+class AccountServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/AdminServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Repositories\LinkType\LinkTypeRepository;
 use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class AdminServiceProvider
  */
-class AdminServiceProvider extends ServiceProvider
+class AdminServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/AppServiceProvider.php

@@ -80,7 +80,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        Passport::ignoreMigrations();
+//        Passport::ignoreMigrations();
-        Sanctum::ignoreMigrations();
+//        Sanctum::ignoreMigrations();
     }
 }

app/Providers/AttachmentServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Repositories\Attachment\AttachmentRepository;
 use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class AttachmentServiceProvider.
  */
-class AttachmentServiceProvider extends ServiceProvider
+class AttachmentServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/BillServiceProvider.php

@@ -27,13 +27,14 @@ use FireflyIII\Repositories\Bill\BillRepository;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Bill\BillRepository as AdminBillRepository;
 use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface as AdminBillRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class BillServiceProvider.
  */
-class BillServiceProvider extends ServiceProvider
+class BillServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/BudgetServiceProvider.php

@@ -39,13 +39,14 @@ use FireflyIII\Repositories\UserGroups\Budget\BudgetRepository as AdminBudgetRep
 use FireflyIII\Repositories\UserGroups\Budget\BudgetRepositoryInterface as AdminBudgetRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Budget\OperationsRepository as AdminOperationsRepository;
 use FireflyIII\Repositories\UserGroups\Budget\OperationsRepositoryInterface as AdminOperationsRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class BudgetServiceProvider.
  */
-class BudgetServiceProvider extends ServiceProvider
+class BudgetServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/CategoryServiceProvider.php

@@ -31,13 +31,14 @@ use FireflyIII\Repositories\Category\OperationsRepository;
 use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Category\CategoryRepository as UserGroupCategoryRepository;
 use FireflyIII\Repositories\UserGroups\Category\CategoryRepositoryInterface as UserGroupCategoryRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class CategoryServiceProvider.
  */
-class CategoryServiceProvider extends ServiceProvider
+class CategoryServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/CurrencyServiceProvider.php

@@ -27,13 +27,14 @@ use FireflyIII\Repositories\Currency\CurrencyRepository;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepository as GroupCurrencyRepository;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface as GroupCurrencyRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class CurrencyServiceProvider.
  */
-class CurrencyServiceProvider extends ServiceProvider
+class CurrencyServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/JournalServiceProvider.php

@@ -35,13 +35,14 @@ use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository;
 use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Journal\JournalRepository as GroupJournalRepository;
 use FireflyIII\Repositories\UserGroups\Journal\JournalRepositoryInterface as GroupJournalRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class JournalServiceProvider.
  */
-class JournalServiceProvider extends ServiceProvider
+class JournalServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/PiggyBankServiceProvider.php

@@ -27,13 +27,14 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepository;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepository as AdminPiggyBankRepository;
 use FireflyIII\Repositories\UserGroups\PiggyBank\PiggyBankRepositoryInterface as AdminPiggyBankRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class PiggyBankServiceProvider.
  */
-class PiggyBankServiceProvider extends ServiceProvider
+class PiggyBankServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/RecurringServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Repositories\Recurring\RecurringRepository;
 use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class RecurringServiceProvider.
  */
-class RecurringServiceProvider extends ServiceProvider
+class RecurringServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/RouteServiceProvider.php

@@ -43,19 +43,16 @@ class RouteServiceProvider extends ServiceProvider
             Route::prefix('api')
                  ->middleware('api')
                  ->namespace($this->namespace)
-                ->group(base_path('routes/api.php'))
+                 ->group(base_path('routes/api.php'));
-            ;
 
             Route::prefix('api/v1/cron')
                  ->middleware('api_basic')
                  ->namespace($this->namespace)
-                ->group(base_path('routes/api-noauth.php'))
+                 ->group(base_path('routes/api-noauth.php'));
-            ;
 
             Route::middleware('web')
                  ->namespace($this->namespace)
-                ->group(base_path('routes/web.php'))
+                 ->group(base_path('routes/web.php'));
-            ;
         });
     }
 }

app/Providers/RuleGroupServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepository;
 use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class RuleGroupServiceProvider.
  */
-class RuleGroupServiceProvider extends ServiceProvider
+class RuleGroupServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/RuleServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Repositories\Rule\RuleRepository;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class RuleServiceProvider.
  */
-class RuleServiceProvider extends ServiceProvider
+class RuleServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/SearchServiceProvider.php

@@ -25,13 +25,14 @@ namespace FireflyIII\Providers;
 
 use FireflyIII\Support\Search\OperatorQuerySearch;
 use FireflyIII\Support\Search\SearchInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class SearchServiceProvider.
  */
-class SearchServiceProvider extends ServiceProvider
+class SearchServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Providers/TagServiceProvider.php

@@ -29,13 +29,14 @@ use FireflyIII\Repositories\Tag\TagRepository;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Tag\TagRepository as UserGroupTagRepository;
 use FireflyIII\Repositories\UserGroups\Tag\TagRepositoryInterface as UserGroupTagRepositoryInterface;
+use Illuminate\Contracts\Support\DeferrableProvider;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class TagServiceProvider.
  */
-class TagServiceProvider extends ServiceProvider
+class TagServiceProvider extends ServiceProvider implements DeferrableProvider
 {
     /**
      * Bootstrap the application services.

app/Support/Authentication/RemoteUserProvider.php

@@ -120,4 +120,14 @@ class RemoteUserProvider implements UserProvider
 
         throw new FireflyException(sprintf('C) Did not implement %s', __METHOD__));
     }
+
+    /**
+     * @inheritDoc
+     */
+    #[\Override] public function rehashPasswordIfRequired(Authenticatable $user, array $credentials, bool $force = false)
+    {
+        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 0 === $difference ? 1 : $difference;
+        return (int) (0 === $difference ? 1 : $difference);
     }
 
     /**
@@ -63,7 +63,7 @@ trait DateCalculation
             $difference = $start->diffInDays($today) + 1;
         }
 
-        return $difference;
+        return (int) $difference;
     }
 
     protected function calculateStep(Carbon $start, Carbon $end): string

app/Support/Navigation.php

@@ -304,7 +304,7 @@ class Navigation
     {
         $endOfMonth = $date->copy()->endOfMonth();
 
-        return $date->diffInDays($endOfMonth);
+        return (int) $date->diffInDays($endOfMonth);
     }
 
     public function diffInPeriods(string $period, int $skip, Carbon $beginning, Carbon $end): int

changelog.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 6.1.11 - 2024-03-25
+
+### Removed
+
+- Support for Mandrill because the necessary packages aren't maintained anymore.
+
+
+
 ## 6.1.10 - 2024-03-03
 
 ### Added

composer.json

@@ -82,21 +82,20 @@
         "ext-xml": "*",
         "ext-xmlwriter": "*",
         "bacon/bacon-qr-code": "2.*",
-        "diglactic/laravel-breadcrumbs": "^8.1",
+        "diglactic/laravel-breadcrumbs": "^9",
-        "doctrine/dbal": "3.*",
         "gdbots/query-parser": "^3.0",
         "guzzlehttp/guzzle": "^7.8",
         "jc5/google2fa-laravel": "^2.0",
         "jc5/recovery": "^2",
-        "laravel/framework": "^10",
+        "laravel/framework": "^11",
-        "laravel/passport": "11.*",
+        "laravel/passport": "^12",
-        "laravel/sanctum": "^3.3",
+        "laravel/sanctum": "^4",
         "laravel/slack-notification-channel": "^3.0",
         "laravel/ui": "^4.2",
         "league/commonmark": "2.*",
         "league/csv": "^9.10",
         "league/fractal": "0.*",
-        "nunomaduro/collision": "^7.7",
+        "nunomaduro/collision": "^8",
         "pragmarx/google2fa": "^8.0",
         "predis/predis": "^2.2",
         "psr/log": "<4",
@@ -107,8 +106,7 @@
         "spatie/period": "^2.4",
         "symfony/expression-language": "^7.0",
         "symfony/http-client": "^7.0",
-        "symfony/mailgun-mailer": "^7.0",
+        "symfony/mailgun-mailer": "^7.0"
-        "therobfonz/laravel-mandrill-driver": "^5.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.9",

database/migrations/2020_11_12_070604_changes_for_v550.php

@@ -76,7 +76,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('budget_limit_id');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (ColumnDoesNotExist | 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 +95,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('period');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (ColumnDoesNotExist | 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 +108,7 @@ class ChangesForV550 extends Migration
                         $table->dropColumn('generated');
                     }
                 );
-            } catch (ColumnDoesNotExist|QueryException $e) {
+            } catch (ColumnDoesNotExist | 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.');
             }
@@ -231,7 +231,6 @@ class ChangesForV550 extends Migration
                         $table->unsignedSmallInteger('delivery');
                         $table->string('url', 1024);
                         $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-                        $table->unique(['user_id', 'title']);
                     }
                 );
             } catch (QueryException $e) {