From 6d5e194f9ac271fb70bc5d94c1ed3968e475b941 Mon Sep 17 00:00:00 2001 From: Michael Wikberg Date: Wed, 21 Jun 2023 11:57:39 +0300 Subject: [PATCH] Use facades instead of magic helpers --- src/PrometheusServiceProvider.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/PrometheusServiceProvider.php b/src/PrometheusServiceProvider.php index f49ba6d..e41bd56 100644 --- a/src/PrometheusServiceProvider.php +++ b/src/PrometheusServiceProvider.php @@ -2,8 +2,11 @@ namespace Mcoirault\LaravelPrometheusExporter; +use Illuminate\Contracts\Container\BindingResolutionException; use Illuminate\Contracts\Support\DeferrableProvider; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Config; use Illuminate\Support\ServiceProvider; use Prometheus\CollectorRegistry; use Prometheus\Storage\Adapter; @@ -12,14 +15,15 @@ class PrometheusServiceProvider extends ServiceProvider implements DeferrablePro { /** * Perform post-registration booting of services. + * @throws BindingResolutionException */ public function boot(PrometheusExporter $exporter): void { $this->publishes([ - __DIR__ . '/../config/prometheus.php' => config_path('prometheus.php'), + __DIR__ . '/../config/prometheus.php' => App::configPath('prometheus.php'), ]); - foreach (config('prometheus.collectors') as $class) { + foreach (Config::get('prometheus.collectors') as $class) { $collector = $this->app->make($class); $exporter->registerCollector($collector); } @@ -35,7 +39,7 @@ public function register(): void $this->app->singleton(PrometheusExporter::class, function ($app) { $adapter = $app['prometheus.storage_adapter']; $prometheus = new CollectorRegistry($adapter); - return new PrometheusExporter(config('prometheus.namespace'), $prometheus); + return new PrometheusExporter(Config::get('prometheus.namespace'), $prometheus); }); $this->app->alias(PrometheusExporter::class, 'prometheus'); @@ -44,10 +48,10 @@ public function register(): void }); $this->app->bind(Adapter::class, function ($app) { - $factory = $app['prometheus.storage_adapter_factory']; /** @var StorageAdapterFactory $factory */ - $driver = config('prometheus.storage_adapter'); - $configs = config('prometheus.storage_adapters'); + $factory = $app['prometheus.storage_adapter_factory']; + $driver = Config::get('prometheus.storage_adapter'); + $configs = Config::get('prometheus.storage_adapters'); $config = Arr::get($configs, $driver, []); return $factory->make($driver, $config); });