Tidy for ORM only use

README.md

@@ -9,14 +9,7 @@ OAuth2 Doctrine Adapter for Apigility
 About
 -----
 
-This provides the database structure and interaction for all aspects of OAuth2 including Authorization Code, Access Tokens, Refresh Tokens, JWT & JTI, and Scopes.
-
-
-Requirements
-------------
-
-For ORM you will require `doctrine/doctrine-orm-module` through composer.
-ODM is not supported at this time.
+This provides the ORM entity definitions for all aspects of OAuth2 including Authorization Code, Access Tokens, Refresh Tokens, JWT & JTI, and Scopes.
 
 
 Installation
@@ -25,7 +18,7 @@ Installation
 Installation of this module uses composer. For composer documentation, please refer to [getcomposer.org](http://getcomposer.org/).
 
 ```sh
-$ php composer.phar require zfcampus/zf-oauth2-doctrine "~0.1"
+$ php composer.phar require zfcampus/zf-oauth2-doctrine "~0.2"
 ```
 
 Add this module to your application's configuration:

composer.json

@@ -10,12 +10,12 @@
     "require": {
         "php": ">=5.3.23",
         "zfcampus/zf-oauth2": "~1",
-        "doctrine/doctrine-module": "~0.8"
+        "doctrine/doctrine-module": "~0.8",
+        "doctrine/doctrine-orm-module": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",
         "squizlabs/php_codesniffer": "~2",
-        "doctrine/doctrine-orm-module": "*",
         "zendframework/zend-config": "~2.3",
         "zendframework/zend-form": "~2.3",
         "zendframework/zend-loader": "~2.3",

test/ORM/AccessTokenTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\AccessTokenInterface;
 

test/ORM/AuthorizationCodeTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\AuthorizationCodeInterface;
 use OAuth2\Storage\AccessTokenInterface;

test/ORM/BaseTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use Doctrine\ORM\Tools\SchemaTool;
 use ZF\OAuth2\Doctrine\Entity;

test/ORM/ClientCredentialsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\ClientCredentialsInterface;
 

test/ORM/ClientTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\ClientInterface;
 

test/ORM/JwtBearerTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\JwtBearerInterface;
 

test/ORM/PublicKeyTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\PublicKeyInterface;
 

test/ORM/RefreshTokenTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\RefreshTokenInterface;
 

test/ORM/ScopeTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Scope;
 use OAuth2\Storage\ScopeInterface;

test/ORM/UserCredentialsTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ZFTest\OAuth2\Doctrine\Orm;
+namespace ZFTest\OAuth2\Doctrine\ORM;
 
 use OAuth2\Storage\UserCredentialsInterface;