From eff4294d5aa59f371843d35bf979411354da2869 Mon Sep 17 00:00:00 2001
From: Daniil Zobov <ddzobov@gmail.com>
Date: Tue, 14 Apr 2020 16:28:44 +0300
Subject: [PATCH] fixes

---
 README.md                                     |  4 +--
 src/LaravelServiceProvider.php                | 26 -----------------
 ...php => LumenPrometheusServiceProvider.php} | 10 ++++++-
 src/PrometheusServiceProvider.php             | 29 +++++++++++++++++--
 4 files changed, 37 insertions(+), 32 deletions(-)
 delete mode 100644 src/LaravelServiceProvider.php
 rename src/{LumenServiceProvider.php => LumenPrometheusServiceProvider.php} (65%)

diff --git a/README.md b/README.md
index 827d6c5..73a16b7 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Register the service provider in app.php
 ```php
 'providers' => [
     // ...
-    Superbalist\LaravelPrometheusExporter\LaravelServiceProvider::class,
+    Superbalist\LaravelPrometheusExporter\PrometheusServiceProvider::class,
 ]
 ```
 
@@ -37,7 +37,7 @@ Register the facade in app.php
 
 #### Lumen
 ```php
-$app->register(Superbalist\LaravelPrometheusExporter\LumenServiceProvider::class);
+$app->register(Superbalist\LaravelPrometheusExporter\LumenPrometheusServiceProvider::class);
 ```
 
 ## Configuration
diff --git a/src/LaravelServiceProvider.php b/src/LaravelServiceProvider.php
deleted file mode 100644
index 9f9f398..0000000
--- a/src/LaravelServiceProvider.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Superbalist\LaravelPrometheusExporter;
-
-class LaravelServiceProvider extends PrometheusServiceProvider
-{
-    /**
-     * Perform post-registration booting of services.
-     */
-    public function boot()
-    {
-        $this->publishes([
-            __DIR__ . '/../config/prometheus.php' => config_path('prometheus.php'),
-        ]);
-
-        parent::boot();
-    }
-
-    /**
-     * Load routes.
-     */
-    protected function loadRoutes()
-    {
-        $this->loadRoutesFrom(__DIR__ . '/laravel_routes.php');
-    }
-}
diff --git a/src/LumenServiceProvider.php b/src/LumenPrometheusServiceProvider.php
similarity index 65%
rename from src/LumenServiceProvider.php
rename to src/LumenPrometheusServiceProvider.php
index bb47e58..86510e0 100644
--- a/src/LumenServiceProvider.php
+++ b/src/LumenPrometheusServiceProvider.php
@@ -2,8 +2,16 @@
 
 namespace Superbalist\LaravelPrometheusExporter;
 
-class LumenServiceProvider extends PrometheusServiceProvider
+class LumenPrometheusServiceProvider extends PrometheusServiceProvider
 {
+    /**
+     * Publish files.
+     */
+    protected function publishFiles()
+    {
+        // do nothing
+    }
+
     /**
      * Load routes.
      */
diff --git a/src/PrometheusServiceProvider.php b/src/PrometheusServiceProvider.php
index cf7bf95..3ae9197 100644
--- a/src/PrometheusServiceProvider.php
+++ b/src/PrometheusServiceProvider.php
@@ -7,14 +7,16 @@ use Illuminate\Support\ServiceProvider;
 use Prometheus\CollectorRegistry;
 use Prometheus\Storage\Adapter;
 
-abstract class PrometheusServiceProvider extends ServiceProvider
+class PrometheusServiceProvider extends ServiceProvider
 {
     /**
      * Perform post-registration booting of services.
      */
     public function boot()
     {
-        $this->mergeConfigFrom(__DIR__ . '/../config/prometheus.php', 'prometheus');
+        $this->publishFiles();
+        $this->mergeConfigs();
+        $this->loadRoutes();
 
         if (config('prometheus.metrics_route_enabled')) {
             $this->loadRoutes();
@@ -27,10 +29,31 @@ abstract class PrometheusServiceProvider extends ServiceProvider
         }
     }
 
+    /**
+     * Merge configs.
+     */
+    protected function mergeConfigs()
+    {
+        $this->mergeConfigFrom(__DIR__ . '/../config/prometheus.php', 'prometheus');
+    }
+
+    /**
+     * Publish files.
+     */
+    protected function publishFiles()
+    {
+        $this->publishes([
+            __DIR__ . '/../config/prometheus.php' => config_path('prometheus.php'),
+        ]);
+    }
+
     /**
      * Load routes.
      */
-    abstract protected function loadRoutes();
+    protected function loadRoutes()
+    {
+        $this->loadRoutesFrom(__DIR__ . '/laravel_routes.php');
+    }
 
     /**
      * Register bindings in the container.