banquise/pelican-panel-banquise
7
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Pull Requests Activity

Remove config repository

Browse Source
This commit is contained in:
Lance Pioch 2024-03-16 23:29:12 -04:00
parent 80c5a97038
commit dece74c185
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Providers/HashidsServiceProvider.php
View File

@ -14,13 +14,10 @@ class HashidsServiceProvider extends ServiceProvider
public function register(): void public function register(): void
{ {
$this->app->singleton(HashidsInterface::class, function () { $this->app->singleton(HashidsInterface::class, function () {
/** @var \Illuminate\Contracts\Config\Repository $config */
$config = $this->app['config'];
return new Hashids( return new Hashids(
$config->get('hashids.salt', ''), config('hashids.salt', ''),
$config->get('hashids.length', 0), config('hashids.length', 0),
$config->get('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890') config('hashids.alphabet', 'abcdefghijkmlnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890')
); );
}); });

9
app/Providers/SettingsServiceProvider.php
View File

@ -8,7 +8,6 @@ use Illuminate\Database\QueryException;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Illuminate\Contracts\Encryption\Encrypter; use Illuminate\Contracts\Encryption\Encrypter;
use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Contracts\Encryption\DecryptException;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
class SettingsServiceProvider extends ServiceProvider class SettingsServiceProvider extends ServiceProvider
{ {
@ -57,11 +56,11 @@ class SettingsServiceProvider extends ServiceProvider
/** /**
* Boot the service provider. * 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 // Only set the email driver settings from the database if we
// are configured using SMTP as the driver. // 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); $this->keys = array_merge($this->keys, $this->emailKeys);
} }
@ -76,7 +75,7 @@ class SettingsServiceProvider extends ServiceProvider
} }
foreach ($this->keys as $key) { 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)) { if (in_array($key, self::$encrypted)) {
try { try {
$value = $encrypter->decrypt($value); $value = $encrypter->decrypt($value);
@ -102,7 +101,7 @@ class SettingsServiceProvider extends ServiceProvider
$value = null; $value = null;
} }
$config->set(str_replace(':', '.', $key), $value); config()->set(str_replace(':', '.', $key), $value);
} }
} }