This should be our last commit.

paragonie · Jan 26, 2018 · 3728ff4 · 3728ff4
1 parent 77ac0d2
commit 3728ff4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/src/Asymmetric/Crypto.php b/src/Asymmetric/Crypto.php
@@ -59,6 +59,7 @@ final private function __construct()
      * @return string                              Ciphertext
      *
      * @throws CannotPerformOperation
+     * @throws InvalidKey
      * @throws InvalidMessage
      * @throws InvalidDigestLength
      * @throws InvalidType
@@ -135,6 +136,7 @@ public static function encryptWithAd(
      *
      * @throws CannotPerformOperation
      * @throws InvalidDigestLength
+     * @throws InvalidKey
      * @throws InvalidMessage
      * @throws InvalidSignature
      * @throws InvalidType

diff --git a/src/Stream/MutableFile.php b/src/Stream/MutableFile.php
@@ -152,28 +152,34 @@ public function getSize(): int
      */
     public function readBytes(int $num, bool $skipTests = false): string
     {
+        // @codeCoverageIgnoreStart
         if ($num < 0) {
             throw new CannotPerformOperation('num < 0');
         } elseif ($num === 0) {
             return '';
         }
+        // @codeCoverageIgnoreEnd
         if (($this->pos + $num) > $this->stat['size']) {
             throw new CannotPerformOperation('Out-of-bounds read');
         }
         $buf = '';
         $remaining = $num;
         do {
             if ($remaining <= 0) {
+                // @codeCoverageIgnoreStart
                 break;
+                // @codeCoverageIgnoreEnd
             }
             /** @var int $bufSize */
             $bufSize = \min($remaining, self::CHUNK);
             /** @var string $read */
             $read = \fread($this->fp, $bufSize);
             if (!\is_string($read)) {
+                // @codeCoverageIgnoreStart
                 throw new FileAccessDenied(
                     'Could not read from the file'
                 );
+                // @codeCoverageIgnoreEnd
             }
             $buf .= $read;
             $readSize = Binary::safeStrlen($read);
@@ -207,6 +213,7 @@ public function remainingBytes(): int
      * @param int $i
      * @return bool
      * @throws CannotPerformOperation
+     * @codeCoverageIgnore
      */
     public function reset(int $i = 0): bool
     {
@@ -236,19 +243,23 @@ public function writeBytes(string $buf, int $num = null): int
         if ($num === null || $num > $bufSize) {
             $num = $bufSize;
         }
+        // @codeCoverageIgnoreStart
         if ($num < 0) {
             throw new CannotPerformOperation('num < 0');
         }
+        // @codeCoverageIgnoreEnd
         $remaining = $num;
         do {
             if ($remaining <= 0) {
                 break;
             }
             $written = \fwrite($this->fp, $buf, $remaining);
             if ($written === false) {
+                // @codeCoverageIgnoreStart
                 throw new FileAccessDenied(
                     'Could not write to the file'
                 );
+                // @codeCoverageIgnoreEnd
             }
             $buf = Binary::safeSubstr($buf, $written, null);
             $this->pos += $written;

diff --git a/test/unit/StreamTest.php b/test/unit/StreamTest.php
@@ -176,6 +176,12 @@ public function testFileRead()
             $mStream->reset(0);
 
             $this->assertSame(0, $mStream->getPos());
+            $this->assertSame($size, $mStream->remainingBytes());
+
+            $mStream->reset(127);
+            $this->assertSame($size - 127, $mStream->remainingBytes());
+            $mStream->reset(0);
+
             $this->assertSame($size, $mStream->getSize());
             $this->assertSame(bin2hex($buffer), bin2hex($mStream->readBytes($size)));
         }

diff --git a/test/unit/Structure/MerkleTreeTest.php b/test/unit/Structure/MerkleTreeTest.php
@@ -34,6 +34,10 @@ public function testExpectedBehavior()
             '6781891a87aa476454b74dc635c5cdebfc8f887438829ce2e81423f54906c058',
             $treeA->getRoot()
         );
+        $this->assertSame(
+            hex2bin('6781891a87aa476454b74dc635c5cdebfc8f887438829ce2e81423f54906c058'),
+            $treeA->getRoot(true)
+        );
         $treeB = new MerkleTree(
             new Node('a'),
             new Node('b'),

diff --git a/test/unit/Structure/NodeTest.php b/test/unit/Structure/NodeTest.php
@@ -23,5 +23,6 @@ public function testHash()
         $hash = sodium_crypto_generichash($stringData . $extra);
 
         $this->assertSame(bin2hex($hash), $node->getExpandedNode($extra)->getHash());
+        $this->assertSame($hash, $node->getExpandedNode($extra)->getHash(true));
     }
 }