Merge pull request #98 from Spomky-Labs/analysis-8wj6GK

Applied fixes from StyleCI
Spomky-Labs · Apr 29, 2016 · c200355 · c200355
2 parents b6cabcf + bdadbeb
commit c200355
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/Algorithm/ContentEncryption/AESGCM.php b/src/Algorithm/ContentEncryption/AESGCM.php
@@ -11,9 +11,9 @@
 
 namespace Jose\Algorithm\ContentEncryption;
 
+use AESGCM\AESGCM as GCM;
 use Crypto\Cipher;
 use Jose\Algorithm\ContentEncryptionAlgorithmInterface;
-use AESGCM\AESGCM as GCM;
 
 abstract class AESGCM implements ContentEncryptionAlgorithmInterface
 {

diff --git a/src/Algorithm/KeyEncryption/AESGCMKW.php b/src/Algorithm/KeyEncryption/AESGCMKW.php
@@ -11,11 +11,11 @@
 
 namespace Jose\Algorithm\KeyEncryption;
 
+use AESGCM\AESGCM;
 use Assert\Assertion;
 use Base64Url\Base64Url;
 use Crypto\Cipher;
 use Jose\Object\JWKInterface;
-use AESGCM\AESGCM;
 
 /**
  * Class AESGCMKW.

diff --git a/src/Factory/JWKFactory.php b/src/Factory/JWKFactory.php
@@ -51,7 +51,7 @@ public static function createRandomECPrivateKey($curve, array $additional_values
     }
 
     /**
-     * @param array  $additional_values
+     * @param array $additional_values
      *
      * @return \Jose\Object\JWKInterface
      */
@@ -62,7 +62,7 @@ public static function createRandomX25519PrivateKey(array $additional_values = [
         }
         $d = random_bytes(32);
         $x = curve25519_public($d);
-        
+
         $values = [
             'kty' => 'OKP',
             'crv' => 'X25519',

diff --git a/tests/Functional/LoaderAndCreatorTest.php b/tests/Functional/LoaderAndCreatorTest.php
@@ -9,15 +9,15 @@
  * of the MIT license.  See the LICENSE file for details.
  */
 
+use Jose\Decrypter;
+use Jose\Encrypter;
 use Jose\JWTCreator;
 use Jose\JWTLoader;
 use Jose\Object\JWK;
 use Jose\Object\JWKSet;
 use Jose\Signer;
-use Jose\Verifier;
-use Jose\Encrypter;
-use Jose\Decrypter;
 use Jose\Test\TestCase;
+use Jose\Verifier;
 
 /**
  * @group JWTLoader

diff --git a/tests/Unit/Algorithm/ECDHESKeyAgreementTest.php b/tests/Unit/Algorithm/ECDHESKeyAgreementTest.php
@@ -14,8 +14,8 @@
 use Jose\Algorithm\KeyEncryption\ECDHESA128KW;
 use Jose\Algorithm\KeyEncryption\ECDHESA192KW;
 use Jose\Algorithm\KeyEncryption\ECDHESA256KW;
-use Jose\Object\JWK;
 use Jose\Factory\JWKFactory;
+use Jose\Object\JWK;
 
 /**
  * Class ECDHESKeyAgreementTest.
@@ -238,6 +238,7 @@ public function testUnsupportedCurve()
         $ecdh_es = new ECDHES();
         $ecdh_es->getAgreementKey(256, 'A128GCM', $receiver, $header);
     }
+
     /**
      * @see https://tools.ietf.org/html/rfc7518#appendix-C
      */