tmilos / jose-jwt

autoload.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 // if library is in dev environement with its own vendor, include its autoload
-if(file_exists(__DIR__ . '/vendor'))
-    require_once __DIR__ . '/vendor/autoload.php';
+if (file_exists(__DIR__.'/vendor'))
+    require_once __DIR__.'/vendor/autoload.php';
 // if library is in vendor of another project, include the global autolaod
 else
-    require_once __DIR__ . '/../../autoload.php';
+    require_once __DIR__.'/../../autoload.php';

Braces +4 added lines, -2 removed lines

@@ -1,8 +1,10 @@
 <?php
 
 // if library is in dev environement with its own vendor, include its autoload
-if(file_exists(__DIR__ . '/vendor'))
+if(file_exists(__DIR__ . '/vendor')) {
     require_once __DIR__ . '/vendor/autoload.php';
+}
 // if library is in vendor of another project, include the global autolaod
-else
+else {
     require_once __DIR__ . '/../../autoload.php';
+}

src/Jwe/AesCbcHmacEncryption.php

Doc Comments +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
      * @param string          $plainText
      * @param string|resource $cek
      *
-     * @return array [iv, cipherText, authTag]
+     * @return string[] [iv, cipherText, authTag]
      */
     public function encrypt($aad, $plainText, $cek)
     {
@@ -103,10 +103,10 @@ 
     }
 
     /**
-     * @param $aad
-     * @param $iv
-     * @param $cipherText
-     * @param $hmacKey
+     * @param string $aad
+     * @param string $iv
+     * @param string $cipherText
+     * @param string $hmacKey
      *
      * @return string
      */

Spacing +14 added lines, -14 removed lines

