mdmsoft / yii2-admin

models/form/Signup.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['username', 'filter', 'filter' => 'trim'],
             ['username', 'required'],
@@ -50,7 +50,7 @@ 
     public function signup()
     {
         if ($this->validate()) {
-            $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+            $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
             $user = new $class();
             $user->username = $this->username;
             $user->email = $this->email;

models/form/PasswordResetRequest.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['email', 'filter', 'filter' => 'trim'],
             ['email', 'required'],
@@ -39,7 +39,7 @@ 
     public function sendEmail()
     {
         /* @var $user User */
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         $user = $class::findOne([
             'status' => UserStatus::ACTIVE,
             'email' => $this->email,
@@ -47,14 +47,14 @@ 
 
         if ($user) {
             if (!ResetPassword::isPasswordResetTokenValid($user->password_reset_token)) {
-                $user->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+                $user->password_reset_token = Yii::$app->security->generateRandomString().'_'.time();
             }
 
             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/searchs/User.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function rules()
     {
         return [
-            [['id', 'status',], 'integer'],
+            [['id', 'status', ], 'integer'],
             [['username', 'email'], 'safe'],
         ];
     }
@@ -37,7 +37,7 @@ 
     public function search($params)
     {
         /* @var $query \yii\db\ActiveQuery */
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         $query = $class::find();
 
         $dataProvider = new ActiveDataProvider([

Module.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use mdm\admin\components\Configs;
 use Yii;
-use yii\helpers\Inflector;
 
 /**
  * GUI manager for RBAC.

Spacing +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
     public function getMenus()
     {
         if ($this->_normalizeMenus === null) {
-            $mid = '/' . $this->getUniqueId() . '/';
+            $mid = '/'.$this->getUniqueId().'/';
             // resolve core menus
             $this->_normalizeMenus = [];
 
@@ -132,7 +132,7 @@ 
 
             foreach ($this->_coreItems as $id => $lable) {
                 if (!isset($conditions[$id]) || $conditions[$id]) {
-                    $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid . $id]];
+                    $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid.$id]];
                 }
             }
 
@@ -148,7 +148,7 @@ 
                 $this->_normalizeMenus[$id] = isset($this->_normalizeMenus[$id]) ? array_merge($this->_normalizeMenus[$id], $value)
                     : $value;
                 if (!isset($this->_normalizeMenus[$id]['url'])) {
-                    $this->_normalizeMenus[$id]['url'] = [$mid . $id];
+                    $this->_normalizeMenus[$id]['url'] = [$mid.$id];
                 }
             }
         }
@@ -176,7 +176,7 @@ 
 
             $view->params['breadcrumbs'][] = [
                 'label' => ($this->defaultUrlLabel ?: Yii::t('rbac-admin', 'Admin')),
-                'url' => ['/' . ($this->defaultUrl ?: $this->uniqueId)],
+                'url' => ['/'.($this->defaultUrl ?: $this->uniqueId)],
             ];
             return true;
         }

views/layouts/left-menu.php

Spacing +4 added lines, -4 removed lines

@@ -23,12 +23,12 @@ 
             <?php
             foreach ($menus as $menu) {
                 $r = \mdm\admin\components\Helper::checkRoute($menu['url'][0]);
-                if($r) {
-                    $label = Html::tag('i', '', ['class' => 'glyphicon glyphicon-chevron-right pull-right']) .
+                if ($r) {
+                    $label = Html::tag('i', '', ['class' => 'glyphicon glyphicon-chevron-right pull-right']).
                         Html::tag('span', Html::encode($menu['label']), []);
                     $active = $menu['active'] ? ' active' : '';
                     echo Html::a($label, $menu['url'], [
-                        'class' => 'list-group-item' . $active,
+                        'class' => 'list-group-item'.$active,
                     ]);
                 }
             }
@@ -41,7 +41,7 @@ 
 </div>
 <?php
 list(, $url) = Yii::$app->assetManager->publish('@mdm/admin/assets');
-$this->registerCssFile($url . '/list-item.css');
+$this->registerCssFile($url.'/list-item.css');
 ?>
 
 <?php $this->endContent(); ?>

models/Assignment.php

Spacing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 
         $assigned = [];
         foreach ($manager->getAssignments($this->id) as $item) {
-            if(isset($available[$item->roleName])) {
+            if (isset($available[$item->roleName])) {
                 $assigned[$item->roleName] = $available[$item->roleName];
                 unset($available[$item->roleName]);
             }

controllers/DefaultController.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function actionIndex($page = 'README.md')
     {
-        if (preg_match('/^docs\/images\/image\d+\.png$/',$page)) {
+        if (preg_match('/^docs\/images\/image\d+\.png$/', $page)) {
             $file = Yii::getAlias("@mdm/admin/{$page}");
             return Yii::$app->getResponse()->sendFile($file);
         }

views/default/index.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
     $baseDir = '';
     $this->title = substr($page, 0, strrpos($page, '.'));
 } else {
-    $baseDir = substr($page, 0, $pos) . '/';
+    $baseDir = substr($page, 0, $pos).'/';
     $this->title = substr($page, $pos + 1, strrpos($page, '.') - $pos - 1);
 }
 
@@ -22,10 +22,10 @@ 
         $url = Url::to($menu['url'], true);
         $links[] = "[**{$menu['label']}**]({$url})";
     }
-    $body = str_replace(':smile:.', ".\n\n" . implode('  ', $links) . "\n", file_get_contents(Url::to('@mdm/admin/README.md')));
-} elseif(preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) {
+    $body = str_replace(':smile:.', ".\n\n".implode('  ', $links)."\n", file_get_contents(Url::to('@mdm/admin/README.md')));
+} elseif (preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) {
     $body = file_get_contents(Url::to("@mdm/admin/{$page}"));
-} else{
+} else {
     $body = '';
 }
 
@@ -35,7 +35,7 @@ 
         if ($link[0] == '/') {
             $link = Url::current(['page' => ltrim($link, '/')], true);
         } else {
-            $link = Url::current(['page' => $baseDir . $link], true);
+            $link = Url::current(['page' => $baseDir.$link], true);
         }
     }
     return "]($link)";

views/item/view.php

Spacing +2 added lines, -2 removed lines

@@ -83,14 +83,14 @@
         <div class="col-sm-1">
             <br><br>
             <?=
-            Html::a('&gt;&gt;' . $animateIcon, ['assign', 'id' => $model->name], [
+            Html::a('&gt;&gt;'.$animateIcon, ['assign', 'id' => $model->name], [
                 'class' => 'btn btn-success btn-assign',
                 'data-target' => 'available',
                 'title' => Yii::t('rbac-admin', 'Assign'),
             ]);
             ?><br><br>
             <?=
-            Html::a('&lt;&lt;' . $animateIcon, ['remove', 'id' => $model->name], [
+            Html::a('&lt;&lt;'.$animateIcon, ['remove', 'id' => $model->name], [
                 'class' => 'btn btn-danger btn-assign',
                 'data-target' => 'assigned',
                 'title' => Yii::t('rbac-admin', 'Remove'),