Nits

paragonie · Jan 26, 2018 · bf6c1f6 · bf6c1f6
1 parent da67a28
commit bf6c1f6
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 63 deletions.
diff --git a/src/Asymmetric/EncryptionPublicKey.php b/src/Asymmetric/EncryptionPublicKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Asymmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**

diff --git a/src/Asymmetric/EncryptionSecretKey.php b/src/Asymmetric/EncryptionSecretKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Asymmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**
@@ -41,6 +37,7 @@ public function __construct(HiddenString $keyMaterial)
      *
      * @return EncryptionPublicKey
      *
+     * @throws InvalidKey
      * @throws \TypeError
      */
     public function derivePublicKey()

diff --git a/src/Asymmetric/PublicKey.php b/src/Asymmetric/PublicKey.php
@@ -2,10 +2,6 @@
 declare(strict_types=1);
 namespace ParagonIE\Halite\Asymmetric;
 
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidType
-};
 use ParagonIE\Halite\HiddenString;
 use ParagonIE\Halite\Key;
 

diff --git a/src/Asymmetric/SecretKey.php b/src/Asymmetric/SecretKey.php
@@ -1,10 +1,7 @@
 <?php
 namespace ParagonIE\Halite\Asymmetric;
 
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\CannotPerformOperation;
 use ParagonIE\Halite\HiddenString;
 use ParagonIE\Halite\Key;
 
@@ -29,7 +26,7 @@ public function __construct(HiddenString $keyMaterial)
         parent::__construct($keyMaterial);
         $this->isAsymmetricKey = true;
     }
-    
+
     /**
      * See the appropriate derived class.
      * @throws CannotPerformOperation

diff --git a/src/Asymmetric/SignaturePublicKey.php b/src/Asymmetric/SignaturePublicKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Asymmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**

diff --git a/src/Asymmetric/SignatureSecretKey.php b/src/Asymmetric/SignatureSecretKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Asymmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**

diff --git a/src/Cookie.php b/src/Cookie.php
@@ -2,19 +2,19 @@
 declare(strict_types=1);
 namespace ParagonIE\Halite;
 
-use \ParagonIE\ConstantTime\{
+use ParagonIE\ConstantTime\{
     Base64UrlSafe,
     Binary,
     Hex
 };
-use \ParagonIE\Halite\Alerts\{
+use ParagonIE\Halite\Alerts\{
     CannotPerformOperation,
     InvalidDigestLength,
     InvalidMessage,
     InvalidSignature,
     InvalidType
 };
-use \ParagonIE\Halite\Symmetric\{
+use ParagonIE\Halite\Symmetric\{
     Config as SymmetricConfig,
     Crypto,
     EncryptionKey

diff --git a/src/EncryptionKeyPair.php b/src/EncryptionKeyPair.php
@@ -2,11 +2,7 @@
 declare(strict_types=1);
 namespace ParagonIE\Halite;
 
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\Asymmetric\{
     EncryptionPublicKey,
     EncryptionSecretKey
@@ -45,8 +41,6 @@ final class EncryptionKeyPair extends KeyPair
      *
      * @param array<int, Key> $keys
      *
-     * @throws CannotPerformOperation
-     * @throws InvalidType
      * @throws InvalidKey
      * @throws \InvalidArgumentException
      * @throws \TypeError
@@ -133,6 +127,7 @@ public function __construct(Key ...$keys)
      * @param EncryptionSecretKey $secret
      * @return void
      *
+     * @throws InvalidKey
      * @throws \TypeError
      */
     protected function setupKeyPair(EncryptionSecretKey $secret): void

