Defined new structure for tracking config, together with new options

module/Core/src/Options/AppOptions.php

@@ -12,7 +12,6 @@ class AppOptions extends AbstractOptions
 {
     private string $name = '';
     private string $version = '1.0';
-    private ?string $disableTrackParam = null;
 
     public function getName(): string
     {
@@ -36,16 +35,10 @@ class AppOptions extends AbstractOptions
         return $this;
     }
 
-    /**
-     */
-    public function getDisableTrackParam(): ?string
-    {
-        return $this->disableTrackParam;
-    }
-
+    /** @deprecated  */
     protected function setDisableTrackParam(?string $disableTrackParam): self
     {
-        $this->disableTrackParam = $disableTrackParam;
+        // Keep just for backwards compatibility during hydration
         return $this;
     }
 

module/Core/src/Options/TrackingOptions.php

@@ -0,0 +1,99 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\Core\Options;
+
+use Laminas\Stdlib\AbstractOptions;
+
+class TrackingOptions extends AbstractOptions
+{
+    private bool $anonymizeRemoteAddr = true;
+    private bool $trackOrphanVisits = true;
+    private ?string $disableTrackParam = null;
+    private bool $disableTracking = false;
+    private bool $disableIpTracking = false;
+    private bool $disableLocationTracking = false;
+    private bool $disableReferrerTracking = false;
+    private bool $disableUaTracking = false;
+
+    public function anonymizeRemoteAddr(): bool
+    {
+        return $this->anonymizeRemoteAddr;
+    }
+
+    protected function setAnonymizeRemoteAddr(bool $anonymizeRemoteAddr): void
+    {
+        $this->anonymizeRemoteAddr = $anonymizeRemoteAddr;
+    }
+
+    public function trackOrphanVisits(): bool
+    {
+        return $this->trackOrphanVisits;
+    }
+
+    protected function setTrackOrphanVisits(bool $trackOrphanVisits): void
+    {
+        $this->trackOrphanVisits = $trackOrphanVisits;
+    }
+
+    public function getDisableTrackParam(): ?string
+    {
+        return $this->disableTrackParam;
+    }
+
+    protected function setDisableTrackParam(?string $disableTrackParam): void
+    {
+        $this->disableTrackParam = $disableTrackParam;
+    }
+
+    public function disableTracking(): bool
+    {
+        return $this->disableTracking;
+    }
+
+    protected function setDisableTracking(bool $disableTracking): void
+    {
+        $this->disableTracking = $disableTracking;
+    }
+
+    public function disableIpTracking(): bool
+    {
+        return $this->disableIpTracking;
+    }
+
+    protected function setDisableIpTracking(bool $disableIpTracking): void
+    {
+        $this->disableIpTracking = $disableIpTracking;
+    }
+
+    public function disableLocationTracking(): bool
+    {
+        return $this->disableLocationTracking;
+    }
+
+    protected function setDisableLocationTracking(bool $disableLocationTracking): void
+    {
+        $this->disableLocationTracking = $disableLocationTracking;
+    }
+
+    public function disableReferrerTracking(): bool
+    {
+        return $this->disableReferrerTracking;
+    }
+
+    protected function setDisableReferrerTracking(bool $disableReferrerTracking): void
+    {
+        $this->disableReferrerTracking = $disableReferrerTracking;
+    }
+
+    public function disableUaTracking(): bool
+    {
+        return $this->disableUaTracking;
+    }
+
+    protected function setDisableUaTracking(bool $disableUaTracking): void
+    {
+        $this->disableUaTracking = $disableUaTracking;
+    }
+}

module/Core/src/Options/UrlShortenerOptions.php

@@ -19,8 +19,6 @@ class UrlShortenerOptions extends AbstractOptions
     private int $redirectStatusCode = DEFAULT_REDIRECT_STATUS_CODE;
     private int $redirectCacheLifetime = DEFAULT_REDIRECT_CACHE_LIFETIME;
     private bool $autoResolveTitles = false;
-    private bool $anonymizeRemoteAddr = true;
-    private bool $trackOrphanVisits = true;
 
     public function isUrlValidationEnabled(): bool
     {
@@ -69,23 +67,15 @@ class UrlShortenerOptions extends AbstractOptions
         $this->autoResolveTitles = $autoResolveTitles;
     }
 
-    public function anonymizeRemoteAddr(): bool
-    {
-        return $this->anonymizeRemoteAddr;
-    }
-
+    /** @deprecated  */
     protected function setAnonymizeRemoteAddr(bool $anonymizeRemoteAddr): void
     {
-        $this->anonymizeRemoteAddr = $anonymizeRemoteAddr;
-    }
-
-    public function trackOrphanVisits(): bool
-    {
-        return $this->trackOrphanVisits;
+        // Keep just for backwards compatibility during hydration
     }
 
+    /** @deprecated  */
     protected function setTrackOrphanVisits(bool $trackOrphanVisits): void
     {
-        $this->trackOrphanVisits = $trackOrphanVisits;
+        // Keep just for backwards compatibility during hydration
     }
 }