Revert "Phalcon travis ci config (#1)"

This reverts commit f18eb47.

.travis.yml

@@ -4,7 +4,6 @@ cache:
   directories:
     - $HOME/.composer/cache
     - vendor
-    - $HOME/cphalcon
 php:
 - 5.3
 - 5.4
@@ -21,16 +20,11 @@ services:
 - mongodb
 - redis-server
 - cassandra
-- mysql
-- memcached
 before_install:
-  - composer install --prefer-source --no-interaction
-  - vendor/bin/install-phalcon.sh
-  - phpenv config-rm xdebug.ini || return 0
+- 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,7 +28,6 @@
         "aws/aws-sdk-php": "~2.8",
         "firebase/php-jwt": "~2.2",
         "predis/predis": "dev-master",
-        "thobbs/phpcassa": "dev-master",
-        "techpivot/phalcon-ci-installer": "~1.0"
+        "thobbs/phpcassa": "dev-master"
     }
 }

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

@@ -61,7 +61,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth_access_tokens'");
+        $this->setSource("'oauth__access_tokens'");
         $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 +73,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth_access_tokens';
+        return 'oauth__access_tokens';
     }
 
     /**

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

@@ -54,7 +54,7 @@ class OauthAuthorizationCodes extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth_authorization_codes';
+        return 'oauth__authorization_codes';
     }
 
     /**

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

@@ -68,7 +68,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth_clients'");
+        $this->setSource("'oauth__clients'");
         $this->belongsTo('user_id', 'OAuth2\Storage\Phalcon\Models\OauthUsers', 'username', array("alias" => "User"));
     }
 
@@ -79,7 +79,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth_clients';
+        return 'oauth__clients';
     }
 
     /**

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

@@ -42,7 +42,7 @@ class OauthJti extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth_jti';
+        return 'oauth__jti';
     }
 
     /**

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

@@ -50,7 +50,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth_jwt'");
+        $this->setSource("'oauth__jwt'");
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id', array("alias" => "Client"));
     }
 
@@ -61,7 +61,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth_jwt';
+        return 'oauth__jwt';
     }
 
     public function getClient($parameters = null)

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

@@ -56,7 +56,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth_public_keys'");
+        $this->setSource("'oauth__public_keys'");
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id', array("alias" => "Client"));
     }
 
@@ -67,7 +67,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth_public_keys';
+        return 'oauth__public_keys';
     }
 
     public function getClient($parameters = null)

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

@@ -61,7 +61,7 @@ public static function findFirst($parameters = null)
      */
     public function initialize()
     {
-        $this->setSource("'oauth_refresh_tokens'");
+        $this->setSource("'oauth__refresh_tokens'");
         $this->belongsTo('user_id', 'OAuth2\Storage\Phalcon\Models\OauthUsers', 'username');
         $this->belongsTo('client_id', 'OAuth2\Storage\Phalcon\Models\OauthClients', 'client_id');
     }
@@ -73,7 +73,7 @@ public function initialize()
      */
     public function getSource()
     {
-        return 'oauth_refresh_tokens';
+        return 'oauth__refresh_tokens';
     }
 
 }

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

@@ -24,7 +24,7 @@ class OauthScopes extends \Phalcon\Mvc\Model
      */
     public function getSource()
     {
-        return 'oauth_scopes';
+        return 'oauth__scopes';
     }
 
     /**

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

@@ -77,7 +77,7 @@ public static function findFirst($parameters = null)
     public function initialize()
     {
         $this->keepSnapshots(true);
-        $this->setSource("'oauth_users'");
+        $this->setSource("'oauth__users'");
         $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 +112,7 @@ public function validation()
      */
     public function getSource()
     {
-        return 'oauth_users';
+        return 'oauth__users';
     }
 
     /**

src/OAuth2/Storage/Phalcon/Phalcon.php

@@ -43,9 +43,6 @@ class Phalcon implements
      */
     public function __construct($di, $config = array())
     {
-        if(!isset($di['db']))
-            throw new \InvalidArgumentException('Dependency injector must contain a valid database connection');
-
         $this->di = $di;
         $this->config = array_merge(array(
             'client_table' => 'oauth_clients',

test/OAuth2/AutoloadTest.php

@@ -12,7 +12,5 @@ public function testClassesExist()
         $this->assertTrue(class_exists('OAuth2\Response'));
         $this->assertTrue(class_exists('OAuth2\GrantType\UserCredentials'));
         $this->assertTrue(interface_exists('OAuth2\Storage\AccessTokenInterface'));
-        $this->assertTrue(class_exists('OAuth2\Storage\Phalcon\Phalcon'));
-        $this->assertTrue(class_exists('OAuth2\Storage\Phalcon\Models\OauthUsers'));
     }
 }

test/OAuth2/Storage/PhalconTest.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: lucas
+ * Date: 7/1/2016
+ * Time: 2:08 PM
+ */
+
+namespace OAuth2\Storage;
+
+
+class PhalconTest extends BaseTest
+{
+
+}