diff --git a/src/File.php b/src/File.php
@@ -252,6 +252,7 @@ public static function seal(
      * @throws FileError
      * @throws FileModified
      * @throws InvalidDigestLength
+     * @throws InvalidKey
      * @throws InvalidMessage
      * @throws InvalidType
      * @throws \TypeError
@@ -736,6 +737,7 @@ protected static function sealData(
      * @throws FileError
      * @throws FileModified
      * @throws InvalidDigestLength
+     * @throws InvalidKey
      * @throws InvalidMessage
      * @throws InvalidType
      * @throws \TypeError

diff --git a/src/Key.php b/src/Key.php
@@ -4,9 +4,7 @@
 
 use ParagonIE\Halite\Alerts\{
     CannotCloneKey,
-    CannotPerformOperation,
-    CannotSerializeKey,
-    InvalidType
+    CannotSerializeKey
 };
 
 /**

diff --git a/src/KeyFactory.php b/src/KeyFactory.php
@@ -93,9 +93,7 @@ public static function generateEncryptionKey(): EncryptionKey
      *
      * @return \ParagonIE\Halite\EncryptionKeyPair
      *
-     * @throws CannotPerformOperation
      * @throws InvalidKey
-     * @throws InvalidType
      * @throws \TypeError
      */
     public static function generateEncryptionKeyPair(): EncryptionKeyPair
@@ -236,7 +234,6 @@ public static function deriveEncryptionKey(
      *
      * @return EncryptionKeyPair
      *
-     * @throws CannotPerformOperation
      * @throws InvalidKey
      * @throws InvalidSalt
      * @throws InvalidType
@@ -506,9 +503,7 @@ public static function importSignatureSecretKey(HiddenString $keyData): Signatur
      * @param HiddenString $keyData
      * @return EncryptionKeyPair
      *
-     * @throws CannotPerformOperation
      * @throws InvalidKey
-     * @throws InvalidType
      * @throws \TypeError
      */
     public static function importEncryptionKeyPair(HiddenString $keyData): EncryptionKeyPair
@@ -692,7 +687,6 @@ public static function loadSignatureSecretKey(string $filePath): SignatureSecret
      *
      * @throws CannotPerformOperation
      * @throws InvalidKey
-     * @throws InvalidType
      * @throws \TypeError
      * @codeCoverageIgnore
      */

diff --git a/src/SignatureKeyPair.php b/src/SignatureKeyPair.php
@@ -2,11 +2,7 @@
 declare(strict_types=1);
 namespace ParagonIE\Halite;
 
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\Asymmetric\{
     SignaturePublicKey,
     SignatureSecretKey
@@ -130,6 +126,7 @@ public function __construct(Key ...$keys)
      * @param SignatureSecretKey $secret
      * @return void
      *
+     * @throws InvalidKey
      * @throws \TypeError
      */
     protected function setupKeyPair(SignatureSecretKey $secret): void

diff --git a/src/Structure/MerkleTree.php b/src/Structure/MerkleTree.php
@@ -158,6 +158,7 @@ public function setPersonalizationString(string $str = ''): self
      *
      * @return self
      * @throws CannotPerformOperation
+     * @throws \TypeError
      * @codeCoverageIgnore
      */
     public function triggerRootCalculation(): self
@@ -173,6 +174,7 @@ public function triggerRootCalculation(): self
      *
      * @return string
      * @throws CannotPerformOperation
+     * @throws \TypeError
      */
     protected function calculateRoot(): string
     {

diff --git a/src/Structure/Node.php b/src/Structure/Node.php
@@ -56,6 +56,7 @@ public function getData(): string
      *
      * @return string
      * @throws CannotPerformOperation
+     * @throws \TypeError
      */
     public function getHash(
         bool $raw = false,

diff --git a/src/Structure/TrimmedMerkleTree.php b/src/Structure/TrimmedMerkleTree.php
@@ -37,6 +37,7 @@ class TrimmedMerkleTree extends MerkleTree
      *
      * @return string
      * @throws CannotPerformOperation
+     * @throws \TypeError
      * @psalm-suppress EmptyArrayAccess Psalm is misreading array elements
      */
     protected function calculateRoot(): string

diff --git a/src/Symmetric/AuthenticationKey.php b/src/Symmetric/AuthenticationKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Symmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**

diff --git a/src/Symmetric/EncryptionKey.php b/src/Symmetric/EncryptionKey.php
@@ -3,11 +3,7 @@
 namespace ParagonIE\Halite\Symmetric;
 
 use ParagonIE\ConstantTime\Binary;
-use ParagonIE\Halite\Alerts\{
-    CannotPerformOperation,
-    InvalidKey,
-    InvalidType
-};
+use ParagonIE\Halite\Alerts\InvalidKey;
 use ParagonIE\Halite\HiddenString;
 
 /**