@@ -12,20 +12,16 @@ |
||
| 12 | 12 | use craft\base\PluginInterface; |
| 13 | 13 | use craft\db\Query; |
| 14 | 14 | use craft\helpers\StringHelper; |
| 15 | -use craft\helpers\Template; |
|
| 16 | 15 | use flipbox\ember\helpers\ModelHelper; |
| 17 | 16 | use flipbox\ember\helpers\ObjectHelper; |
| 18 | 17 | use flipbox\ember\helpers\QueryHelper; |
| 19 | 18 | use flipbox\ember\records\ActiveRecordWithId; |
| 20 | 19 | use flipbox\ember\records\traits\StateAttribute; |
| 21 | 20 | use flipbox\ember\traits\HandleRules; |
| 21 | +use flipbox\patron\Patron; |
|
| 22 | 22 | use flipbox\patron\db\ProviderActiveQuery; |
| 23 | 23 | use flipbox\patron\helpers\ProviderHelper; |
| 24 | -use flipbox\patron\Patron; |
|
| 25 | -use flipbox\patron\providers\SettingsInterface; |
|
| 26 | 24 | use flipbox\patron\validators\ProviderValidator; |
| 27 | -use Twig_Markup; |
|
| 28 | -use yii\base\InvalidArgumentException; |
|
| 29 | 25 | use yii\helpers\ArrayHelper; |
| 30 | 26 | |
| 31 | 27 | /** |
@@ -14,11 +14,10 @@ |
||
| 14 | 14 | use flipbox\ember\helpers\ObjectHelper; |
| 15 | 15 | use flipbox\ember\helpers\QueryHelper; |
| 16 | 16 | use flipbox\ember\records\ActiveRecordWithId; |
| 17 | -use flipbox\patron\helpers\ProviderHelper; |
|
| 18 | 17 | use flipbox\patron\Patron; |
| 18 | +use flipbox\patron\helpers\ProviderHelper; |
|
| 19 | 19 | use flipbox\patron\providers\SettingsInterface; |
| 20 | 20 | use flipbox\patron\validators\ProviderSettings as ProviderSettingsValidator; |
| 21 | -use yii\base\InvalidArgumentException; |
|
| 22 | 21 | |
| 23 | 22 | /** |
| 24 | 23 | * @author Flipbox Factory <[email protected]> |
@@ -9,18 +9,16 @@ |
||
| 9 | 9 | namespace flipbox\patron\records; |
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | +use DateTime; |
|
| 12 | 13 | use craft\helpers\ArrayHelper; |
| 13 | 14 | use craft\helpers\DateTimeHelper; |
| 14 | 15 | use craft\validators\DateTimeValidator; |
| 15 | -use DateTime; |
|
| 16 | 16 | use flipbox\ember\helpers\ModelHelper; |
| 17 | 17 | use flipbox\ember\helpers\ObjectHelper; |
| 18 | 18 | use flipbox\ember\helpers\QueryHelper; |
| 19 | 19 | use flipbox\ember\records\ActiveRecordWithId; |
| 20 | 20 | use flipbox\ember\records\traits\StateAttribute; |
| 21 | 21 | use flipbox\patron\db\TokenActiveQuery; |
| 22 | -use flipbox\patron\Patron; |
|
| 23 | -use yii\db\ActiveQueryInterface; |
|
| 24 | 22 | |
| 25 | 23 | /** |
| 26 | 24 | * @author Flipbox Factory <[email protected]> |
@@ -9,19 +9,18 @@ |
||
| 9 | 9 | namespace flipbox\patron\services; |
| 10 | 10 | |
| 11 | 11 | use Craft; |
| 12 | +use League\OAuth2\Client\Provider\AbstractProvider; |
|
| 12 | 13 | use craft\db\Query; |
| 13 | 14 | use craft\helpers\ArrayHelper; |
| 14 | 15 | use craft\helpers\Json; |
| 15 | 16 | use flipbox\ember\helpers\ObjectHelper; |
| 16 | 17 | use flipbox\ember\services\traits\objects\AccessorByString; |
| 18 | +use flipbox\patron\Patron; |
|
| 17 | 19 | use flipbox\patron\db\ProviderQuery; |
| 18 | 20 | use flipbox\patron\helpers\ProviderHelper; |
| 19 | -use flipbox\patron\Patron; |
|
| 20 | 21 | use flipbox\patron\providers\SettingsInterface; |
| 21 | -use flipbox\patron\records\Provider; |
|
| 22 | 22 | use flipbox\patron\records\Provider as ProviderRecord; |
| 23 | 23 | use flipbox\patron\records\ProviderInstance; |
| 24 | -use League\OAuth2\Client\Provider\AbstractProvider; |
|
| 25 | 24 | use yii\base\Component; |
| 26 | 25 | use yii\db\QueryInterface; |
| 27 | 26 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | /** |
| 121 | 121 | * @param string $providerClass |
| 122 | - * @return mixed |
|
| 122 | + * @return string |
|
| 123 | 123 | */ |
| 124 | 124 | protected function resolveSettingsClass(string $providerClass = null): string |
| 125 | 125 | { |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | /** |
| 146 | 146 | * Check settings instance |
| 147 | 147 | * |
| 148 | - * @param $class |
|
| 148 | + * @param string $class |
|
| 149 | 149 | * @return bool |
| 150 | 150 | */ |
| 151 | 151 | private function isSettingsInstance($class): bool |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | /** |
| 157 | - * @param $providerClass |
|
| 157 | + * @param string $providerClass |
|
| 158 | 158 | * @param array $settings |
| 159 | 159 | * @return SettingsInterface |
| 160 | 160 | * @throws InvalidConfigException |
@@ -8,17 +8,17 @@ |
||
| 8 | 8 | |
| 9 | 9 | namespace flipbox\patron\services; |
| 10 | 10 | |
| 11 | +use Flipbox\OAuth2\Client\Provider\Guardian as GuardianProvider; |
|
| 12 | +use League\OAuth2\Client\Provider\Facebook as FacebookProvider; |
|
| 11 | 13 | use craft\helpers\ArrayHelper; |
| 12 | 14 | use craft\helpers\Json; |
| 13 | 15 | use flipbox\ember\helpers\ModelHelper; |
| 14 | -use Flipbox\OAuth2\Client\Provider\Guardian as GuardianProvider; |
|
| 15 | 16 | use flipbox\patron\events\RegisterProviderSettings; |
| 16 | 17 | use flipbox\patron\providers\Base; |
| 17 | 18 | use flipbox\patron\providers\Facebook as FacebookSettings; |
| 18 | 19 | use flipbox\patron\providers\Guardian as GuardianSettings; |
| 19 | 20 | use flipbox\patron\providers\SettingsInterface; |
| 20 | 21 | use flipbox\patron\records\Provider; |
| 21 | -use League\OAuth2\Client\Provider\Facebook as FacebookProvider; |
|
| 22 | 22 | use yii\base\Component; |
| 23 | 23 | use yii\base\InvalidConfigException; |
| 24 | 24 | |