Updating the service providers

ARCANESOFT · Feb 9, 2017 · 5b179c3 · 5b179c3
1 parent 9e6205c
commit 5b179c3
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 105 deletions.
diff --git a/src/Providers/AuthorizationServiceProvider.php b/src/Providers/AuthorizationServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanesoft\Tracker\Providers;
 
-use Arcanedev\Support\ServiceProvider;
+use Arcanedev\Support\Providers\AuthorizationServiceProvider as ServiceProvider;
 
 /**
  * Class     AuthorizationServiceProvider

diff --git a/src/Providers/CommandServiceProvider.php b/src/Providers/CommandServiceProvider.php
@@ -19,5 +19,7 @@ class CommandServiceProvider extends ServiceProvider
      *
      * @var array
      */
-    protected $commands = [];
+    protected $commands = [
+        //
+    ];
 }
diff --git a/src/Providers/ComposerServiceProvider.php b/src/Providers/ComposerServiceProvider.php
@@ -1,7 +1,16 @@
 <?php namespace Arcanesoft\Tracker\Providers;
 
-use Arcanedev\Support\ServiceProvider;
-use Arcanesoft\Tracker\ViewComposers\Dashboard;
+use Arcanedev\Support\Providers\ViewComposerServiceProvider as ServiceProvider;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\AuthenticatedVisitorsRatioComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\BrowsersRatioComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\CountriesListComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\DevicesRatioComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\LanguagesListComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\LatestThirtyDaysVisitsAndVisitorsComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\OperatingSystemRationComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\ReferersListComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\TotalPageViewsBoxComposer;
+use Arcanesoft\Tracker\ViewComposers\Dashboard\TotalUniqueUsersBoxComposer;
 
 /**
  * Class     ComposerServiceProvider
@@ -12,82 +21,25 @@
 class ComposerServiceProvider extends ServiceProvider
 {
     /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
+     |  Properties
      | ------------------------------------------------------------------------------------------------
      */
     /**
-     * {@inheritdoc}
+     * Register the composer classes.
+     *
+     * @var array
      */
-    public function boot()
-    {
-        $this->registerDashboardComposers();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function register()
-    {
-        //
-    }
-
-    /* ------------------------------------------------------------------------------------------------
-     |  Other Functions
-     | ------------------------------------------------------------------------------------------------
-     */
-    /**
-     * Register all the dashboard view composers.
-     */
-    private function registerDashboardComposers()
-    {
-        view()->composer(
-            Dashboard\TotalUniqueUsersBoxComposer::VIEW,
-            Dashboard\TotalUniqueUsersBoxComposer::class
-        );
-
-        view()->composer(
-            Dashboard\TotalPageViewsBoxComposer::VIEW,
-            Dashboard\TotalPageViewsBoxComposer::class
-        );
-
-        view()->composer(
-            Dashboard\LatestThirtyDaysVisitsAndVisitorsComposer::VIEW,
-            Dashboard\LatestThirtyDaysVisitsAndVisitorsComposer::class
-        );
-
-        view()->composer(
-            Dashboard\AuthenticatedVisitorsRatioComposer::VIEW,
-            Dashboard\AuthenticatedVisitorsRatioComposer::class
-        );
-
-        view()->composer(
-            Dashboard\DevicesRatioComposer::VIEW,
-            Dashboard\DevicesRatioComposer::class
-        );
-
-        view()->composer(
-            Dashboard\BrowsersRatioComposer::VIEW,
-            Dashboard\BrowsersRatioComposer::class
-        );
-
-        view()->composer(
-            Dashboard\OperatingSystemRationComposer::VIEW,
-            Dashboard\OperatingSystemRationComposer::class
-        );
-
-        view()->composer(
-            Dashboard\LanguagesListComposer::VIEW,
-            Dashboard\LanguagesListComposer::class
-        );
-
-        view()->composer(
-            Dashboard\CountriesListComposer::VIEW,
-            Dashboard\CountriesListComposer::class
-        );
-
-        view()->composer(
-            Dashboard\ReferersListComposer::VIEW,
-            Dashboard\ReferersListComposer::class
-        );
-    }
+    protected $composerClasses = [
+        // Dashboard view composers
+        TotalUniqueUsersBoxComposer::VIEW               => TotalUniqueUsersBoxComposer::class,
+        TotalPageViewsBoxComposer::VIEW                 => TotalPageViewsBoxComposer::class,
+        LatestThirtyDaysVisitsAndVisitorsComposer::VIEW => LatestThirtyDaysVisitsAndVisitorsComposer::class,
+        AuthenticatedVisitorsRatioComposer::VIEW        => AuthenticatedVisitorsRatioComposer::class,
+        DevicesRatioComposer::VIEW                      => DevicesRatioComposer::class,
+        BrowsersRatioComposer::VIEW                     => BrowsersRatioComposer::class,
+        OperatingSystemRationComposer::VIEW             => OperatingSystemRationComposer::class,
+        LanguagesListComposer::VIEW                     => LanguagesListComposer::class,
+        CountriesListComposer::VIEW                     => CountriesListComposer::class,
+        ReferersListComposer::VIEW                      => ReferersListComposer::class,
+    ];
 }
