Merge branch 'develop'

.gitignore

@@ -1,2 +1,3 @@
 vendor/
-build/
+build/
+.idea/

.scrutinizer.yml

@@ -13,4 +13,4 @@ tools:
     php_pdepend:
         excluded_dirs: [vendor/*, doc/*, tests/*]
 filter:
-    excluded_paths: [vendor/*, doc/*]
+    excluded_paths: [vendor/*, doc/*, tests/*]

.travis.yml

@@ -11,13 +11,16 @@ matrix:
         - php: hhvm
 
 before_script:
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then pecl install crypto-0.1.1; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpenv config-add ./tests/php.ini; fi;'
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then composer require "ext-crypto:~0.1.1" --no-update; fi;'
     - curl -s http://getcomposer.org/installer | php
     - php composer.phar update --dev --no-interaction
 
 script:
     - mkdir -p build/logs
-    - php vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
+    - php vendor/bin/phpunit --testdox --coverage-text --coverage-clover ./build/logs/clover.xml
 
 after_script:
     - wget https://scrutinizer-ci.com/ocular.phar
-    - php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml
+    - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi;'

README.md

@@ -2,18 +2,20 @@
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/?branch=master)
 [![Code Coverage](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/?branch=master)
-[![Build Status](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/badges/build.png?b=master)](https://scrutinizer-ci.com/g/Spomky-Labs/JOSE/build-status/master)
+[![Build Status](https://travis-ci.org/Spomky-Labs/jose.svg?branch=master)](https://travis-ci.org/Spomky-Labs/jose)
 [![HHVM Status](http://hhvm.h4cc.de/badge/Spomky-Labs/JOSE.png)](http://hhvm.h4cc.de/package/Spomky-Labs/JOSE)
 
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/9123fbfc-7ae1-4d63-9fda-170b8ad794ee/big.png)](https://insight.sensiolabs.com/projects/9123fbfc-7ae1-4d63-9fda-170b8ad794ee)
+
 [![Latest Stable Version](https://poser.pugx.org/Spomky-Labs/JOSE/v/stable.png)](https://packagist.org/packages/Spomky-Labs/JOSE) [![Total Downloads](https://poser.pugx.org/Spomky-Labs/JOSE/downloads.png)](https://packagist.org/packages/Spomky-Labs/JOSE) [![Latest Unstable Version](https://poser.pugx.org/Spomky-Labs/JOSE/v/unstable.png)](https://packagist.org/packages/Spomky-Labs/JOSE) [![License](https://poser.pugx.org/Spomky-Labs/JOSE/license.png)](https://packagist.org/packages/Spomky-Labs/JOSE)
 
 This library aims to provide an implementation of:
 
-* JW**S** [JSON Web Signature (draft 31)](http://tools.ietf.org/html/draft-jones-json-web-signature-31),
-* JW**T** [JSON Web Token (draft 24)](http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-24),
-* JW**E** [JSON Web Encryption (draft 31)](http://tools.ietf.org/html/draft-ietf-jose-json-web-encryption-31),
-* JW**A** [JSON Web Algorithms (draft 31)](http://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-31).
-* JW**K** [JSON Web Key (draft 31)](http://tools.ietf.org/html/draft-ietf-jose-json-web-key-31).
+* JW**S** [JSON Web Signature (draft 41)](https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41),
+* JW**T** [JSON Web Token (draft 32)](https://tools.ietf.org/html/draft-ietf-oauth-json-web-token-32),
+* JW**E** [JSON Web Encryption (draft 40)](http://tools.ietf.org/html/draft-ietf-jose-json-web-encryption-40),
+* JW**A** [JSON Web Algorithms (draft 40)](http://tools.ietf.org/html/draft-ietf-jose-json-web-algorithms-40).
+* JW**K** [JSON Web Key (draft 40)](http://tools.ietf.org/html/draft-ietf-jose-json-web-key-40).
 
 **This library is not yet complete! Do not use it in production.**
 
@@ -46,8 +48,9 @@ This library needs at least
 * `PHP 5.4`
 * PHP Extension: `BC Math` or `GMP` (`GMP` is highly recommended!)
 * `OpenSSL` library for PHP
-* `phpseclib/phpseclib` library for RSA (encryption and signature) algorithms.
+* `phpseclib/phpseclib` library for RSA and AES algorithms.
 * `mdanter/ecc` library for Elliptic Curves algorithms.
+* [PHP Crypto](https://github.com/bukka/php-crypto) Extension for AES GCM algorithms.
 
 It has been successfully tested using `PHP 5.4` to `PHP 5.6`.
 Tests with `HHVM` fail because of `phpseclib/phpseclib` which is not compatible.
@@ -59,7 +62,7 @@ The preferred way to install this library is to rely on Composer:
     {
         "require": {
             // ...
-            "spomky-labs/jose": "dev-master"
+            "spomky-labs/jose": "~0.0.0"
         }
     }
 
@@ -83,4 +86,4 @@ Requests for new features, bug fixed and all other ideas to make this library us
 
 ## Licence
 
-This software is release under MIT licence.
+This software is release under [MIT licence](LICENSE).

composer.json

@@ -4,7 +4,7 @@
     "type": "library",
     "license": "MIT",
     "keywords": ["JWS", "JWT", "JWE", "JWA", "JWK", "JWKSet", "Jose"],
-    "homepage": "https://github.com/Spomky-Labs/JOSE",
+    "homepage": "https://github.com/Spomky-Labs/Jose",
     "authors": [
         {
             "name": "Florent Morselli",
@@ -13,27 +13,32 @@
     ],
     "autoload": {
         "psr-4": {
-            "SpomkyLabs\\JOSE\\":  "lib/"
+            "SpomkyLabs\\Jose\\":  "lib/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "SpomkyLabs\\JOSE\\Tests\\":  "tests/"
+            "SpomkyLabs\\Jose\\Tests\\":  "tests/"
         }
     },
     "require": {
         "php": ">=5.3",
-        "spomky-labs/jose-interface": "@dev",
+        "spomky-labs/jose-interface": "~0.0.0",
         "lib-openssl": "*",
-        "phpseclib/phpseclib": ">=0.3.5",
-        "mdanter/ecc": "~0.2"
+        "spomky-labs/pbkdf2": "~0.1",
+        "spomky-labs/aes-key-wrap": "~1.0"
     },
     "require-dev": {
+        "phpseclib/phpseclib": ">=0.3.5",
+        "mdanter/ecc": "~0.2",
         "phpunit/phpunit": "4.*"
     },
    "suggest":{
       "ext-gmp":"Required if BCMath is not installed (this extension is highly recommended!)",
-      "ext-bcmath":"Required if GMP is not installed"
+      "ext-bcmath":"Required if GMP is not installed",
+      "ext-crypto":"Required to use AES GCM algorithms",
+      "phpseclib/phpseclib":"Required to use RSA based algorithms",
+      "mdanter/ecc":"Required to use Elliptic Curves based algorithms"
    },
     "extra": {
         "branch-alias": {