mdmsoft / yii2-admin

models/Route.php

Doc Comments +2 added lines, -1 removed lines

@@ -171,6 +171,7 @@ 
 
     /**
      * Get list of application routes
+     * @param \yii\web\Application $module
      * @return array
      */
     public function getAppRoutes($module = null)
@@ -290,7 +291,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 +18 added lines, -18 removed lines

@@ -38,7 +38,7 @@ 
                 $r = explode('&', $route);
                 $item = $manager->createPermission($this->getPermissionName($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);
@@ -101,9 +101,9 @@ 
     public function getPermissionName($route)
     {
         if (self::PREFIX_BASIC == $this->routePrefix) {
-            return self::PREFIX_BASIC . trim($route, self::PREFIX_BASIC);
+            return self::PREFIX_BASIC.trim($route, self::PREFIX_BASIC);
         } else {
-            return self::PREFIX_ADVANCED . ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED);
+            return self::PREFIX_ADVANCED.ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED);
         }
     }
 
@@ -127,7 +127,7 @@ 
             // Step through each configured application
             foreach ($advanced as $id => $configPaths) {
                 // Force correct id string.
-                $id = $this->routePrefix . ltrim(trim($id), $this->routePrefix);
+                $id = $this->routePrefix.ltrim(trim($id), $this->routePrefix);
                 // Create empty config array.
                 $config = [];
                 // Assemble configuration for current app.
@@ -143,7 +143,7 @@ 
                 unset($app);
                 // Prepend the app id to all routes.
                 foreach ($r as $route) {
-                    $routes[$id . $route] = $id . $route;
+                    $routes[$id.$route] = $id.$route;
                 }
                 // Switch back to original app.
                 Yii::$app = $yiiApp;
@@ -202,7 +202,7 @@ 
      */
     protected function getRouteRecursive($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) {
@@ -215,9 +215,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__);
@@ -235,7 +235,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 {
@@ -246,15 +246,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);
                     }
                 }
             }
@@ -273,7 +273,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 */
@@ -294,19 +294,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;
                 }
             }

components/Helper.php

Spacing +8 added lines, -8 removed lines

@@ -121,7 +121,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if ($user->can($r . '/*', $params)) {
+                if ($user->can($r.'/*', $params)) {
                     return true;
                 }
             }
@@ -133,7 +133,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if (isset($routes[$r . '/*'])) {
+                if (isset($routes[$r.'/*'])) {
                     return true;
                 }
             }
@@ -150,19 +150,19 @@ 
     protected static function normalizeRoute($route, $advanced = false)
     {
         if ($route === '') {
-            $normalized = '/' . Yii::$app->controller->getRoute();
+            $normalized = '/'.Yii::$app->controller->getRoute();
         } elseif (strncmp($route, '/', 1) === 0) {
             $normalized = $route;
         } elseif (strpos($route, '/') === false) {
-            $normalized = '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
+            $normalized = '/'.Yii::$app->controller->getUniqueId().'/'.$route;
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
-            $normalized = '/' . $mid . '/' . $route;
+            $normalized = '/'.$mid.'/'.$route;
         } else {
-            $normalized = '/' . $route;
+            $normalized = '/'.$route;
         }
         // Prefix @app-id to route.
         if ($advanced) {
-            $normalized = Route::PREFIX_ADVANCED . Yii::$app->id . $normalized;
+            $normalized = Route::PREFIX_ADVANCED.Yii::$app->id.$normalized;
         }
         return $normalized;
     }
@@ -233,7 +233,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);
     }