@@ -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 | /** |
@@ -53,7 +53,7 @@ |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
56 | - * @param $id |
|
56 | + * @param integer $id |
|
57 | 57 | * @return $this |
58 | 58 | */ |
59 | 59 | public function id($id) |
@@ -8,17 +8,17 @@ |
||
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; |
14 | 15 | use craft\helpers\Json; |
15 | 16 | use flipbox\craft\ember\helpers\ObjectHelper; |
16 | 17 | use flipbox\craft\ember\queries\AuditAttributesTrait; |
17 | -use flipbox\patron\helpers\ProviderHelper; |
|
18 | 18 | use flipbox\patron\Patron; |
19 | +use flipbox\patron\helpers\ProviderHelper; |
|
19 | 20 | use flipbox\patron\records\Provider; |
20 | 21 | use flipbox\patron\records\ProviderInstance; |
21 | -use League\OAuth2\Client\Provider\AbstractProvider; |
|
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @author Flipbox Factory <[email protected]> |
@@ -8,12 +8,12 @@ |
||
8 | 8 | |
9 | 9 | namespace flipbox\patron\queries; |
10 | 10 | |
11 | +use League\OAuth2\Client\Provider\AbstractProvider; |
|
11 | 12 | use craft\helpers\Db; |
12 | 13 | use flipbox\craft\ember\helpers\QueryHelper; |
13 | 14 | use flipbox\patron\helpers\ProviderHelper; |
14 | 15 | use flipbox\patron\records\Provider as ProviderRecord; |
15 | 16 | use flipbox\patron\records\Token; |
16 | -use League\OAuth2\Client\Provider\AbstractProvider; |
|
17 | 17 | use yii\db\Query; |
18 | 18 | |
19 | 19 | /** |
@@ -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; |
@@ -16,7 +17,6 @@ discard block |
||
16 | 17 | use flipbox\craft\ember\queries\PopulateObjectTrait; |
17 | 18 | use flipbox\patron\Patron; |
18 | 19 | use flipbox\patron\records\Token; |
19 | -use League\OAuth2\Client\Token\AccessToken; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @author Flipbox Factory <[email protected]> |
@@ -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 | { |
@@ -117,7 +117,7 @@ |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | - * @return Token|null |
|
120 | + * @return null|ActiveQueryInterface |
|
121 | 121 | */ |
122 | 122 | private function resolveTokenFromRelation() |
123 | 123 | { |
@@ -3,16 +3,16 @@ |
||
3 | 3 | namespace flipbox\patron\cp; |
4 | 4 | |
5 | 5 | use Craft; |
6 | +use Flipbox\OAuth2\Client\Provider\Guardian; |
|
7 | +use League\OAuth2\Client\Provider\Facebook; |
|
6 | 8 | use craft\events\RegisterTemplateRootsEvent; |
7 | 9 | use craft\web\View; |
8 | -use Flipbox\OAuth2\Client\Provider\Guardian; |
|
10 | +use flipbox\patron\Patron; |
|
9 | 11 | use flipbox\patron\events\RegisterProviderIcons; |
10 | -use flipbox\patron\events\RegisterProviders; |
|
11 | 12 | use flipbox\patron\events\RegisterProviderSettings; |
12 | -use flipbox\patron\Patron; |
|
13 | +use flipbox\patron\events\RegisterProviders; |
|
13 | 14 | use flipbox\patron\settings\FacebookSettings; |
14 | 15 | use flipbox\patron\settings\GuardianSettings; |
15 | -use League\OAuth2\Client\Provider\Facebook; |
|
16 | 16 | use yii\base\Event; |
17 | 17 | use yii\base\Module; |
18 | 18 | use yii\web\NotFoundHttpException; |