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 +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
                 if (strpos($route, $prefix) !== 0) {
                     if (substr($route, -1) === '/') {
                         $prefix = $route;
-                        $filter1[] = $route . '%';
+                        $filter1[] = $route.'%';
                     } else {
                         $filter2[] = $route;
                     }

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

Doc Comments +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
     /**
      * Get route of action
      * @param \yii\base\Controller $controller
-     * @param array $result all controller action.
+     * @param string $result all controller action.
      */
     protected function getActionRoutes($controller, &$result)
     {

Spacing +16 added lines, -16 removed lines

@@ -31,9 +31,9 @@ 
         foreach ($routes as $route) {
             try {
                 $r = explode('&', $route);
-                $item = $manager->createPermission('/' . trim($route, '/'));
+                $item = $manager->createPermission('/'.trim($route, '/'));
                 if (count($r) > 1) {
-                    $action = '/' . trim($r[0], '/');
+                    $action = '/'.trim($r[0], '/');
                     if (($itemAction = $manager->getPermission($action)) === null) {
                         $itemAction = $manager->createPermission($action);
                         $manager->add($itemAction);
@@ -67,7 +67,7 @@ 
         $manager = Yii::$app->getAuthManager();
         foreach ($routes as $route) {
             try {
-                $item = $manager->createPermission('/' . trim($route, '/'));
+                $item = $manager->createPermission('/'.trim($route, '/'));
                 $manager->remove($item);
             } catch (Exception $exc) {
                 Yii::error($exc->getMessage(), __METHOD__);
@@ -131,7 +131,7 @@ 
      */
     protected function getRouteRecrusive($module, &$result)
     {
-        $token = "Get Route of '" . get_class($module) . "' with id '" . $module->uniqueId . "'";
+        $token = "Get Route of '".get_class($module)."' with id '".$module->uniqueId."'";
         Yii::beginProfile($token, __METHOD__);
         try {
             foreach ($module->getModules() as $id => $child) {
@@ -144,9 +144,9 @@ 
                 $this->getControllerActions($type, $id, $module, $result);
             }
 
-            $namespace = trim($module->controllerNamespace, '\\') . '\\';
+            $namespace = trim($module->controllerNamespace, '\\').'\\';
             $this->getControllerFiles($module, $namespace, '', $result);
-            $all = '/' . ltrim($module->uniqueId . '/*', '/');
+            $all = '/'.ltrim($module->uniqueId.'/*', '/');
             $result[$all] = $all;
         } catch (\Exception $exc) {
             Yii::error($exc->getMessage(), __METHOD__);
@@ -164,7 +164,7 @@ 
      */
     protected function getControllerFiles($module, $namespace, $prefix, &$result)
     {
-        $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace), false);
+        $path = Yii::getAlias('@'.str_replace('\\', '/', $namespace), false);
         $token = "Get controllers from '$path'";
         Yii::beginProfile($token, __METHOD__);
         try {
@@ -175,15 +175,15 @@ 
                 if ($file == '.' || $file == '..') {
                     continue;
                 }
-                if (is_dir($path . '/' . $file) && preg_match('%^[a-z0-9_/]+$%i', $file . '/')) {
-                    $this->getControllerFiles($module, $namespace . $file . '\\', $prefix . $file . '/', $result);
+                if (is_dir($path.'/'.$file) && preg_match('%^[a-z0-9_/]+$%i', $file.'/')) {
+                    $this->getControllerFiles($module, $namespace.$file.'\\', $prefix.$file.'/', $result);
                 } elseif (strcmp(substr($file, -14), 'Controller.php') === 0) {
                     $baseName = substr(basename($file), 0, -14);
                     $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $baseName));
                     $id = ltrim(str_replace(' ', '-', $name), '-');
-                    $className = $namespace . $baseName . 'Controller';
+                    $className = $namespace.$baseName.'Controller';
                     if (strpos($className, '-') === false && class_exists($className) && is_subclass_of($className, 'yii\base\Controller')) {
-                        $this->getControllerActions($className, $prefix . $id, $module, $result);
+                        $this->getControllerActions($className, $prefix.$id, $module, $result);
                     }
                 }
             }
@@ -202,7 +202,7 @@ 
      */
     protected function getControllerActions($type, $id, $module, &$result)
     {
-        $token = "Create controller with cofig=" . VarDumper::dumpAsString($type) . " and id='$id'";
+        $token = "Create controller with cofig=".VarDumper::dumpAsString($type)." and id='$id'";
         Yii::beginProfile($token, __METHOD__);
         try {
             /* @var $controller \yii\base\Controller */
@@ -223,19 +223,19 @@ 
      */
     protected function getActionRoutes($controller, &$result)
     {
-        $token = "Get actions of controller '" . $controller->uniqueId . "'";
+        $token = "Get actions of controller '".$controller->uniqueId."'";
         Yii::beginProfile($token, __METHOD__);
         try {
-            $prefix = '/' . $controller->uniqueId . '/';
+            $prefix = '/'.$controller->uniqueId.'/';
             foreach ($controller->actions() as $id => $value) {
-                $result[$prefix . $id] = $prefix . $id;
+                $result[$prefix.$id] = $prefix.$id;
             }
             $class = new \ReflectionClass($controller);
             foreach ($class->getMethods() as $method) {
                 $name = $method->getName();
                 if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') {
                     $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', substr($name, 6)));
-                    $id = $prefix . ltrim(str_replace(' ', '-', $name), '-');
+                    $id = $prefix.ltrim(str_replace(' ', '-', $name), '-');
                     $result[$id] = $id;
                 }
             }

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