refactor: improve getContextId method

epessine · Jun 1, 2024 · 4e27cee · 4e27cee
1 parent 76d514b
commit 4e27cee
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/VesselManager.php b/src/VesselManager.php
@@ -13,15 +13,15 @@ class VesselManager
 
     public static function getContextId(): string
     {
-        if (isset(self::$contextId)) {
-            return self::$contextId;
-        }
-
         /** @var Request $request */
         $request = request();
-        /** @var string $contextId */
-        $contextId = $request->header(self::CONTEXT_HEADER, Str::random(20));
+        /** @var ?string $contextId */
+        $contextId = $request->header(self::CONTEXT_HEADER);
+
+        if ($contextId !== null) {
+            return $contextId;
+        }
 
-        return self::$contextId = $contextId;
+        return self::$contextId ??= Str::random(20);
     }
 }