diff --git a/src/Components/Database/Provider.php b/src/Components/Database/Provider.php index 25497725..9c80d4a3 100644 --- a/src/Components/Database/Provider.php +++ b/src/Components/Database/Provider.php @@ -52,7 +52,7 @@ class Provider extends AbstractComponentProvider public function isAvailable(): bool { return class_exists(DatabaseServiceProvider::class) - && is_array($this->app['config']->get('database', false)) + && file_exists($this->app->configPath('database.php')) && $this->app['config']->get('database.useDefaultProvider', true) === true; } diff --git a/src/Components/Log/Provider.php b/src/Components/Log/Provider.php index 9ad56293..455387ef 100644 --- a/src/Components/Log/Provider.php +++ b/src/Components/Log/Provider.php @@ -28,7 +28,7 @@ final class Provider extends AbstractComponentProvider */ public function isAvailable(): bool { - return class_exists(\Illuminate\Log\LogServiceProvider::class) + return file_exists($this->app->configPath('logging.php')) && $this->app['config']->get('logging.useDefaultProvider', true) === true; }