Merge pull request #4 from ARCANEDEV/develop

Refactoring and Cleaning
ARCANEDEV · Dec 13, 2016 · 9a7d928 · 9a7d928
2 parents 243903c + 2f73e66
commit 9a7d928
Show file tree

Hide file tree

Showing 12 changed files with 605 additions and 687 deletions.
diff --git a/src/Contracts/Tracker.php b/src/Contracts/Tracker.php
@@ -1,4 +1,7 @@
 <?php namespace Arcanedev\LaravelTracker\Contracts;
+use Exception;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Route;
 
 /**
  * Interface  Tracker
@@ -12,6 +15,28 @@ interface Tracker
      |  Main Functions
      | ------------------------------------------------------------------------------------------------
      */
+    /**
+     * Start the tracking.
+     *
+     * @param  \Illuminate\Http\Request $request
+     */
+    public function trackRequest(Request $request);
+
+    /**
+     * Track the matched route.
+     *
+     * @param  \Illuminate\Routing\Route  $route
+     * @param  \Illuminate\Http\Request   $request
+     */
+    public function trackMatchedRoute(Route $route, Request $request);
+
+    /**
+     * Track the exception.
+     *
+     * @param  \Exception  $exception
+     */
+    public function trackException(Exception $exception);
+
     /**
      * Enable the tracking.
      */

diff --git a/src/Contracts/TrackingManager.php b/src/Contracts/TrackingManager.php
diff --git a/src/EventListeners/RouteEventSubscriber.php b/src/EventListeners/RouteEventSubscriber.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\EventListeners;
 
-use Arcanedev\LaravelTracker\Contracts\TrackingManager;
+use Arcanedev\LaravelTracker\Contracts\Tracker;
 use Illuminate\Routing\Events\RouteMatched;
 use Illuminate\Routing\Route;
 
@@ -16,8 +16,8 @@ class RouteEventSubscriber
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /** @var \Arcanedev\LaravelTracker\Contracts\TrackingManager */
-    private $manager;
+    /** @var \Arcanedev\LaravelTracker\Contracts\Tracker */
+    private $tracker;
 
     /* ------------------------------------------------------------------------------------------------
      |  Constructor
@@ -26,11 +26,11 @@ class RouteEventSubscriber
     /**
      * RouteEventSubscriber constructor.
      *
-     * @param  \Arcanedev\LaravelTracker\Contracts\TrackingManager  $manager
+     * @param  \Arcanedev\LaravelTracker\Contracts\Tracker  $manager
      */
-    public function __construct(TrackingManager $manager)
+    public function __construct(Tracker $manager)
     {
-        $this->manager = $manager;
+        $this->tracker = $manager;
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@ public function subscribe($events)
      */
     public function handle(RouteMatched $event)
     {
-        $this->manager->trackMatchedRoute($event->route, $event->request);
+        $this->tracker->trackMatchedRoute($event->route, $event->request);
     }
 
     /**
@@ -67,6 +67,6 @@ public function handle(RouteMatched $event)
      */
     public function handleOldEvent(Route $route)
     {
-        $this->manager->trackMatchedRoute($route, request());
+        $this->tracker->trackMatchedRoute($route, request());
     }
 }
diff --git a/src/Exceptions/Handler.php b/src/Exceptions/Handler.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\Exceptions;
 
-use Arcanedev\LaravelTracker\Contracts\TrackingManager;
+use Arcanedev\LaravelTracker\Contracts\Tracker;
 use Exception;
 use Illuminate\Contracts\Debug\ExceptionHandler as ExceptionHandlerContract;
 
@@ -16,7 +16,7 @@ class Handler implements ExceptionHandlerContract
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /** @var  \Arcanedev\LaravelTracker\Contracts\TrackingManager */
+    /** @var  \Arcanedev\LaravelTracker\Contracts\Tracker */
     private $manager;
 
     /** @var  \Illuminate\Contracts\Debug\ExceptionHandler */
@@ -33,12 +33,12 @@ class Handler implements ExceptionHandlerContract
     /**
      * Handler constructor.
      *
-     * @param  \Arcanedev\LaravelTracker\Contracts\TrackingManager   $manager
-     * @param  \Illuminate\Contracts\Debug\ExceptionHandler          $illuminateHandler
+     * @param  \Arcanedev\LaravelTracker\Contracts\Tracker   $tracker
+     * @param  \Illuminate\Contracts\Debug\ExceptionHandler  $illuminateHandler
      */
-    public function __construct(TrackingManager $manager, ExceptionHandlerContract $illuminateHandler)
+    public function __construct(Tracker $tracker, ExceptionHandlerContract $illuminateHandler)
     {
-        $this->manager                  = $manager;
+        $this->manager                  = $tracker;
         $this->illuminateHandler        = $illuminateHandler;
         $this->originalExceptionHandler = set_exception_handler([$this, 'trackException']);
         $this->originalErrorHandler     = set_error_handler([$this, 'handleError']);

diff --git a/src/LaravelTrackerServiceProvider.php b/src/LaravelTrackerServiceProvider.php
@@ -144,9 +144,6 @@ private function registerTrackers()
         foreach ($this->getTrackers() as $abstract => $concrete) {
             $this->singleton($abstract, $concrete);
         }
-
-        // Register the trackers manager
-        $this->bind(Contracts\TrackingManager::class, TrackingManager::class);
     }
 
     /**
@@ -155,7 +152,7 @@ private function registerTrackers()
     private function registerMainTracker()
     {
         $this->singleton(Contracts\Tracker::class, Tracker::class);
-        $this->bind('arcanedev.tracker', Contracts\Tracker::class);
+        $this->singleton('arcanedev.tracker', Contracts\Tracker::class);
     }
 
     /**
@@ -190,7 +187,7 @@ private function registerExceptionHandler()
         $handler = $this->app[ExceptionHandlerContract::class];
 
         $this->app->singleton(ExceptionHandlerContract::class, function ($app) use ($handler) {
-            return new Exceptions\Handler($app[Contracts\TrackingManager::class], $handler);
+            return new Exceptions\Handler($app[Contracts\Tracker::class], $handler);
         });
     }
 }
diff --git a/src/Middleware/Tracking.php b/src/Middleware/Tracking.php
@@ -1,6 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\Middleware;
 
-use Arcanedev\LaravelTracker\Contracts\TrackingManager as TrackingManagerContract;
+use Arcanedev\LaravelTracker\Contracts\Tracker;
 use Closure;
 
 /**
@@ -18,20 +18,22 @@ class Tracking
     /**
      * The tracker instance.
      *
-     * @var  \Arcanedev\LaravelTracker\Contracts\TrackingManager
+     * @var  \Arcanedev\LaravelTracker\Contracts\Tracker
      */
-    protected $manager;
+    protected $tracker;
 
     /* ------------------------------------------------------------------------------------------------
      |  Constructor
      | ------------------------------------------------------------------------------------------------
      */
     /**
      * Tracking constructor.
+     *
+     * @param  \Arcanedev\LaravelTracker\Contracts\Tracker  $tracker
      */
-    public function __construct(TrackingManagerContract $manager)
+    public function __construct(Tracker $tracker)
     {
-        $this->manager = $manager;
+        $this->tracker = $tracker;
     }
 
     /* ------------------------------------------------------------------------------------------------
@@ -48,7 +50,7 @@ public function __construct(TrackingManagerContract $manager)
      */
     public function handle($request, Closure $next)
     {
-        $this->manager->trackRequest($request);
+        $this->tracker->trackRequest($request);
 
         return $next($request);
     }