Phalcon storage

.travis.yml

@@ -4,13 +4,12 @@ cache:
   directories:
     - $HOME/.composer/cache
     - vendor
+    - $HOME/cphalcon
 php:
 - 5.3
 - 5.4
 - 5.5
 - 5.6
-- 7
-- hhvm
 env:
   global:
   - SKIP_MONGO_TESTS=1
@@ -20,11 +19,16 @@ services:
 - mongodb
 - redis-server
 - cassandra
+- mysql
+- memcached
 before_install:
-- phpenv config-rm xdebug.ini || return 0
+  - composer install --prefer-source --no-interaction
+  - vendor/bin/install-phalcon.sh 2.0.x
+  - phpenv config-rm xdebug.ini || return 0
 install:
 - composer install --no-interaction
 before_script:
+- php -m
 - psql -c 'create database oauth2_server_php;' -U postgres
 after_script:
 - php test/cleanup.php

composer.json

@@ -28,6 +28,7 @@
         "aws/aws-sdk-php": "~2.8",
         "firebase/php-jwt": "~2.2",
         "predis/predis": "dev-master",
-        "thobbs/phpcassa": "dev-master"
+        "thobbs/phpcassa": "dev-master",
+        "techpivot/phalcon-ci-installer": "~1.0"
     }
 }

src/OAuth2/Storage/Phalcon/Models/OauthAccessTokens.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthAccessTokens extends \Phalcon\Mvc\Model
 {
     /**
@@ -61,7 +63,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth__access_tokens'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getAccessTokenTable() . "'");
         $this->belongsTo('user_id', 'OAuth2\Storage\Phalcon\Models\OauthUsers', 'username', array("alias" => "User"));
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id', array("alias" => "Client"));
     }
@@ -73,7 +75,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth__access_tokens';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getAccessTokenTable();
     }
 
     /**

src/OAuth2/Storage/Phalcon/Models/OauthAuthorizationCodes.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthAuthorizationCodes extends \Phalcon\Mvc\Model
 {
 
@@ -54,7 +56,7 @@ class OauthAuthorizationCodes extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth__authorization_codes';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getCodeTable();
     }
 
     /**

src/OAuth2/Storage/Phalcon/Models/OauthClients.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthClients extends \Phalcon\Mvc\Model
 {
 
@@ -68,7 +70,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth__clients'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getClientTable() . "'");
         $this->belongsTo('user_id', 'OAuth2\Storage\Phalcon\Models\OauthUsers', 'username', array("alias" => "User"));
     }
 
@@ -79,7 +81,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth__clients';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getClientTable();
     }
 
     /**

src/OAuth2/Storage/Phalcon/Models/OauthJti.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthJti extends \Phalcon\Mvc\Model
 {
 
@@ -42,7 +44,7 @@ class OauthJti extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth__jti';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getJtiTable();
     }
 
     /**

src/OAuth2/Storage/Phalcon/Models/OauthJwt.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthJwt extends \Phalcon\Mvc\Model
 {
 
@@ -50,7 +52,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth__jwt'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getJwtTable() . "'");
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id', array("alias" => "Client"));
     }
 
@@ -61,9 +63,9 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth__jwt';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getJwtTable();
     }
-    
+
     public function getClient($parameters = null)
     {
         return $this->getRelated('Client', $parameters);

src/OAuth2/Storage/Phalcon/Models/OauthPublicKeys.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthPublicKeys extends \Phalcon\Mvc\Model
 {
 
@@ -56,7 +58,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth__public_keys'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getPublicKeyTable() . "'");
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id', array("alias" => "Client"));
     }
 
@@ -67,9 +69,10 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth__public_keys';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getPublicKeyTable();
     }
 
+
     public function getClient($parameters = null)
     {
         return $this->getRelated('Client', $parameters);

src/OAuth2/Storage/Phalcon/Models/OauthRefreshTokens.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthRefreshTokens extends \Phalcon\Mvc\Model
 {
     /**
@@ -61,7 +63,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth__refresh_tokens'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getRefreshTokenTable() . "'");
         $this->belongsTo('user_id', 'OAuth2\Storage\Phalcon\Models\OauthUsers', 'username');
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id');
     }
@@ -73,7 +75,6 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth__refresh_tokens';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getRefreshTokenTable();
     }
-
 }

src/OAuth2/Storage/Phalcon/Models/OauthScopes.php

@@ -2,6 +2,8 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
+
 class OauthScopes extends \Phalcon\Mvc\Model
 {
 
@@ -24,7 +26,7 @@ class OauthScopes extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth__scopes';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getScopeTable();
     }
 
     /**

src/OAuth2/Storage/Phalcon/Models/OauthUsers.php

@@ -2,6 +2,7 @@
 
 namespace OAuth2\Storage\Phalcon\Models;
 
+use OAuth2\Storage\Phalcon\Phalcon;
 use Phalcon\Mvc\Model\Validator\Email as Email;
 
 class OauthUsers extends \Phalcon\Mvc\Model
@@ -77,7 +78,7 @@ public static function findFirst($parameters = null)
     public function initialize()
     {
         $this->keepSnapshots(true);
-        $this->setSource("'oauth__users'");
+        $this->setSource("'" . $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getUserTable() . "'");
         $this->hasMany('username', 'OAuth2\Storage\Phalcon\Models\OauthAccessTokens', 'user_id', array("alias" => "AccessTokens"));
         $this->hasMany('username', 'OAuth2\Storage\Phalcon\Models\OauthRefreshTokens', 'user_id', array("alias" => "RefreshTokens"));
     }
@@ -112,7 +113,7 @@ public function validation()
      */
     public function getSource()
     {
-        return 'oauth__users';
+        return $this->getDI()->get(Phalcon::KEY_PHALCON_CONFIG_ARRAY)->getUserTable();
     }
 
     /**
@@ -132,5 +133,5 @@ public function getRefreshTokens($parameters = null)
     {
         return $this->getRelated('RefreshTokens', $parameters);
     }
-    
+
 }