PHP implementation of #390

php/src/vaas/Message/Detection.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace VaasSdk\Message;
+
+class Detection
+{
+    public ?int $engine;
+    public string $fileName;
+    public string $virus;
+}

php/src/vaas/Message/Error.php

@@ -5,55 +5,12 @@
 class Error extends BaseMessage
 {
     public string $type;
-
     public string $requestId;
-
     public string $text;
-
     public ?ProblemDetails $problem_details;
 
     public function __construct()
     {
         $this->kind = Kind::Error;
     }
-
-    /**
-     * @return string
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @return Kind
-     */
-    public function getKind(): Kind
-    {
-        return $this->kind;
-    }
-
-    /**
-     * @return ProblemDetails
-     */
-    public function getProblemDetails(): ProblemDetails
-    {
-        return $this->problem_details;
-    }
-
-    /**
-     * @return string
-     */
-    public function getRequestId(): string
-    {
-        return $this->requestId;
-    }
-
-    /**
-     * @return string
-     */
-    public function getText(): string
-    {
-        return $this->text;
-    }
 }

php/src/vaas/Message/LibMagic.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace VaasSdk\Message;
+
+class LibMagic
+{
+    public string $fileType;
+    public string $mimeType;
+}

php/src/vaas/Message/ProblemDetails.php

@@ -5,22 +5,5 @@
 class ProblemDetails
 {
     public string $type;
-
     public string $detail;
-
-    /**
-     * @return string
-     */
-    public function getDetail(): string
-    {
-        return $this->detail;
-    }
-
-    /**
-     * @return string
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-}
+}

php/src/vaas/Message/VaasVerdict.php

@@ -9,9 +9,13 @@ public function __construct(VerdictResponse $verdictResponse)
         $this->Sha256 = $verdictResponse->sha256 ?? "";
         $this->Verdict = $verdictResponse->verdict ?? Verdict::UNKNOWN;
         $this->Guid = $verdictResponse->guid ?? "";
+        $this->LibMagic = $verdictResponse->libMagic ?? null;
+        $this->Detections = $verdictResponse->detections ?? null;
     }
 
     public string $Sha256;
     public Verdict $Verdict;
     public string $Guid;
+    public ?LibMagic $LibMagic;
+    public ?array $Detections;
 }

php/src/vaas/Message/VerdictResponse.php

@@ -9,4 +9,6 @@ class VerdictResponse extends BaseMessage
     public string $guid;
     public string $sha256;
     public ?string $upload_token;
+    public ?LibMagic $libMagic;
+    public ?array $detections;
 }

php/src/vaas/Vaas.php

@@ -374,11 +374,11 @@ private function _waitForVerdict(string $guid): VerdictResponse
     private function _handleWebSocketErrorResponse(Error $errorResponse): void
     {
         if (isset($errorResponse->problem_details->detail)) {
-            $details = $errorResponse->problem_details->getDetail();
+            $details = $errorResponse->problem_details->detail;
         } else {
             $details = null;
         }
-        $errorType = $errorResponse->getType();
+        $errorType = $errorResponse->type;
         if ($errorType == "ClientError") {
             throw new VaasClientException($details);
         }

php/tests/vaas/VaasTest.php

@@ -596,4 +596,19 @@ public function testForStream_WithEicarUrlContentAsStream_ReturnsMalicious()
 
         $this->assertEquals(Verdict::MALICIOUS, $verdict->Verdict);
     }
+
+    public function testForStream_WithEicarUrlContentAsStream_ReturnsMaliciousWithDetectionAndMimeType()
+    {
+        $vaas = $this->_getVaas();
+        $vaas->Connect($this->getClientCredentialsGrantAuthenticator()->getToken());
+        $httpClient = new Client();
+        $response = $httpClient->get(self::MALICIOUS_URL);
+        $stream = new Stream($response->getBody()->detach());
+
+        $verdict = $vaas->ForStream($stream);
+
+        $this->assertEquals(Verdict::MALICIOUS, $verdict->Verdict);
+        $this->assertEquals("text/plain", $verdict->LibMagic->mimeType);
+        $this->assertContains("EICAR-Test-File", array_column($verdict->Detections, "virus")); 
+    }
 }