Merge pull request #10 from ARCANEDEV/update-agent

Updating the agent dependency

composer.json

@@ -20,7 +20,7 @@
         "arcanedev/geo-ip":         "~2.0",
         "arcanedev/support":        "~3.20",
         "jaybizzle/crawler-detect": "~1.0",
-        "jenssegers/agent":         "~2.0",
+        "arcanedev/agent":          "~1.0",
         "ramsey/uuid":              "~3.0",
         "snowplow/referer-parser":  "~0.2",
         "ua-parser/uap-php" :       "~3.0"

src/Detectors/DeviceDetector.php

@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\Detectors;
 
+use Arcanedev\Agent\Contracts\Agent;
 use Arcanedev\LaravelTracker\Contracts\Detectors\DeviceDetector as DeviceDetectorContract;
 use Arcanedev\LaravelTracker\Models\Device;
 
@@ -15,7 +16,7 @@ class DeviceDetector implements DeviceDetectorContract
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /** @var \Jenssegers\Agent\Agent */
+    /** @var \Arcanedev\Agent\Contracts\Agent */
     protected $agent;
 
     /* ------------------------------------------------------------------------------------------------
@@ -25,9 +26,9 @@ class DeviceDetector implements DeviceDetectorContract
     /**
      * DeviceDetector constructor.
      *
-     * @param  \Jenssegers\Agent\Agent  $agent
+     * @param  \Arcanedev\Agent\Contracts\Agent  $agent
      */
-    public function __construct($agent)
+    public function __construct(Agent $agent)
     {
         $this->agent = $agent;
     }

src/Detectors/GeoIpDetector.php

@@ -24,6 +24,11 @@ class GeoIpDetector implements GeoIpDetectorContract
      |  Constructor
      | ------------------------------------------------------------------------------------------------
      */
+    /**
+     * GeoIpDetector constructor.
+     *
+     * @param  \Arcanedev\GeoIP\Contracts\GeoIP  $geoip
+     */
     public function __construct(GeoIP $geoip)
     {
         $this->geoip = $geoip;

src/Detectors/LanguageDetector.php

@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\LaravelTracker\Detectors;
 
+use Arcanedev\Agent\Contracts\Agent;
 use Arcanedev\LaravelTracker\Contracts\Detectors\LanguageDetector as LanguageDetectorContract;
 
 /**
@@ -14,7 +15,7 @@ class LanguageDetector implements LanguageDetectorContract
      |  Properties
      | ------------------------------------------------------------------------------------------------
      */
-    /** @var \Jenssegers\Agent\Agent */
+    /** @var \Arcanedev\Agent\Contracts\Agent */
     protected $agent;
 
     /* ------------------------------------------------------------------------------------------------
@@ -24,9 +25,9 @@ class LanguageDetector implements LanguageDetectorContract
     /**
      * LanguageDetector constructor.
      *
-     * @param  \Jenssegers\Agent\Agent  $agent
+     * @param  \Arcanedev\Agent\Contracts\Agent  $agent
      */
-    public function __construct($agent)
+    public function __construct(Agent $agent)
     {
         $this->agent = $agent;
     }

src/LaravelTrackerServiceProvider.php

@@ -115,15 +115,9 @@ private function registerDetectors()
             return new Detectors\CrawlerDetector($crawler);
         });
 
-        $this->singleton(Contracts\Detectors\DeviceDetector::class, function (AppContract $app) {
-            return new Detectors\DeviceDetector($app['agent']);
-        });
-
+        $this->singleton(Contracts\Detectors\DeviceDetector::class, Detectors\DeviceDetector::class);
         $this->singleton(Contracts\Detectors\GeoIpDetector::class, Detectors\GeoIpDetector::class);
-
-        $this->singleton(Contracts\Detectors\LanguageDetector::class, function (AppContract $app) {
-            return new Detectors\LanguageDetector($app['agent']);
-        });
+        $this->singleton(Contracts\Detectors\LanguageDetector::class, Detectors\LanguageDetector::class);
     }
 
     /**

src/Providers/PackagesServiceProvider.php

@@ -21,7 +21,7 @@ public function register()
     {
         $this->registerProviders([
             \Arcanedev\GeoIP\GeoIPServiceProvider::class,
-            \Jenssegers\Agent\AgentServiceProvider::class,
+            \Arcanedev\Agent\AgentServiceProvider::class,
         ]);
     }
 }