update account action and reset password form

Author: igor-chepurnoi

controllers/SiteController.php

@@ -118,17 +118,15 @@ public function actionContact()
      */
     public function actionAccount()
     {
-        $userModel = Yii::$app->user->identity;
-        $resetPasswordForm = new ResetPasswordForm($userModel);
+        $resetPasswordForm = new ResetPasswordForm(Yii::$app->user->identity);
 
         if ($resetPasswordForm->load(Yii::$app->request->post()) && $resetPasswordForm->resetPassword()) {
             Yii::$app->session->setFlash('success', Yii::t('user', 'Password has been updated.'));
             return $this->refresh();
         }
 
         return $this->render('account', [
-            'resetPasswordForm' => $resetPasswordForm,
-            'userModel' => $userModel
+            'resetPasswordForm' => $resetPasswordForm
         ]);
     }
 }

models/forms/ResetPasswordForm.php

@@ -4,7 +4,6 @@
 
 use app\models\UserModel;
 use Yii;
-use yii\base\InvalidConfigException;
 use yii\base\Model;
 
 /**
@@ -14,7 +13,7 @@
 class ResetPasswordForm extends Model
 {
     /**
-     * @var string Password
+     * @var string password
      */
     public $password;
 
@@ -29,19 +28,15 @@ class ResetPasswordForm extends Model
     private $_user;
 
     /**
-     * Construct
+     * ResetPasswordForm constructor.
      *
      * @param UserModel $user
-     * @param  array $config name-value pairs that will be used to initialize the object properties
-     *
-     * @throws InvalidConfigException
+     * @param array $config
      */
-    public function __construct($user, $config = [])
+    public function __construct(UserModel $user, $config = [])
     {
         $this->_user = $user;
-        if (!$this->_user) {
-            throw new InvalidConfigException('UserModel must be set.');
-        }
+
         parent::__construct($config);
     }
 
@@ -77,12 +72,11 @@ public function attributeLabels()
      */
     public function resetPassword()
     {
-        $user = $this->_user;
         if ($this->validate()) {
-            $user->setPassword($this->password);
-            return $user->save(true, ['passwordHash']);
-        } else {
-            return false;
+            $this->_user->setPassword($this->password);
+            return $this->_user->save(true, ['passwordHash']);
         }
+
+        return false;
     }
 }

views/site/account.php

@@ -5,7 +5,6 @@
 use yii\widgets\DetailView;
 
 /* @var $resetPasswordForm \app\models\forms\ResetPasswordForm */
-/* @var $userModel \app\models\UserModel */
 
 $this->title = Yii::t('user', 'My Account');
 ?>
@@ -36,15 +35,15 @@
                 </div>
                 <div class="table-responsive">
                     <?php echo DetailView::widget([
-                        'model' => $userModel,
+                        'model' => Yii::$app->user->identity,
                         'attributes' => [
-                            "username",
-                            "email",
+                            'username',
+                            'email',
                             'lastLogin:date'
                         ],
                     ]); ?>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>