KVytyagov
diff --git a/‎.travis.yml‎
Lines changed: 4 additions & 4 deletions b/‎.travis.yml‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎README.md‎
Lines changed: 2 additions & 1 deletion b/‎README.md‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎composer.json‎
Lines changed: 7 additions & 1 deletion b/‎composer.json‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎lib/OAuth2/IOAuth2GrantClient.php‎ renamed to ‎lib/IOAuth2GrantClient.php‎ b/‎lib/OAuth2/IOAuth2GrantClient.php‎ renamed to ‎lib/IOAuth2GrantClient.php‎
diff --git a/‎lib/OAuth2/IOAuth2GrantCode.php‎ renamed to ‎lib/IOAuth2GrantCode.php‎ b/‎lib/OAuth2/IOAuth2GrantCode.php‎ renamed to ‎lib/IOAuth2GrantCode.php‎
diff --git a/‎lib/OAuth2/IOAuth2GrantExtension.php‎ renamed to ‎lib/IOAuth2GrantExtension.php‎ b/‎lib/OAuth2/IOAuth2GrantExtension.php‎ renamed to ‎lib/IOAuth2GrantExtension.php‎
diff --git a/‎lib/OAuth2/IOAuth2GrantImplicit.php‎ renamed to ‎lib/IOAuth2GrantImplicit.php‎ b/‎lib/OAuth2/IOAuth2GrantImplicit.php‎ renamed to ‎lib/IOAuth2GrantImplicit.php‎
diff --git a/‎lib/OAuth2/IOAuth2GrantUser.php‎ renamed to ‎lib/IOAuth2GrantUser.php‎ b/‎lib/OAuth2/IOAuth2GrantUser.php‎ renamed to ‎lib/IOAuth2GrantUser.php‎
diff --git a/‎lib/OAuth2/IOAuth2RefreshTokens.php‎ renamed to ‎lib/IOAuth2RefreshTokens.php‎ b/‎lib/OAuth2/IOAuth2RefreshTokens.php‎ renamed to ‎lib/IOAuth2RefreshTokens.php‎
diff --git a/‎lib/OAuth2/IOAuth2Storage.php‎ renamed to ‎lib/IOAuth2Storage.php‎ b/‎lib/OAuth2/IOAuth2Storage.php‎ renamed to ‎lib/IOAuth2Storage.php‎
@@ -4,12 +4,12 @@ php:
     - 5.3
     - 5.4
     - 5.5
+    - 5.6
     - hhvm
 
-matrix:
-    allow_failures:
-        - php: hhvm
-
 before_script:
     - curl -s http://getcomposer.org/installer | php
     - php composer.phar --dev install
+
+script:
+    - vendor/bin/phpunit
@@ -2,6 +2,7 @@ OAuth2 Server Implementation
 ============================
 
 [![Build Status](https://secure.travis-ci.org/FriendsOfSymfony/oauth2-php.png?branch=master)](http://travis-ci.org/FriendsOfSymfony/oauth2-php)
+[![HHVM Status](http://hhvm.h4cc.de/badge/FriendsOfSymfony/oauth2-php.svg)](http://hhvm.h4cc.de/package/FriendsOfSymfony/oauth2-php)
 
 This library now implements draft 20 of OAuth 2.0.
 The client is still only draft-10.
@@ -10,7 +11,7 @@ This version of oauth2-php is a fork of https://github.com/quizlet/oauth2-php wi
 
  - Namespaced
  - No more require(_once)
- - [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) autoloading compatible
+ - [PSR-4](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md) autoloading compatible
  - Uses [HttpFoundation](https://github.com/symfony/HttpFoundation) Request and Response for input/output
  - More testable design
  - Better test coverage
 
@@ -19,8 +19,14 @@
         "php": ">=5.3.2",
         "symfony/http-foundation": "~2.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
+    },
     "autoload": {
-        "psr-0": { "OAuth2": "lib/" }
+        "psr-4": { "OAuth2\\": "lib/" }
+    },
+    "autoload-dev": {
+        "psr-4": { "OAuth2\\Tests\\": "tests/" }
     },
     "extra": {
         "branch-alias": {