mdmsoft / yii2-admin

components/MenuHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
      * Normalize menu
      * @param  array $assigned
      * @param  array $menus
-     * @param  Closure $callback
+     * @param  \Closure|null $callback
      * @param  integer $parent
      * @return array
      */

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
                 if (strpos($route, $prefix) !== 0) {
                     if (substr($route, -1) === '/') {
                         $prefix = $route;
-                        $filter1[] = $route . '%';
+                        $filter1[] = $route.'%';
                     } else {
                         $filter2[] = $route;
                     }
@@ -202,7 +202,7 @@ 
                     $item = call_user_func($callback, $menu);
                 } else {
                     $item = [
-                        'label' => Yii::t('rbac-admin',$menu['name']),
+                        'label' => Yii::t('rbac-admin', $menu['name']),
                         'url' => static::parseRoute($menu['route']),
                     ];
                     if ($menu['children'] != []) {

controllers/AssignmentController.php

Doc Comments +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
 
     /**
      * Lists all Assignment models.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -81,7 +81,7 @@ 
     /**
      * Displays a single Assignment model.
      * @param  integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {

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/MenuController.php

Doc Comments +3 added lines, -3 removed lines

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

controllers/RuleController.php

Doc Comments +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
 
     /**
      * Lists all AuthItem models.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -52,7 +52,7 @@ 
     /**
      * Displays a single AuthItem model.
      * @param  string $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -100,7 +100,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)
     {
@@ -115,7 +115,7 @@ 
      * Finds the AuthItem model based on its primary key value.
      * If the model is not found, a 404 HTTP exception will be thrown.
      * @param  string        $id
-     * @return AuthItem      the loaded model
+     * @return BizRule      the loaded model
      * @throws HttpException if the model cannot be found
      */
     protected function findModel($id)

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

controllers/UserController.php

Doc Comments +5 added lines, -5 removed lines

@@ -87,7 +87,7 @@ 
 
     /**
      * Lists all User models.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -103,7 +103,7 @@ 
     /**
      * Displays a single User model.
      * @param integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -116,7 +116,7 @@ 
      * Deletes an existing User model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {
@@ -147,7 +147,7 @@ 
 
     /**
      * Logout
-     * @return string
+     * @return \yii\web\Response
      */
     public function actionLogout()
     {
@@ -238,7 +238,7 @@ 
     /**
      * Activate new user
      * @param integer $id
-     * @return type
+     * @return \yii\web\Response
      * @throws UserException
      * @throws NotFoundHttpException
      */

models/BizRule.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 
     /**
      * Get item
-     * @return Item
+     * @return Rule
      */
     public function getItem()
     {

models/form/ResetPassword.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace mdm\admin\models\form;
 
-use Yii;
 use mdm\admin\models\User;
 use yii\base\InvalidParamException;
 use yii\base\Model;

models/searchs/Menu.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace mdm\admin\models\searchs;
 
-use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use mdm\admin\models\Menu as MenuModel;

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([

mail/passwordResetToken-html.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,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);
 ?>
 <div class="password-reset">
     <p>Hello <?= Html::encode($user->username) ?>,</p>