Merge branch 'v7' of https://github.com/Spomky-Labs/jose into v7

Spomky-Labs · Oct 2, 2017 · da794f7 · da794f7
2 parents 5ba3f29 + 4dd04a2
commit da794f7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/Component/Core/JWKSet.php b/src/Component/Core/JWKSet.php
@@ -273,7 +273,7 @@ private function canKeyBeUsedFor(string $type, JWK $key)
 
     /**
      * @param null|AlgorithmInterface $algorithm
-     * @param JWK         $key
+     * @param JWK                     $key
      *
      * @return bool|int
      */

diff --git a/src/Component/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php b/src/Component/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php
@@ -40,6 +40,7 @@ public function __construct(int $salt_size = 64, int $nb_count = 4096)
         $this->salt_size = $salt_size;
         $this->nb_count = $nb_count;
     }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Component/KeyManagement/JWKFactory.php b/src/Component/KeyManagement/JWKFactory.php
@@ -188,7 +188,7 @@ private static function getOpensslName(string $curve): string
     public static function createFromString(string $value)
     {
         $json = json_decode($value, true);
-        if(!is_array($json)) {
+        if (!is_array($json)) {
             throw new \InvalidArgumentException('Invalid key or key set.');
         }
 

diff --git a/src/Component/Signature/Algorithm/ECDSA.php b/src/Component/Signature/Algorithm/ECDSA.php
@@ -31,6 +31,7 @@ public function __construct()
             throw new \RuntimeException('Elliptic Curve key type not supported by your environment.');
         }
     }
+
     /**
      * {@inheritdoc}
      */
@@ -39,7 +40,6 @@ public function allowedKeyTypes(): array
         return ['EC'];
     }
 
-
     /**
      * {@inheritdoc}
      */