@@ -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 | /** |
@@ -54,7 +54,7 @@ |
||
54 | 54 | |
55 | 55 | /** |
56 | 56 | * @inheritdoc |
57 | - * @return Provider|null |
|
57 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
58 | 58 | */ |
59 | 59 | protected function find($id) |
60 | 60 | { |
@@ -7,7 +7,6 @@ |
||
7 | 7 | use flipbox\craft\assets\circleicon\CircleIcon; |
8 | 8 | use flipbox\patron\helpers\ProviderHelper; |
9 | 9 | use flipbox\patron\records\Provider; |
10 | -use flipbox\patron\settings\BaseSettings; |
|
11 | 10 | use flipbox\patron\web\assets\providers\ProvidersAsset; |
12 | 11 | |
13 | 12 | class DefaultController extends AbstractViewController |
@@ -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; |
@@ -65,7 +65,6 @@ |
||
65 | 65 | |
66 | 66 | /** |
67 | 67 | * @param array $config |
68 | - * @param bool $checkSettings |
|
69 | 68 | * @return mixed |
70 | 69 | * @throws \yii\base\InvalidConfigException |
71 | 70 | */ |
@@ -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; |
@@ -16,7 +17,6 @@ discard block |
||
16 | 17 | use flipbox\craft\ember\queries\AuditAttributesTrait; |
17 | 18 | use flipbox\patron\Patron; |
18 | 19 | use flipbox\patron\records\Provider; |
19 | -use League\OAuth2\Client\Provider\AbstractProvider; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * @author Flipbox Factory <[email protected]> |
@@ -8,11 +8,11 @@ |
||
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\records\Provider as ProviderRecord; |
14 | 15 | use flipbox\patron\records\Token; |
15 | -use League\OAuth2\Client\Provider\AbstractProvider; |
|
16 | 16 | use yii\db\Query; |
17 | 17 | |
18 | 18 | /** |
@@ -50,7 +50,7 @@ |
||
50 | 50 | |
51 | 51 | /** |
52 | 52 | * @param null $db |
53 | - * @return array|AccessToken|null |
|
53 | + * @return null|AccessToken |
|
54 | 54 | * @throws \Exception |
55 | 55 | */ |
56 | 56 | public function one($db = null) |
@@ -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]> |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | - * @return Provider|null |
|
120 | + * @return null|ActiveQueryInterface |
|
121 | 121 | */ |
122 | 122 | private function resolveProviderFromRelation() |
123 | 123 | { |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
137 | - * @return Provider|null |
|
137 | + * @return null|\flipbox\craft\ember\records\ActiveRecord |
|
138 | 138 | */ |
139 | 139 | private function resolveProviderFromId() |
140 | 140 | { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | |
148 | 148 | /** |
149 | 149 | * @param $provider |
150 | - * @return Provider|null |
|
150 | + * @return \flipbox\craft\ember\records\ActiveRecord|null |
|
151 | 151 | */ |
152 | 152 | protected function internalResolveProvider($provider = null) |
153 | 153 | { |