refactors the options

* adds fromVaasOptions function for the forXXXOptions
* removes the default() function as it is not used anywhere

Author: ata-no-one

php/src/vaas/Options/ForFileOptions.php

@@ -4,13 +4,19 @@
 
 class ForFileOptions
 {
+    const DEFAULT_REQUEST_ID = null;
+    
     public function __construct(
         public bool $useCache = true,
         public bool $useHashLookup = true,
-        public ?string $vaasRequestId = null) {}
+        public ?string $vaasRequestId = self::DEFAULT_REQUEST_ID) {}
 
-    public static function default(): self
+    public static function fromVaasOptions(VaasOptions $options): self
     {
-        return new self();
+        return new self(
+            $options->useCache,
+            $options->useHashLookup,
+            self::DEFAULT_REQUEST_ID
+        );
     }
 }

php/src/vaas/Options/ForSha256Options.php

@@ -4,13 +4,19 @@
 
 class ForSha256Options
 {
+    const DEFAULT_REQUEST_ID = null;
+
     public function __construct(
         public bool $useCache = true,
         public bool $useHashLookup = true,
-        public ?string $vaasRequestId = null) {}
+        public ?string $vaasRequestId = self::DEFAULT_REQUEST_ID) {}
 
-    public static function default(): self
+    public static function fromVaasOptions(VaasOptions $options): self
     {
-        return new self();
+        return new self(
+            $options->useCache,
+            $options->useHashLookup,
+            self::DEFAULT_REQUEST_ID
+        );
     }
 }

php/src/vaas/Options/ForStreamOptions.php

@@ -4,13 +4,20 @@
 
 class ForStreamOptions
 {
+    const DEFAULT_TIMEOUT = 300;
+    const DEFAULT_REQUEST_ID = null;
+
     public function __construct(
         public bool $useHashLookup = true,
-        public int $timeout = 300,
-        public ?string $vaasRequestId = null) {}
+        public int $timeout = self::DEFAULT_TIMEOUT,
+        public ?string $vaasRequestId = self::DEFAULT_REQUEST_ID) {}
 
-    public static function default(): self
+    public static function fromVaasOptions(VaasOptions $options): self
     {
-        return new self();
+        return new self(
+            $options->useCache,
+            self::DEFAULT_TIMEOUT,
+            self::DEFAULT_REQUEST_ID
+        );
     }
 }

php/src/vaas/Options/ForUrlOptions.php

@@ -4,12 +4,17 @@
 
 class ForUrlOptions
 {
+    const DEFAULT_REQUEST_ID = null;
+
     public function __construct(
         public bool $useHashLookup = true,
-        public ?string $vaasRequestId = null) {}
+        public ?string $vaasRequestId = self::DEFAULT_REQUEST_ID) {}
 
-    public static function default(): self
+    public static function fromVaasOptions(VaasOptions $options): self
     {
-        return new self();
+        return new self(
+            $options->useHashLookup,
+            self::DEFAULT_REQUEST_ID
+        );
     }
 }

php/src/vaas/Vaas.php

@@ -81,7 +81,7 @@ public function forSha256Async(Sha256 $sha256, ?ForSha256Options $options = null
         return async(function () use ($sha256, $options, $cancellation) {
             $this->logger->debug("Requesting verdict for SHA256: $sha256");
 
-            $options = $options ?? ForSha256Options::default();
+            $options = $options ?? ForSha256Options::fromVaasOptions($this->options);
 
             $url = sprintf('%s/files/%s/report/?useCache=%s&useHashLookup=%s',
                 $this->options->vaasUrl,
@@ -139,8 +139,7 @@ public function forFileAsync(string $path, ?ForFileOptions $options = null, ?Can
                 throw new VaasClientException('File does not exist');
             }
 
-            $options = $options ?? ForFileOptions::default();
-
+            $options = $options ?? ForFileOptions::fromVaasOptions($this->options);
 
             if ($options->useCache || $options->useHashLookup) {
                 $forSha256Options = new ForSha256Options(
@@ -183,7 +182,7 @@ public function forStreamAsync(ReadableStream $stream, int $fileSize, ?ForStream
                     throw new VaasClientException('Stream is not readable');
                 }
 
-                $options = $options ?? ForStreamOptions::default();
+                $options = $options ?? ForStreamOptions::fromVaasOptions($this->options);
 
                 $url = sprintf('%s/files?useHashLookup=%s', $this->options->vaasUrl, json_encode($options->useHashLookup));
 
@@ -242,7 +241,7 @@ public function forUrlAsync(string $uri, ?ForUrlOptions $options = null, ?Cancel
             $this->logger->debug("Requesting verdict for URL: $uri");
             $uri = Vaas::validUri($uri);
 
-            $options = $options ?? ForUrlOptions::default();
+            $options = $options ?? ForUrlOptions::fromVaasOptions($this->options);
 
             $urlAnalysisUri = sprintf('%s/urls', $this->options->vaasUrl);