Added named keys to the parsed responses

jonjomckay · Dec 4, 2013 · 1654f00 · 1654f00
1 parent 5830691
commit 1654f00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Quahog/Client.php b/src/Quahog/Client.php
@@ -211,13 +211,13 @@ private function _parseResponse($response)
         $message = $splitResponse[1];
 
         if ($message === 'OK') {
-            return array($filename, '', 'OK');
+            return array('filename' => $filename, 'reason' => null, 'status' => 'OK');
         } else {
             $parts = explode(' ', $message);
             $status = array_pop($parts);
             $reason = implode(' ', $parts);
 
-            return array($filename, $reason, $status);
+            return array('filename' => $filename, 'reason' => $reason, 'status' => $status);
         }
     }
 } 
diff --git a/tests/QuahogTest.php b/tests/QuahogTest.php
@@ -88,22 +88,22 @@ public function testScanFile()
     {
         $result = $this->quahog->scanFile('/tmp/quahog/EICAR');
 
-        $this->assertSame(array('/tmp/quahog/EICAR', 'Eicar-Test-Signature', 'FOUND'), $result);
+        $this->assertSame(array('filename' => '/tmp/quahog/EICAR', 'reason' => 'Eicar-Test-Signature', 'status' => 'FOUND'), $result);
     }
 
     public function testMultiscanFile()
     {
         $result = $this->quahog->multiscanFile('/tmp/quahog');
 
-        $this->assertSame('Eicar-Test-Signature', $result[1]);
-        $this->assertSame('FOUND', $result[2]);
+        $this->assertSame('Eicar-Test-Signature', $result['reason']);
+        $this->assertSame('FOUND', $result['status']);
     }
 
     public function testContScan()
     {
         $result = $this->quahog->contScan('/tmp/quahog');
 
-        $this->assertSame(array('/tmp/quahog/EICAR', 'Eicar-Test-Signature', 'FOUND'), $result);
+        $this->assertSame(array('filename' => '/tmp/quahog/EICAR', 'reason' => 'Eicar-Test-Signature', 'status' => 'FOUND'), $result);
     }
 
     public function testScanStream()
@@ -112,7 +112,7 @@ public function testScanStream()
 
         $result = $this->quahog->scanStream($stream);
 
-        $this->assertSame(array('stream', 'Eicar-Test-Signature', 'FOUND'), $result);
+        $this->assertSame(array('filename' => 'stream', 'reason' => 'Eicar-Test-Signature', 'status' => 'FOUND'), $result);
     }
 
     public function testShutdown()