[TASK] Small code cleanup

to clarify which identificator length represents what type
in2code-de · Oct 25, 2024 · 80ab446 · 80ab446
1 parent f8aa86f
commit 80ab446
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Classes/Domain/Factory/VisitorFactory.php b/Classes/Domain/Factory/VisitorFactory.php
@@ -190,11 +190,11 @@ protected function getIpAddress(): string
 
     protected function checkIdentificator(string $identificator): void
     {
-        $length = [0, 32, 33];
+        $length = [0, Fingerprint::IDENTIFICATOR_LENGTH_FINGERPRINT, Fingerprint::IDENTIFICATOR_LENGTH_STORAGE];
         if (in_array(strlen($identificator), $length) === false) {
             throw new IdentificatorFormatException('Identificator is in wrong format: ' . $identificator, 1680203759);
         }
-        if (preg_replace('/[a-z0-9]{32,33}/', '', $identificator) !== '') {
+        if (preg_replace('/[a-z0-9]{' . Fingerprint::IDENTIFICATOR_LENGTH_FINGERPRINT . ',' . Fingerprint::IDENTIFICATOR_LENGTH_STORAGE . '}/', '', $identificator) !== '') {
             throw new IdentificatorFormatException('Identificator is in wrong format: ' . $identificator, 1680204272);
         }
     }

diff --git a/Classes/Domain/Model/Fingerprint.php b/Classes/Domain/Model/Fingerprint.php
@@ -17,6 +17,9 @@ class Fingerprint extends AbstractModel
     public const TYPE_FINGERPRINT = 0;
     public const TYPE_COOKIE = 1;
     public const TYPE_STORAGE = 2;
+    public const IDENTIFICATOR_LENGTH_FINGERPRINT = 32;
+    public const IDENTIFICATOR_LENGTH_STORAGE = 33;
+    public const IDENTIFICATOR_LENGTH_FINGERPRINTWITHIPHASH = 64;
 
     protected string $value = '';
     protected string $domain = '';
@@ -50,7 +53,7 @@ public function setValue(string $value): self
         if ($value === '') {
             throw new FingerprintMustNotBeEmptyException('Value is empty', 1585901797);
         }
-        if (strlen($value) === 33) {
+        if (strlen($value) === self::IDENTIFICATOR_LENGTH_STORAGE) {
             $this->setType(self::TYPE_STORAGE);
             $this->value = $value;
         } else {