Upgrade to Laravel 9 (#4413)
Co-authored-by: DaneEveritt <dane@daneeveritt.com>
This commit is contained in:
parent
95e15d2c8a
commit
cbcf62086f
573 changed files with 4387 additions and 9411 deletions
|
@ -3,7 +3,7 @@
|
|||
namespace Pterodactyl\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Pterodactyl\Services\Activity\AcitvityLogBatchService;
|
||||
use Pterodactyl\Services\Activity\ActivityLogBatchService;
|
||||
use Pterodactyl\Services\Activity\ActivityLogTargetableService;
|
||||
|
||||
class ActivityLogServiceProvider extends ServiceProvider
|
||||
|
@ -14,7 +14,7 @@ class ActivityLogServiceProvider extends ServiceProvider
|
|||
*/
|
||||
public function register()
|
||||
{
|
||||
$this->app->scoped(AcitvityLogBatchService::class);
|
||||
$this->app->scoped(ActivityLogBatchService::class);
|
||||
$this->app->scoped(ActivityLogTargetableService::class);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -69,10 +69,8 @@ class AppServiceProvider extends ServiceProvider
|
|||
|
||||
/**
|
||||
* Return version information for the footer.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function versionData()
|
||||
protected function versionData(): array
|
||||
{
|
||||
return Cache::remember('git-version', 5, function () {
|
||||
if (file_exists(base_path('.git/HEAD'))) {
|
||||
|
|
|
@ -11,9 +11,7 @@ use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvid
|
|||
class AuthServiceProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* The policy mappings for the application.
|
||||
*
|
||||
* @var array
|
||||
* The model to policy mappings for the application.
|
||||
*/
|
||||
protected $policies = [
|
||||
Server::class => ServerPolicy::class,
|
||||
|
|
|
@ -18,10 +18,7 @@ class BackupsServiceProvider extends ServiceProvider implements DeferrableProvid
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string[]
|
||||
*/
|
||||
public function provides()
|
||||
public function provides(): array
|
||||
{
|
||||
return [BackupManager::class];
|
||||
}
|
||||
|
|
|
@ -18,9 +18,7 @@ use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvi
|
|||
class EventServiceProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* The event listener mappings for the application.
|
||||
*
|
||||
* @var array
|
||||
* The event to listener mappings for the application.
|
||||
*/
|
||||
protected $listen = [
|
||||
ServerInstalledEvent::class => [ServerInstalledNotification::class],
|
||||
|
@ -31,9 +29,9 @@ class EventServiceProvider extends ServiceProvider
|
|||
];
|
||||
|
||||
/**
|
||||
* Boots the service provider and registers model event listeners.
|
||||
* Register any events for your application.
|
||||
*/
|
||||
public function boot()
|
||||
public function boot(): void
|
||||
{
|
||||
parent::boot();
|
||||
|
||||
|
@ -42,9 +40,4 @@ class EventServiceProvider extends ServiceProvider
|
|||
Subuser::observe(SubuserObserver::class);
|
||||
EggVariable::observe(EggVariableObserver::class);
|
||||
}
|
||||
|
||||
public function shouldDiscoverEvents()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,4 @@
|
|||
<?php
|
||||
/**
|
||||
* Pterodactyl - Panel
|
||||
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
|
||||
*
|
||||
* This software is licensed under the terms of the MIT license.
|
||||
* https://opensource.org/licenses/MIT
|
||||
*/
|
||||
|
||||
namespace Pterodactyl\Providers;
|
||||
|
||||
|
|
|
@ -15,10 +15,8 @@ class SettingsServiceProvider extends ServiceProvider
|
|||
/**
|
||||
* An array of configuration keys to override with database values
|
||||
* if they exist.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $keys = [
|
||||
protected array $keys = [
|
||||
'app:name',
|
||||
'app:locale',
|
||||
'recaptcha:enabled',
|
||||
|
@ -37,10 +35,8 @@ class SettingsServiceProvider extends ServiceProvider
|
|||
/**
|
||||
* Keys specific to the mail driver that are only grabbed from the database
|
||||
* when using the SMTP driver.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected $emailKeys = [
|
||||
protected array $emailKeys = [
|
||||
'mail:host',
|
||||
'mail:port',
|
||||
'mail:from:address',
|
||||
|
@ -53,10 +49,8 @@ class SettingsServiceProvider extends ServiceProvider
|
|||
/**
|
||||
* Keys that are encrypted and should be decrypted when set in the
|
||||
* configuration array.
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
protected static $encrypted = [
|
||||
protected static array $encrypted = [
|
||||
'mail:password',
|
||||
];
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue