PSR-0 to PSR-4 Autoloading

* PSR-0 => PSR-4 * PHP 5.6 tests added * PHPUnit 4.x used instead of the version used by Travis-CI * HHVM test badge added
FriendsOfSymfony · Oct 31, 2014 · a1ff312 · a1ff312
1 parent d81337e
commit a1ff312
Show file tree

Hide file tree

Showing 33 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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
diff --git a/README.md b/README.md
@@ -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

diff --git a/composer.json b/composer.json
@@ -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": {

diff --git a/lib/OAuth2/IOAuth2GrantClient.php → lib/IOAuth2GrantClient.php b/lib/OAuth2/IOAuth2GrantClient.php → lib/IOAuth2GrantClient.php
diff --git a/lib/OAuth2/IOAuth2GrantCode.php → lib/IOAuth2GrantCode.php b/lib/OAuth2/IOAuth2GrantCode.php → lib/IOAuth2GrantCode.php
diff --git a/lib/OAuth2/IOAuth2GrantExtension.php → lib/IOAuth2GrantExtension.php b/lib/OAuth2/IOAuth2GrantExtension.php → lib/IOAuth2GrantExtension.php
diff --git a/lib/OAuth2/IOAuth2GrantImplicit.php → lib/IOAuth2GrantImplicit.php b/lib/OAuth2/IOAuth2GrantImplicit.php → lib/IOAuth2GrantImplicit.php
diff --git a/lib/OAuth2/IOAuth2GrantUser.php → lib/IOAuth2GrantUser.php b/lib/OAuth2/IOAuth2GrantUser.php → lib/IOAuth2GrantUser.php
diff --git a/lib/OAuth2/IOAuth2RefreshTokens.php → lib/IOAuth2RefreshTokens.php b/lib/OAuth2/IOAuth2RefreshTokens.php → lib/IOAuth2RefreshTokens.php
diff --git a/lib/OAuth2/IOAuth2Storage.php → lib/IOAuth2Storage.php b/lib/OAuth2/IOAuth2Storage.php → lib/IOAuth2Storage.php
diff --git a/lib/OAuth2/Model/IOAuth2AccessToken.php → lib/Model/IOAuth2AccessToken.php b/lib/OAuth2/Model/IOAuth2AccessToken.php → lib/Model/IOAuth2AccessToken.php
diff --git a/lib/OAuth2/Model/IOAuth2AuthCode.php → lib/Model/IOAuth2AuthCode.php b/lib/OAuth2/Model/IOAuth2AuthCode.php → lib/Model/IOAuth2AuthCode.php
diff --git a/lib/OAuth2/Model/IOAuth2Client.php → lib/Model/IOAuth2Client.php b/lib/OAuth2/Model/IOAuth2Client.php → lib/Model/IOAuth2Client.php
diff --git a/lib/OAuth2/Model/IOAuth2RefreshToken.php → lib/Model/IOAuth2RefreshToken.php b/lib/OAuth2/Model/IOAuth2RefreshToken.php → lib/Model/IOAuth2RefreshToken.php
diff --git a/lib/OAuth2/Model/IOAuth2Token.php → lib/Model/IOAuth2Token.php b/lib/OAuth2/Model/IOAuth2Token.php → lib/Model/IOAuth2Token.php
diff --git a/lib/OAuth2/Model/OAuth2AccessToken.php → lib/Model/OAuth2AccessToken.php b/lib/OAuth2/Model/OAuth2AccessToken.php → lib/Model/OAuth2AccessToken.php
diff --git a/lib/OAuth2/Model/OAuth2AuthCode.php → lib/Model/OAuth2AuthCode.php b/lib/OAuth2/Model/OAuth2AuthCode.php → lib/Model/OAuth2AuthCode.php
diff --git a/lib/OAuth2/Model/OAuth2Client.php → lib/Model/OAuth2Client.php b/lib/OAuth2/Model/OAuth2Client.php → lib/Model/OAuth2Client.php
diff --git a/lib/OAuth2/Model/OAuth2RefreshToken.php → lib/Model/OAuth2RefreshToken.php b/lib/OAuth2/Model/OAuth2RefreshToken.php → lib/Model/OAuth2RefreshToken.php
diff --git a/lib/OAuth2/Model/OAuth2Token.php → lib/Model/OAuth2Token.php b/lib/OAuth2/Model/OAuth2Token.php → lib/Model/OAuth2Token.php
diff --git a/lib/OAuth2/OAuth2.php → lib/OAuth2.php b/lib/OAuth2/OAuth2.php → lib/OAuth2.php
diff --git a/lib/OAuth2/OAuth2AuthenticateException.php → lib/OAuth2AuthenticateException.php b/lib/OAuth2/OAuth2AuthenticateException.php → lib/OAuth2AuthenticateException.php
diff --git a/lib/OAuth2/OAuth2Client.php → lib/OAuth2Client.php b/lib/OAuth2/OAuth2Client.php → lib/OAuth2Client.php
diff --git a/lib/OAuth2/OAuth2Exception.php → lib/OAuth2Exception.php b/lib/OAuth2/OAuth2Exception.php → lib/OAuth2Exception.php
diff --git a/lib/OAuth2/OAuth2RedirectException.php → lib/OAuth2RedirectException.php b/lib/OAuth2/OAuth2RedirectException.php → lib/OAuth2RedirectException.php
diff --git a/lib/OAuth2/OAuth2ServerException.php → lib/OAuth2ServerException.php b/lib/OAuth2/OAuth2ServerException.php → lib/OAuth2ServerException.php
diff --git a/...h2/Tests/Fixtures/OAuth2GrantCodeStub.php → tests/Fixtures/OAuth2GrantCodeStub.php b/...h2/Tests/Fixtures/OAuth2GrantCodeStub.php → tests/Fixtures/OAuth2GrantCodeStub.php
diff --git a/...ures/OAuth2GrantExtensionLifetimeStub.php → ...ures/OAuth2GrantExtensionLifetimeStub.php b/...ures/OAuth2GrantExtensionLifetimeStub.php → ...ures/OAuth2GrantExtensionLifetimeStub.php
diff --git a/...sts/Fixtures/OAuth2GrantExtensionStub.php → tests/Fixtures/OAuth2GrantExtensionStub.php b/...sts/Fixtures/OAuth2GrantExtensionStub.php → tests/Fixtures/OAuth2GrantExtensionStub.php
diff --git a/...h2/Tests/Fixtures/OAuth2GrantUserStub.php → tests/Fixtures/OAuth2GrantUserStub.php b/...h2/Tests/Fixtures/OAuth2GrantUserStub.php → tests/Fixtures/OAuth2GrantUserStub.php
diff --git a/...uth2/Tests/Fixtures/OAuth2StorageStub.php → tests/Fixtures/OAuth2StorageStub.php b/...uth2/Tests/Fixtures/OAuth2StorageStub.php → tests/Fixtures/OAuth2StorageStub.php
diff --git a/tests/OAuth2/Tests/Model/OAuth2TokenTest.php → tests/Model/OAuth2TokenTest.php b/tests/OAuth2/Tests/Model/OAuth2TokenTest.php → tests/Model/OAuth2TokenTest.php
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,4 +1,3 @@
 <?php
 
 $loader = require __DIR__ . '/../vendor/autoload.php';
-$loader->add('OAuth2', __DIR__);