Upgrade to laravel 11

This commit is contained in:
James Cole
2024-03-17 09:19:01 +01:00
parent 7224f1be6f
commit e3a6e5b788
23 changed files with 577 additions and 911 deletions

View File

@@ -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.

View File

@@ -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.

View File

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

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -32,7 +32,7 @@ use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
public const string HOME = '/';
protected $namespace = '';
protected $namespace = '';
/**
* Define the routes for the application.
@@ -41,21 +41,18 @@ class RouteServiceProvider extends ServiceProvider
{
$this->routes(function (): void {
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'))
;
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
Route::prefix('api/v1/cron')
->middleware('api_basic')
->namespace($this->namespace)
->group(base_path('routes/api-noauth.php'))
;
->middleware('api_basic')
->namespace($this->namespace)
->group(base_path('routes/api-noauth.php'));
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'))
;
->namespace($this->namespace)
->group(base_path('routes/web.php'));
});
}
}

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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__));
}
}

View File

@@ -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

View File

@@ -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