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 ?>,
 

views/rule/index.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
                 'attribute' => 'name',
                 'label' => Yii::t('rbac-admin', 'Name'),
             ],
-            ['class' => 'yii\grid\ActionColumn',],
+            ['class' => 'yii\grid\ActionColumn', ],
         ],
     ]);
     ?>

views/layouts/main.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         echo Nav::widget([
             'options' => ['class' => 'nav navbar-nav navbar-right'],
             'items' => $this->context->module->navbar,
-         ]);
+            ]);
         NavBar::end();
         ?>
 

models/AuthItem.php

Doc Comments +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
     /**
      * Find role
      * @param string $id
-     * @return null|\self
+     * @return AuthItem|null
      */
     public static function find($id)
     {

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         return [
             [['ruleName'], 'checkRule'],
             [['name', 'type'], 'required'],
-            [['name'], 'unique', 'when' => function () {
+            [['name'], 'unique', 'when' => function() {
                 return $this->isNewRecord || ($this->_item->name != $this->name);
             }],
             [['type'], 'integer'],

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();
     }
 
     /**

components/ItemController.php

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
      */
     public function getViewPath()
     {
-        return $this->module->getViewPath() . DIRECTORY_SEPARATOR . 'item';
+        return $this->module->getViewPath().DIRECTORY_SEPARATOR.'item';
     }
 
     /**
@@ -158,7 +158,7 @@ 
      */
     public function labels()
     {
-        throw new NotSupportedException(get_class($this) . ' does not support labels().');
+        throw new NotSupportedException(get_class($this).' does not support labels().');
     }
 
     /**

Doc Comments +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
 
     /**
      * Lists all AuthItem models.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -58,7 +58,7 @@ 
     /**
      * Displays a single AuthItem model.
      * @param  string $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -103,7 +103,7 @@ 
      * Deletes an existing AuthItem model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param  string $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

components/Helper.php

Spacing +7 added lines, -7 removed lines

@@ -120,7 +120,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if ($user->can($r . '/*', $params)) {
+                if ($user->can($r.'/*', $params)) {
                     return true;
                 }
             }
@@ -132,7 +132,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if (isset($routes[$r . '/*'])) {
+                if (isset($routes[$r.'/*'])) {
                     return true;
                 }
             }
@@ -143,15 +143,15 @@ 
     protected static function normalizeRoute($route)
     {
         if ($route === '') {
-            return '/' . Yii::$app->controller->getRoute();
+            return '/'.Yii::$app->controller->getRoute();
         } elseif (strncmp($route, '/', 1) === 0) {
             return $route;
         } elseif (strpos($route, '/') === false) {
-            return '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
+            return '/'.Yii::$app->controller->getUniqueId().'/'.$route;
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
-            return '/' . $mid . '/' . $route;
+            return '/'.$mid.'/'.$route;
         }
-        return '/' . $route;
+        return '/'.$route;
     }
 
     /**
@@ -220,7 +220,7 @@ 
             }
             return implode(' ', $result);
         }
-        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) {
+        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) {
             return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : '';
         }, $buttons);
     }

views/user/view.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-$controllerId = $this->context->uniqueId . '/';
+$controllerId = $this->context->uniqueId.'/';
 ?>
 <div class="user-view">
 
@@ -19,7 +19,7 @@ 
 
     <p>
         <?php
-        if ($model->status == 0 && Helper::checkRoute($controllerId . 'activate')) {
+        if ($model->status == 0 && Helper::checkRoute($controllerId.'activate')) {
             echo Html::a(Yii::t('rbac-admin', 'Activate'), ['activate', 'id' => $model->id], [
                 'class' => 'btn btn-primary',
                 'data' => [
@@ -30,7 +30,7 @@ 
         }
         ?>
         <?php
-        if (Helper::checkRoute($controllerId . 'delete')) {
+        if (Helper::checkRoute($controllerId.'delete')) {
             echo Html::a(Yii::t('rbac-admin', 'Delete'), ['delete', 'id' => $model->id], [
                 'class' => 'btn btn-danger',
                 'data' => [