Update compare() method

wapmorgan · Feb 6, 2017 · 953483a · 953483a
1 parent 0173cb3
commit 953483a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/BinaryStream.php b/src/BinaryStream.php
@@ -374,6 +374,12 @@ public function saveGroup($name, $fields) {
     public function compare($sizeInBytes, $bytes) {
         $data = fread($this->fp, $sizeInBytes);
         fseek($this->fp, -$sizeInBytes, SEEK_CUR);
+        if (is_array($bytes)) {
+            $source = $bytes;
+            $bytes = null;
+            foreach ($source as $byte)
+                $bytes .= is_int($byte) ? chr($byte) : $byte;
+        }
         return ($data === $bytes);
     }
 

diff --git a/tests/CompareTest.php b/tests/CompareTest.php
@@ -23,4 +23,15 @@ public function testCompare() {
         $this->assertFalse($s->compare(7, 'Called'));
         $this->assertTrue($s->compare(6, 'Called'));
     }
+
+    public function testCompareBinary() {
+        $s = new BinaryStream($this->createStream(pack('H*', '3026B27511')));
+        $this->assertFalse($s->compare(4, array(0x00, 0x00, 0x00, 0x00)));
+        $this->assertFalse($s->compare(3, array(0x30, 0x26, 0xB2, 0x75)));
+        $this->assertFalse($s->compare(5, array(0x30, 0x26, 0xB2, 0x75)));
+        $this->assertTrue($s->compare(4, array(0x30, 0x26, 0xB2, 0x75)));
+
+        $s = new BinaryStream($this->createStream(pack('H*', '202020')));
+        $this->assertTrue($s->compare(3, array(0x20, 32, ' ')));
+    }
 }