| @@ -4,8 +4,8 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Craft; | 
| 6 | 6 | use craft\helpers\UrlHelper; | 
| 7 | -use flipbox\patron\cp\Cp; | |
| 8 | 7 | use flipbox\patron\Patron; | 
| 8 | +use flipbox\patron\cp\Cp; | |
| 9 | 9 | use flipbox\patron\records\Provider; | 
| 10 | 10 | |
| 11 | 11 | /** | 
| @@ -117,7 +117,7 @@ | ||
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 | /** | 
| 120 | - * @return Provider|null | |
| 120 | + * @return null|ActiveQueryInterface | |
| 121 | 121 | */ | 
| 122 | 122 | private function resolveProviderFromRelation() | 
| 123 | 123 |      { | 
| @@ -15,13 +15,13 @@ | ||
| 15 | 15 | use craft\helpers\Json; | 
| 16 | 16 | use craft\helpers\UrlHelper; | 
| 17 | 17 | use craft\services\ProjectConfig; | 
| 18 | -use craft\web\twig\variables\CraftVariable; | |
| 19 | 18 | use craft\web\UrlManager; | 
| 19 | +use craft\web\twig\variables\CraftVariable; | |
| 20 | 20 | use flipbox\craft\ember\helpers\ObjectHelper; | 
| 21 | 21 | use flipbox\craft\ember\helpers\QueryHelper; | 
| 22 | 22 | use flipbox\craft\ember\modules\LoggerTrait; | 
| 23 | -use flipbox\patron\events\handlers\ProjectConfigHandler; | |
| 24 | 23 | use flipbox\patron\events\RegisterProviderSettings; | 
| 24 | +use flipbox\patron\events\handlers\ProjectConfigHandler; | |
| 25 | 25 | use flipbox\patron\models\Settings as SettingsModel; | 
| 26 | 26 | use flipbox\patron\queries\ProviderQuery; | 
| 27 | 27 | use flipbox\patron\queries\TokenQuery; | 
| @@ -8,6 +8,7 @@ discard block | ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\patron\queries; | 
| 10 | 10 | |
| 11 | +use League\OAuth2\Client\Token\AccessToken; | |
| 11 | 12 | use craft\db\Query; | 
| 12 | 13 | use craft\helpers\ArrayHelper; | 
| 13 | 14 | use craft\helpers\DateTimeHelper; | 
| @@ -15,7 +16,6 @@ discard block | ||
| 15 | 16 | use flipbox\craft\ember\queries\AuditAttributesTrait; | 
| 16 | 17 | use flipbox\craft\ember\queries\PopulateObjectTrait; | 
| 17 | 18 | use flipbox\patron\records\Token; | 
| 18 | -use League\OAuth2\Client\Token\AccessToken; | |
| 19 | 19 | |
| 20 | 20 | /** | 
| 21 | 21 | * @author Flipbox Factory <[email protected]> | 
| @@ -3,10 +3,10 @@ | ||
| 3 | 3 | namespace flipbox\patron\cp\controllers\view\providers; | 
| 4 | 4 | |
| 5 | 5 | use Craft; | 
| 6 | -use flipbox\patron\web\assets\card\Card; | |
| 7 | -use flipbox\patron\web\assets\circleIcon\CircleIcon; | |
| 8 | 6 | use flipbox\patron\helpers\ProviderHelper; | 
| 9 | 7 | use flipbox\patron\records\Provider; | 
| 8 | +use flipbox\patron\web\assets\card\Card; | |
| 9 | +use flipbox\patron\web\assets\circleIcon\CircleIcon; | |
| 10 | 10 | use flipbox\patron\web\assets\providers\ProvidersAsset; | 
| 11 | 11 | |
| 12 | 12 | class DefaultController extends AbstractViewController | 
| @@ -8,6 +8,7 @@ discard block | ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\patron\queries; | 
| 10 | 10 | |
| 11 | +use League\OAuth2\Client\Provider\AbstractProvider; | |
| 11 | 12 | use craft\db\Query; | 
| 12 | 13 | use craft\db\QueryAbortedException; | 
| 13 | 14 | use craft\helpers\ArrayHelper; | 
| @@ -17,7 +18,6 @@ discard block | ||
| 17 | 18 | use flipbox\craft\ember\queries\PopulateObjectTrait; | 
| 18 | 19 | use flipbox\patron\Patron; | 
| 19 | 20 | use flipbox\patron\records\Provider; | 
| 20 | -use League\OAuth2\Client\Provider\AbstractProvider; | |
| 21 | 21 | |
| 22 | 22 | /** | 
| 23 | 23 | * @author Flipbox Factory <[email protected]> | 
| @@ -8,13 +8,13 @@ | ||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\patron\queries; | 
| 10 | 10 | |
| 11 | +use League\OAuth2\Client\Provider\AbstractProvider; | |
| 11 | 12 | use craft\db\QueryAbortedException; | 
| 12 | 13 | use craft\helpers\Db; | 
| 13 | 14 | use flipbox\craft\ember\helpers\QueryHelper; | 
| 14 | 15 | use flipbox\patron\helpers\ProviderHelper; | 
| 15 | 16 | use flipbox\patron\records\Provider as ProviderRecord; | 
| 16 | 17 | use flipbox\patron\records\Token; | 
| 17 | -use League\OAuth2\Client\Provider\AbstractProvider; | |
| 18 | 18 | use yii\db\Query; | 
| 19 | 19 | |
| 20 | 20 | /** | 
| @@ -9,9 +9,9 @@ | ||
| 9 | 9 | namespace flipbox\patron\records; | 
| 10 | 10 | |
| 11 | 11 | use Craft; | 
| 12 | +use DateTime; | |
| 12 | 13 | use craft\helpers\DateTimeHelper; | 
| 13 | 14 | use craft\validators\DateTimeValidator; | 
| 14 | -use DateTime; | |
| 15 | 15 | use flipbox\craft\ember\helpers\ModelHelper; | 
| 16 | 16 | use flipbox\craft\ember\records\ActiveRecordWithId; | 
| 17 | 17 | use flipbox\craft\ember\records\StateAttributeTrait; | 
| @@ -9,8 +9,8 @@ | ||
| 9 | 9 | namespace flipbox\patron\settings; | 
| 10 | 10 | |
| 11 | 11 | use Craft; | 
| 12 | -use flipbox\craft\ember\helpers\ModelHelper; | |
| 13 | 12 | use League\OAuth2\Client\Provider\Facebook; | 
| 13 | +use flipbox\craft\ember\helpers\ModelHelper; | |
| 14 | 14 | |
| 15 | 15 | /** | 
| 16 | 16 | * @author Flipbox Factory <[email protected]> |