mdmsoft / yii2-admin

mail/passwordResetToken-text.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 /* @var $this yii\web\View */
 /* @var $user mdm\admin\models\User */
 
-$resetLink = Url::to(['user/reset-password','token'=>$user->password_reset_token], true);
+$resetLink = Url::to(['user/reset-password', 'token'=>$user->password_reset_token], true);
 ?>
 Hello <?= $user->username ?>,
 

models/Assignment.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
         foreach ($items as $name) {
             try {
                 $item = $manager->getRole($name);
-                $item = $item ? : $manager->getPermission($name);
+                $item = $item ?: $manager->getPermission($name);
                 $manager->assign($item, $this->id);
                 $success++;
             } catch (\Exception $exc) {
@@ -68,7 +68,7 @@ 
         foreach ($items as $name) {
             try {
                 $item = $manager->getRole($name);
-                $item = $item ? : $manager->getPermission($name);
+                $item = $item ?: $manager->getPermission($name);
                 $manager->revoke($item, $this->id);
                 $success++;
             } catch (\Exception $exc) {

controllers/AssignmentController.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         parent::init();
         if ($this->userClassName === null) {
             $this->userClassName = Yii::$app->getUser()->identityClass;
-            $this->userClassName = $this->userClassName ? : 'mdm\admin\models\User';
+            $this->userClassName = $this->userClassName ?: 'mdm\admin\models\User';
         }
     }
 

controllers/RuleController.php

Spacing +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 
             return $this->redirect(['view', 'id' => $model->name]);
         } else {
-            return $this->render('create', ['model' => $model,]);
+            return $this->render('create', ['model' => $model, ]);
         }
     }
 
@@ -93,7 +93,7 @@ 
             return $this->redirect(['view', 'id' => $model->name]);
         }
 
-        return $this->render('update', ['model' => $model,]);
+        return $this->render('update', ['model' => $model, ]);
     }
 
     /**

views/rule/index.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 'attribute' => 'description',
                 'label' => Yii::t('rbac-admin', 'Description'),
             ],
-            ['class' => 'yii\grid\ActionColumn',],
+            ['class' => 'yii\grid\ActionColumn', ],
         ],
     ])
     ?>

mail/passwordResetToken-html.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 /* @var $this yii\web\View */
 /* @var $user mdm\admin\models\User */
 
-$resetLink = Url::to(['user/reset-password','token'=>$user->password_reset_token], true);
+$resetLink = Url::to(['user/reset-password', 'token'=>$user->password_reset_token], true);
 ?>
 Hello <?= $user->username ?>,
 

models/form/PasswordResetRequest.php

Spacing +2 added lines, -2 removed lines

@@ -49,9 +49,9 @@
 
             if ($user->save()) {
                 return Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user])
-                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name . ' robot'])
+                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name.' robot'])
                     ->setTo($this->email)
-                    ->setSubject('Password reset for ' . Yii::$app->name)
+                    ->setSubject('Password reset for '.Yii::$app->name)
                     ->send();
             }
         }

models/User.php

Spacing +2 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
         }
         $expire = Yii::$app->params['user.passwordResetTokenExpire'];
         $parts = explode('_', $token);
-        $timestamp = (int) end($parts);
+        $timestamp = (int)end($parts);
         return $timestamp + $expire >= time();
     }
 
@@ -179,7 +179,7 @@ 
      */
     public function generatePasswordResetToken()
     {
-        $this->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+        $this->password_reset_token = Yii::$app->security->generateRandomString().'_'.time();
     }
 
     /**

models/searchs/Menu.php

Spacing +3 added lines, -3 removed lines

@@ -44,9 +44,9 @@
     public function search($params)
     {
         $query = MenuModel::find()
-            ->from(MenuModel::tableName() . ' t')
-            ->joinWith(['menuParent' => function ($q) {
-            $q->from(MenuModel::tableName() . ' parent');
+            ->from(MenuModel::tableName().' t')
+            ->joinWith(['menuParent' => function($q) {
+            $q->from(MenuModel::tableName().' parent');
         }]);
 
         $dataProvider = new ActiveDataProvider([