@@ -58,17 +58,17 @@ 
     public function encrypt($aad, $plainText, $cek)
     {
         $cekLen = StringUtils::length($cek);
-        if ($cekLen * 8 != $this->keySize) {
-            throw new JoseJwtException(sprintf('AES-CBC with HMAC algorithm expected key of size %s bits, but was given %s bits', $this->keySize, $cekLen * 8));
+        if ($cekLen*8 != $this->keySize) {
+            throw new JoseJwtException(sprintf('AES-CBC with HMAC algorithm expected key of size %s bits, but was given %s bits', $this->keySize, $cekLen*8));
         }
-        if ($cekLen % 2 != 0) {
+        if ($cekLen%2 != 0) {
             throw new JoseJwtException('AES-CBC with HMAC encryption expected key of even number size');
         }
 
-        $hmacKey = StringUtils::substring($cek, 0, $cekLen / 2);
-        $aesKey = StringUtils::substring($cek, $cekLen / 2, $cekLen / 2);
+        $hmacKey = StringUtils::substring($cek, 0, $cekLen/2);
+        $aesKey = StringUtils::substring($cek, $cekLen/2, $cekLen/2);
 
-        $method = sprintf('AES-%d-CBC', $this->keySize / 2);
+        $method = sprintf('AES-%d-CBC', $this->keySize/2);
         $ivLen = openssl_cipher_iv_length($method);
         $iv = $this->randomGenerator->get($ivLen);
         $cipherText = openssl_encrypt($plainText, $method, $aesKey, true, $iv);
@@ -90,22 +90,22 @@ 
     public function decrypt($aad, $cek, $iv, $cipherText, $authTag)
     {
         $cekLen = StringUtils::length($cek);
-        if ($cekLen * 8 != $this->keySize) {
-            throw new JoseJwtException(sprintf('AES-CBC with HMAC algorithm expected key of size %s bits, but was given %s bits', $this->keySize, $cekLen * 8));
+        if ($cekLen*8 != $this->keySize) {
+            throw new JoseJwtException(sprintf('AES-CBC with HMAC algorithm expected key of size %s bits, but was given %s bits', $this->keySize, $cekLen*8));
         }
-        if ($cekLen % 2 != 0) {
+        if ($cekLen%2 != 0) {
             throw new JoseJwtException('AES-CBC with HMAC encryption expected key of even number size');
         }
 
-        $hmacKey = StringUtils::substring($cek, 0, $cekLen / 2);
-        $aesKey = StringUtils::substring($cek, $cekLen / 2);
+        $hmacKey = StringUtils::substring($cek, 0, $cekLen/2);
+        $aesKey = StringUtils::substring($cek, $cekLen/2);
 
         $expectedAuthTag = $this->computeAuthTag($aad, $iv, $cipherText, $hmacKey);
         if (false === StringUtils::equals($expectedAuthTag, $authTag)) {
             throw new IntegrityException('Authentication tag does not match');
         }
 
-        $method = sprintf('AES-%d-CBC', $this->keySize / 2);
+        $method = sprintf('AES-%d-CBC', $this->keySize/2);
         $plainText = openssl_decrypt($cipherText, $method, $aesKey, true, $iv);
 
         return $plainText;
@@ -127,11 +127,11 @@ 
             $aad,
             $iv,
             $cipherText,
-            pack('N2', ($aadLen / $max32bit) * 8, ($aadLen % $max32bit) * 8),
+            pack('N2', ($aadLen/$max32bit)*8, ($aadLen%$max32bit)*8),
         ]);
         $authTag = $this->hashAlgorithm->sign($hmacInput, $hmacKey);
         $authTagLen = StringUtils::length($authTag);
-        $authTag = StringUtils::substring($authTag, 0, $authTagLen / 2);
+        $authTag = StringUtils::substring($authTag, 0, $authTagLen/2);
 
         return $authTag;
     }

src/Jwe/AesKeyWrapAlgorithm.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * @param string|resource $kek
      * @param array           $header
      *
-     * @return array [cek, encryptedCek]
+     * @return string[] [cek, encryptedCek]
      */
     public function wrapNewKey($cekSizeBits, $kek, array $header)
     {

Spacing +6 added lines, -6 removed lines

@@ -58,14 +58,14 @@ 
     public function wrapNewKey($cekSizeBits, $kek, array $header)
     {
         $kekLen = StringUtils::length($kek);
-        if ($kekLen * 8 != $this->kekLengthBits) {
-            throw new JoseJwtException(sprintf('AesKeyWrap management algorithm expected key of size %s bits, but was given %s bits', $this->kekLengthBits, $kekLen * 8));
+        if ($kekLen*8 != $this->kekLengthBits) {
+            throw new JoseJwtException(sprintf('AesKeyWrap management algorithm expected key of size %s bits, but was given %s bits', $this->kekLengthBits, $kekLen*8));
         }
-        if ($cekSizeBits % 8 != 0) {
+        if ($cekSizeBits%8 != 0) {
             throw new JoseJwtException('CekSizeBits must be divisible by 8');
         }
 
-        $cek = $this->randomGenerator->get($cekSizeBits / 8);
+        $cek = $this->randomGenerator->get($cekSizeBits/8);
 
         $encryptedCek = $this->aesWrap($kek, $cek);
 
@@ -83,8 +83,8 @@ 
     public function unwrap($encryptedCek, $kek, $cekSizeBits, array $header)
     {
         $kekLen = StringUtils::length($kek);
-        if ($kekLen * 8 != $this->kekLengthBits) {
-            throw new JoseJwtException(sprintf('AesKeyWrap management algorithm expected key of size %s bits, but was given %s bits', $this->kekLengthBits, $kekLen * 8));
+        if ($kekLen*8 != $this->kekLengthBits) {
+            throw new JoseJwtException(sprintf('AesKeyWrap management algorithm expected key of size %s bits, but was given %s bits', $this->kekLengthBits, $kekLen*8));
         }
 
         return $this->aesUnwrap($kek, $encryptedCek);

src/Jwe/RsaAlgorithm.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      * @param string|resource $kek
      * @param array           $header
      *
-     * @return array [cek, encryptedCek]
+     * @return string[] [cek, encryptedCek]
      */
     public function wrapNewKey($cekSizeBits, $kek, array $header)
     {

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function wrapNewKey($cekSizeBits, $kek, array $header)
     {
-        $cek = $this->randomGenerator->get($cekSizeBits / 8);
+        $cek = $this->randomGenerator->get($cekSizeBits/8);
         if (false == openssl_public_encrypt($cek, $cekEncrypted, $kek, $this->padding)) {
             throw new JoseJwtException('Unable to encrypt CEK');
         }

src/Jws/RsaUsingSha.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
      * @param string $securedInput
      * @param string $key
      *
-     * @return bool
+     * @return integer
      */
     public function verify($signature, $securedInput, $key)
     {