@@ -186,7 +186,7 @@  | 
                                                    ||
| 186 | 186 | * Normalize menu  | 
                                                        
| 187 | 187 | * @param array $assigned  | 
                                                        
| 188 | 188 | * @param array $menus  | 
                                                        
| 189 | - * @param Closure $callback  | 
                                                        |
| 189 | + * @param \Closure|null $callback  | 
                                                        |
| 190 | 190 | * @param integer $parent  | 
                                                        
| 191 | 191 | * @return array  | 
                                                        
| 192 | 192 | */  | 
                                                        
@@ -101,7 +101,7 @@  | 
                                                    ||
| 101 | 101 |                  if (strpos($route, $prefix) !== 0) { | 
                                                        
| 102 | 102 |                      if (substr($route, -1) === '/') { | 
                                                        
| 103 | 103 | $prefix = $route;  | 
                                                        
| 104 | - $filter1[] = $route . '%';  | 
                                                        |
| 104 | + $filter1[] = $route.'%';  | 
                                                        |
| 105 | 105 |                      } else { | 
                                                        
| 106 | 106 | $filter2[] = $route;  | 
                                                        
| 107 | 107 | }  | 
                                                        
@@ -55,7 +55,7 @@ discard block  | 
                                                    ||
| 55 | 55 | |
| 56 | 56 | /**  | 
                                                        
| 57 | 57 | * Lists all Assignment models.  | 
                                                        
| 58 | - * @return mixed  | 
                                                        |
| 58 | + * @return string  | 
                                                        |
| 59 | 59 | */  | 
                                                        
| 60 | 60 | public function actionIndex()  | 
                                                        
| 61 | 61 |      { | 
                                                        
@@ -81,7 +81,7 @@ discard block  | 
                                                    ||
| 81 | 81 | /**  | 
                                                        
| 82 | 82 | * Displays a single Assignment model.  | 
                                                        
| 83 | 83 | * @param integer $id  | 
                                                        
| 84 | - * @return mixed  | 
                                                        |
| 84 | + * @return string  | 
                                                        |
| 85 | 85 | */  | 
                                                        
| 86 | 86 | public function actionView($id)  | 
                                                        
| 87 | 87 |      { | 
                                                        
@@ -32,7 +32,7 @@  | 
                                                    ||
| 32 | 32 | parent::init();  | 
                                                        
| 33 | 33 |          if ($this->userClassName === null) { | 
                                                        
| 34 | 34 | $this->userClassName = Yii::$app->getUser()->identityClass;  | 
                                                        
| 35 | - $this->userClassName = $this->userClassName ? : 'mdm\admin\models\User';  | 
                                                        |
| 35 | + $this->userClassName = $this->userClassName ?: 'mdm\admin\models\User';  | 
                                                        |
| 36 | 36 | }  | 
                                                        
| 37 | 37 | }  | 
                                                        
| 38 | 38 | |
@@ -36,7 +36,7 @@ discard block  | 
                                                    ||
| 36 | 36 | |
| 37 | 37 | /**  | 
                                                        
| 38 | 38 | * Lists all Menu models.  | 
                                                        
| 39 | - * @return mixed  | 
                                                        |
| 39 | + * @return string  | 
                                                        |
| 40 | 40 | */  | 
                                                        
| 41 | 41 | public function actionIndex()  | 
                                                        
| 42 | 42 |      { | 
                                                        
@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 | /**  | 
                                                        
| 53 | 53 | * Displays a single Menu model.  | 
                                                        
| 54 | 54 | * @param integer $id  | 
                                                        
| 55 | - * @return mixed  | 
                                                        |
| 55 | + * @return string  | 
                                                        |
| 56 | 56 | */  | 
                                                        
| 57 | 57 | public function actionView($id)  | 
                                                        
| 58 | 58 |      { | 
                                                        
@@ -106,7 +106,7 @@ discard block  | 
                                                    ||
| 106 | 106 | * Deletes an existing Menu model.  | 
                                                        
| 107 | 107 | * If deletion is successful, the browser will be redirected to the 'index' page.  | 
                                                        
| 108 | 108 | * @param integer $id  | 
                                                        
| 109 | - * @return mixed  | 
                                                        |
| 109 | + * @return \yii\web\Response  | 
                                                        |
| 110 | 110 | */  | 
                                                        
| 111 | 111 | public function actionDelete($id)  | 
                                                        
| 112 | 112 |      { | 
                                                        
@@ -36,7 +36,7 @@ discard block  | 
                                                    ||
| 36 | 36 | |
| 37 | 37 | /**  | 
                                                        
| 38 | 38 | * Lists all AuthItem models.  | 
                                                        
| 39 | - * @return mixed  | 
                                                        |
| 39 | + * @return string  | 
                                                        |
| 40 | 40 | */  | 
                                                        
| 41 | 41 | public function actionIndex()  | 
                                                        
| 42 | 42 |      { | 
                                                        
@@ -52,7 +52,7 @@ discard block  | 
                                                    ||
| 52 | 52 | /**  | 
                                                        
| 53 | 53 | * Displays a single AuthItem model.  | 
                                                        
| 54 | 54 | * @param string $id  | 
                                                        
| 55 | - * @return mixed  | 
                                                        |
| 55 | + * @return string  | 
                                                        |
| 56 | 56 | */  | 
                                                        
| 57 | 57 | public function actionView($id)  | 
                                                        
| 58 | 58 |      { | 
                                                        
@@ -100,7 +100,7 @@ discard block  | 
                                                    ||
| 100 | 100 | * Deletes an existing AuthItem model.  | 
                                                        
| 101 | 101 | * If deletion is successful, the browser will be redirected to the 'index' page.  | 
                                                        
| 102 | 102 | * @param string $id  | 
                                                        
| 103 | - * @return mixed  | 
                                                        |
| 103 | + * @return \yii\web\Response  | 
                                                        |
| 104 | 104 | */  | 
                                                        
| 105 | 105 | public function actionDelete($id)  | 
                                                        
| 106 | 106 |      { | 
                                                        
@@ -115,7 +115,7 @@ discard block  | 
                                                    ||
| 115 | 115 | * Finds the AuthItem model based on its primary key value.  | 
                                                        
| 116 | 116 | * If the model is not found, a 404 HTTP exception will be thrown.  | 
                                                        
| 117 | 117 | * @param string $id  | 
                                                        
| 118 | - * @return AuthItem the loaded model  | 
                                                        |
| 118 | + * @return BizRule the loaded model  | 
                                                        |
| 119 | 119 | * @throws HttpException if the model cannot be found  | 
                                                        
| 120 | 120 | */  | 
                                                        
| 121 | 121 | protected function findModel($id)  | 
                                                        
@@ -74,7 +74,7 @@ discard block  | 
                                                    ||
| 74 | 74 | |
| 75 | 75 | return $this->redirect(['view', 'id' => $model->name]);  | 
                                                        
| 76 | 76 |          } else { | 
                                                        
| 77 | -            return $this->render('create', ['model' => $model,]); | 
                                                        |
| 77 | +            return $this->render('create', ['model' => $model, ]); | 
                                                        |
| 78 | 78 | }  | 
                                                        
| 79 | 79 | }  | 
                                                        
| 80 | 80 | |
@@ -93,7 +93,7 @@ discard block  | 
                                                    ||
| 93 | 93 | return $this->redirect(['view', 'id' => $model->name]);  | 
                                                        
| 94 | 94 | }  | 
                                                        
| 95 | 95 | |
| 96 | -        return $this->render('update', ['model' => $model,]); | 
                                                        |
| 96 | +        return $this->render('update', ['model' => $model, ]); | 
                                                        |
| 97 | 97 | }  | 
                                                        
| 98 | 98 | |
| 99 | 99 | /**  | 
                                                        
@@ -87,7 +87,7 @@ discard block  | 
                                                    ||
| 87 | 87 | |
| 88 | 88 | /**  | 
                                                        
| 89 | 89 | * Lists all User models.  | 
                                                        
| 90 | - * @return mixed  | 
                                                        |
| 90 | + * @return string  | 
                                                        |
| 91 | 91 | */  | 
                                                        
| 92 | 92 | public function actionIndex()  | 
                                                        
| 93 | 93 |      { | 
                                                        
@@ -103,7 +103,7 @@ discard block  | 
                                                    ||
| 103 | 103 | /**  | 
                                                        
| 104 | 104 | * Displays a single User model.  | 
                                                        
| 105 | 105 | * @param integer $id  | 
                                                        
| 106 | - * @return mixed  | 
                                                        |
| 106 | + * @return string  | 
                                                        |
| 107 | 107 | */  | 
                                                        
| 108 | 108 | public function actionView($id)  | 
                                                        
| 109 | 109 |      { | 
                                                        
@@ -116,7 +116,7 @@ discard block  | 
                                                    ||
| 116 | 116 | * Deletes an existing User model.  | 
                                                        
| 117 | 117 | * If deletion is successful, the browser will be redirected to the 'index' page.  | 
                                                        
| 118 | 118 | * @param integer $id  | 
                                                        
| 119 | - * @return mixed  | 
                                                        |
| 119 | + * @return \yii\web\Response  | 
                                                        |
| 120 | 120 | */  | 
                                                        
| 121 | 121 | public function actionDelete($id)  | 
                                                        
| 122 | 122 |      { | 
                                                        
@@ -147,7 +147,7 @@ discard block  | 
                                                    ||
| 147 | 147 | |
| 148 | 148 | /**  | 
                                                        
| 149 | 149 | * Logout  | 
                                                        
| 150 | - * @return string  | 
                                                        |
| 150 | + * @return \yii\web\Response  | 
                                                        |
| 151 | 151 | */  | 
                                                        
| 152 | 152 | public function actionLogout()  | 
                                                        
| 153 | 153 |      { | 
                                                        
@@ -238,7 +238,7 @@ discard block  | 
                                                    ||
| 238 | 238 | /**  | 
                                                        
| 239 | 239 | * Activate new user  | 
                                                        
| 240 | 240 | * @param integer $id  | 
                                                        
| 241 | - * @return type  | 
                                                        |
| 241 | + * @return \yii\web\Response  | 
                                                        |
| 242 | 242 | * @throws UserException  | 
                                                        
| 243 | 243 | * @throws NotFoundHttpException  | 
                                                        
| 244 | 244 | */  | 
                                                        
@@ -149,7 +149,7 @@  | 
                                                    ||
| 149 | 149 | |
| 150 | 150 | /**  | 
                                                        
| 151 | 151 | * Get item  | 
                                                        
| 152 | - * @return Item  | 
                                                        |
| 152 | + * @return Rule  | 
                                                        |
| 153 | 153 | */  | 
                                                        
| 154 | 154 | public function getItem()  | 
                                                        
| 155 | 155 |      { | 
                                                        
@@ -2,7 +2,6 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace mdm\admin\models\searchs;  | 
                                                        
| 4 | 4 | |
| 5 | -use Yii;  | 
                                                        |
| 6 | 5 | use yii\base\Model;  | 
                                                        
| 7 | 6 | use yii\data\ActiveDataProvider;  | 
                                                        
| 8 | 7 | use mdm\admin\models\Menu as MenuModel;  | 
                                                        
@@ -44,9 +44,9 @@  | 
                                                    ||
| 44 | 44 | public function search($params)  | 
                                                        
| 45 | 45 |      { | 
                                                        
| 46 | 46 | $query = MenuModel::find()  | 
                                                        
| 47 | - ->from(MenuModel::tableName() . ' t')  | 
                                                        |
| 48 | -            ->joinWith(['menuParent' => function ($q) { | 
                                                        |
| 49 | - $q->from(MenuModel::tableName() . ' parent');  | 
                                                        |
| 47 | + ->from(MenuModel::tableName().' t')  | 
                                                        |
| 48 | +            ->joinWith(['menuParent' => function($q) { | 
                                                        |
| 49 | + $q->from(MenuModel::tableName().' parent');  | 
                                                        |
| 50 | 50 | }]);  | 
                                                        
| 51 | 51 | |
| 52 | 52 | $dataProvider = new ActiveDataProvider([  | 
                                                        
@@ -5,7 +5,7 @@  | 
                                                    ||
| 5 | 5 | /* @var $this yii\web\View */  | 
                                                        
| 6 | 6 | /* @var $user mdm\admin\models\User */  | 
                                                        
| 7 | 7 | |
| 8 | -$resetLink = Url::to(['user/reset-password','token'=>$user->password_reset_token], true);  | 
                                                        |
| 8 | +$resetLink = Url::to(['user/reset-password', 'token'=>$user->password_reset_token], true);  | 
                                                        |
| 9 | 9 | ?>  | 
                                                        
| 10 | 10 | <div class="password-reset">  | 
                                                        
| 11 | 11 | <p>Hello <?= Html::encode($user->username) ?>,</p>  | 
                                                        
@@ -4,7 +4,7 @@  | 
                                                    ||
| 4 | 4 | /* @var $this yii\web\View */  | 
                                                        
| 5 | 5 | /* @var $user mdm\admin\models\User */  | 
                                                        
| 6 | 6 | |
| 7 | -$resetLink = Url::to(['user/reset-password','token'=>$user->password_reset_token], true);  | 
                                                        |
| 7 | +$resetLink = Url::to(['user/reset-password', 'token'=>$user->password_reset_token], true);  | 
                                                        |
| 8 | 8 | ?>  | 
                                                        
| 9 | 9 | Hello <?= $user->username ?>,  | 
                                                        
| 10 | 10 | |