diff --git a/app/Providers/HashidsServiceProvider.php b/app/Providers/HashidsServiceProvider.php index 366190d38..4639bfaed 100644 --- a/app/Providers/HashidsServiceProvider.php +++ b/app/Providers/HashidsServiceProvider.php @@ -14,13 +14,10 @@ class HashidsServiceProvider extends ServiceProvider public function register(): void { $this->app->singleton(HashidsInterface::class, function () { - /** @var \Illuminate\Contracts\Config\Repository $config */ - $config = $this->app['config']; - return new Hashids( - $config->get('hashids.salt', ''), - $config->get('hashids.length', 0), - $config->get('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890') + config('hashids.salt', ''), + config('hashids.length', 0), + config('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890') ); }); diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php index 2383098dc..adc8a758b 100644 --- a/app/Providers/SettingsServiceProvider.php +++ b/app/Providers/SettingsServiceProvider.php @@ -8,7 +8,6 @@ use Illuminate\Database\QueryException; use Illuminate\Support\ServiceProvider; use Illuminate\Contracts\Encryption\Encrypter; use Illuminate\Contracts\Encryption\DecryptException; -use Illuminate\Contracts\Config\Repository as ConfigRepository; class SettingsServiceProvider extends ServiceProvider { @@ -57,11 +56,11 @@ class SettingsServiceProvider extends ServiceProvider /** * Boot the service provider. */ - public function boot(ConfigRepository $config, Encrypter $encrypter, Log $log): void + public function boot(Encrypter $encrypter, Log $log): void { // Only set the email driver settings from the database if we // are configured using SMTP as the driver. - if ($config->get('mail.default') === 'smtp') { + if (config('mail.default') === 'smtp') { $this->keys = array_merge($this->keys, $this->emailKeys); } @@ -76,7 +75,7 @@ class SettingsServiceProvider extends ServiceProvider } foreach ($this->keys as $key) { - $value = array_get($values, 'settings::' . $key, $config->get(str_replace(':', '.', $key))); + $value = array_get($values, 'settings::' . $key, config(str_replace(':', '.', $key))); if (in_array($key, self::$encrypted)) { try { $value = $encrypter->decrypt($value); @@ -102,7 +101,7 @@ class SettingsServiceProvider extends ServiceProvider $value = null; } - $config->set(str_replace(':', '.', $key), $value); + config()->set(str_replace(':', '.', $key), $value); } }