diff --git a/src/Providers/PackagesServiceProvider.php b/src/Providers/PackagesServiceProvider.php
@@ -2,6 +2,7 @@
 
 use Arcanedev\LaravelTracker\LaravelTrackerServiceProvider;
 use Arcanedev\Support\ServiceProvider;
+use Illuminate\Support\Arr;
 
 /**
  * Class     PackagesServiceProvider
@@ -20,6 +21,8 @@ class PackagesServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        parent::register();
+
         $this->registerLaravelTrackerPackage();
     }
 
@@ -29,6 +32,8 @@ public function register()
     public function boot()
     {
         parent::boot();
+
+        //
     }
 
     /**
@@ -38,7 +43,9 @@ public function boot()
      */
     public function provides()
     {
-        return parent::provides();
+        return [
+            //
+        ];
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -52,12 +59,12 @@ private function registerLaravelTrackerPackage()
     {
         $this->registerProvider(LaravelTrackerServiceProvider::class);
 
-        /** @var \Illuminate\Contracts\Config\Repository  $config */
-        $config = $this->app['config'];
+        $config = $this->config();
+        $items  = $config->get('arcanesoft.tracker');
 
-        $config->set('laravel-tracker.database', $config->get('arcanesoft.tracker.database'));
-        $config->set('laravel-tracker.models',   $config->get('arcanesoft.tracker.models'));
-        $config->set('laravel-tracker.tracking', $config->get('arcanesoft.tracker.tracking'));
-        $config->set('laravel-tracker.routes',   $config->get('arcanesoft.tracker.routes'));
+        $config->set('laravel-tracker.database', Arr::get($items, 'database'));
+        $config->set('laravel-tracker.models',   Arr::get($items, 'models'));
+        $config->set('laravel-tracker.tracking', Arr::get($items, 'tracking'));
+        $config->set('laravel-tracker.routes',   Arr::get($items, 'routes'));
     }
 }
diff --git a/src/Providers/RouteServiceProvider.php b/src/Providers/RouteServiceProvider.php
@@ -2,7 +2,6 @@
 
 use Arcanesoft\Core\Bases\RouteServiceProvider as ServiceProvider;
 use Arcanesoft\Tracker\Http\Routes;
-use Illuminate\Contracts\Routing\Registrar as Router;
 
 /**
  * Class     RouteServiceProvider
@@ -18,12 +17,10 @@ class RouteServiceProvider extends ServiceProvider
      */
     /**
      * Define the routes for the application.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar  $router
      */
-    public function map(Router $router)
+    public function map()
     {
-        $this->mapAdminRoutes($router);
+        $this->mapAdminRoutes();
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -32,19 +29,17 @@ public function map(Router $router)
      */
     /**
      * Register the admin routes.
-     *
-     * @param  \Illuminate\Contracts\Routing\Registrar $router
      */
-    private function mapAdminRoutes(Router $router)
+    private function mapAdminRoutes()
     {
         $attributes = $this->getAdminAttributes(
             'tracker.',
             'Arcanesoft\\Tracker\\Http\\Controllers\\Admin',
             $this->config()->get('arcanesoft.tracker.route.prefix', 'tracker')
         );
 
-        $router->group($attributes, function (Router $router) {
-            Routes\Admin\TrackerRoutes::register($router);
+        $this->group($attributes, function () {
+            Routes\Admin\TrackerRoutes::register();
         });
     }
 }
diff --git a/src/TrackerServiceProvider.php b/src/TrackerServiceProvider.php
@@ -1,7 +1,6 @@
 <?php namespace Arcanesoft\Tracker;
 
 use Arcanesoft\Core\Bases\PackageServiceProvider;
-use Arcanesoft\Core\CoreServiceProvider;
 
 /**
  * Class     TrackerServiceProvider
@@ -41,14 +40,15 @@ public function getBasePath()
      | ------------------------------------------------------------------------------------------------
      */
     /**
-     *
+     * Register the service provider.
      */
     public function register()
     {
+        parent::register();
+
         $this->registerConfig();
         $this->registerSidebarItems();
         $this->registerProviders([
-            CoreServiceProvider::class,
             Providers\PackagesServiceProvider::class,
             Providers\AuthorizationServiceProvider::class,
             Providers\ComposerServiceProvider::class,
@@ -57,11 +57,12 @@ public function register()
     }
 
     /**
-     *
+     * Boot the service provider.
      */
     public function boot()
     {
         parent::boot();
+
         $this->registerProvider(Providers\RouteServiceProvider::class);
 
         // Publishes
@@ -82,9 +83,4 @@ public function provides()
             //
         ];
     }
-
-    /* ------------------------------------------------------------------------------------------------
-     |  Other Functions
-     | ------------------------------------------------------------------------------------------------
-     */
 }
diff --git a/src/ViewComposers/Dashboard/TotalUniqueUsersBoxComposer.php b/src/ViewComposers/Dashboard/TotalUniqueUsersBoxComposer.php
@@ -16,7 +16,6 @@ class TotalUniqueUsersBoxComposer extends AbstractViewComposer
      |  Constants
      | ------------------------------------------------------------------------------------------------
      */
-
     const VIEW = 'tracker::admin._composers.dashboard.total-unique-visitors-box';
 
     /* ------------------------------------------------------------------------------------------------