From 3115734ef2960f50d88e4ce0ce7c98df84fa8bf7 Mon Sep 17 00:00:00 2001
From: Dmitry Erofeev <dmeroff@gmail.com>
Date: Sun, 27 Mar 2016 20:33:11 +0300
Subject: [PATCH] Refactor Account model

---
 models/Account.php | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/models/Account.php b/models/Account.php
index 0938c01f5..6eef54f7e 100644
--- a/models/Account.php
+++ b/models/Account.php
@@ -14,11 +14,10 @@
 use dektrium\user\clients\ClientInterface;
 use dektrium\user\Finder;
 use dektrium\user\models\query\AccountQuery;
-use dektrium\user\Module;
 use dektrium\user\traits\ModuleTrait;
-use Yii;
 use yii\authclient\ClientInterface as BaseClientInterface;
 use yii\db\ActiveRecord;
+use yii\helpers\Json;
 use yii\helpers\Url;
 
 /**
@@ -75,7 +74,7 @@ public function getIsConnected()
     public function getDecodedData()
     {
         if ($this->_data == null) {
-            $this->_data = json_decode($this->data);
+            $this->_data = Json::decode($this->data);
         }
 
         return $this->_data;
@@ -87,7 +86,7 @@ public function getDecodedData()
      */
     public function getConnectUrl()
     {
-        $code = Yii::$app->security->generateRandomString();
+        $code = \Yii::$app->security->generateRandomString();
         $this->updateAttributes(['code' => md5($code)]);
 
         return Url::to(['/user/registration/connect', 'code' => $code]);
@@ -108,17 +107,17 @@ public function connect(User $user)
      */
     public static function find()
     {
-        return Yii::createObject(AccountQuery::className(), [get_called_class()]);
+        return \Yii::createObject(AccountQuery::className(), [get_called_class()]);
     }
 
     public static function create(BaseClientInterface $client)
     {
         /** @var Account $account */
-        $account = Yii::createObject([
+        $account = \Yii::createObject([
             'class'      => static::className(),
             'provider'   => $client->getId(),
             'client_id'  => $client->getUserAttributes()['id'],
-            'data'       => json_encode($client->getUserAttributes()),
+            'data'       => Json::encode($client->getUserAttributes()),
         ]);
 
         if ($client instanceof ClientInterface) {
@@ -144,8 +143,8 @@ public static function create(BaseClientInterface $client)
      */
     public static function connectWithUser(BaseClientInterface $client)
     {
-        if (Yii::$app->user->isGuest) {
-            Yii::$app->session->setFlash('danger', Yii::t('user', 'Something went wrong'));
+        if (\Yii::$app->user->isGuest) {
+            \Yii::$app->session->setFlash('danger', \Yii::t('user', 'Something went wrong'));
 
             return;
         }
@@ -153,10 +152,10 @@ public static function connectWithUser(BaseClientInterface $client)
         $account = static::fetchAccount($client);
 
         if ($account->user === null) {
-            $account->link('user', Yii::$app->user->identity);
-            Yii::$app->session->setFlash('success', Yii::t('user', 'Your account has been connected'));
+            $account->link('user', \Yii::$app->user->identity);
+            \Yii::$app->session->setFlash('success', \Yii::t('user', 'Your account has been connected'));
         } else {
-            Yii::$app->session->setFlash('danger', Yii::t('user', 'This account has already been connected to another user'));
+            \Yii::$app->session->setFlash('danger', \Yii::t('user', 'This account has already been connected to another user'));
         }
     }
 
@@ -173,11 +172,11 @@ protected static function fetchAccount(BaseClientInterface $client)
         $account = static::getFinder()->findAccount()->byClient($client)->one();
 
         if (null === $account) {
-            $account = Yii::createObject([
+            $account = \Yii::createObject([
                 'class'      => static::className(),
                 'provider'   => $client->getId(),
                 'client_id'  => $client->getUserAttributes()['id'],
-                'data'       => json_encode($client->getUserAttributes()),
+                'data'       => Json::encode($client->getUserAttributes()),
             ]);
             $account->save(false);
         }
@@ -200,7 +199,7 @@ protected static function fetchUser(Account $account)
             return $user;
         }
 
-        $user = Yii::createObject([
+        $user = \Yii::createObject([
             'class'    => User::className(),
             'scenario' => 'connect',
             'username' => $account->username,
@@ -224,7 +223,7 @@ protected static function fetchUser(Account $account)
     protected static function getFinder()
     {
         if (static::$finder === null) {
-            static::$finder = Yii::$container->get(Finder::className());
+            static::$finder = \Yii::$container->get(Finder::className());
         }
 
         return static::$finder;