@@ -171,6 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | /** |
173 | 173 | * Get list of application routes |
174 | + * @param \yii\web\Application $module |
|
174 | 175 | * @return array |
175 | 176 | */ |
176 | 177 | public function getAppRoutes($module = null) |
@@ -290,7 +291,7 @@ discard block |
||
290 | 291 | /** |
291 | 292 | * Get route of action |
292 | 293 | * @param \yii\base\Controller $controller |
293 | - * @param array $result all controller action. |
|
294 | + * @param string $result all controller action. |
|
294 | 295 | */ |
295 | 296 | protected function getActionRoutes($controller, &$result) |
296 | 297 | { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $r = explode('&', $route); |
39 | 39 | $item = $manager->createPermission($this->getPermissionName($route)); |
40 | 40 | if (count($r) > 1) { |
41 | - $action = '/' . trim($r[0], '/'); |
|
41 | + $action = '/'.trim($r[0], '/'); |
|
42 | 42 | if (($itemAction = $manager->getPermission($action)) === null) { |
43 | 43 | $itemAction = $manager->createPermission($action); |
44 | 44 | $manager->add($itemAction); |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | public function getPermissionName($route) |
102 | 102 | { |
103 | 103 | if (self::PREFIX_BASIC == $this->routePrefix) { |
104 | - return self::PREFIX_BASIC . trim($route, self::PREFIX_BASIC); |
|
104 | + return self::PREFIX_BASIC.trim($route, self::PREFIX_BASIC); |
|
105 | 105 | } else { |
106 | - return self::PREFIX_ADVANCED . ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED); |
|
106 | + return self::PREFIX_ADVANCED.ltrim(trim($route, self::PREFIX_BASIC), self::PREFIX_ADVANCED); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | // Step through each configured application |
128 | 128 | foreach ($advanced as $id => $configPaths) { |
129 | 129 | // Force correct id string. |
130 | - $id = $this->routePrefix . ltrim(trim($id), $this->routePrefix); |
|
130 | + $id = $this->routePrefix.ltrim(trim($id), $this->routePrefix); |
|
131 | 131 | // Create empty config array. |
132 | 132 | $config = []; |
133 | 133 | // Assemble configuration for current app. |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | unset($app); |
145 | 145 | // Prepend the app id to all routes. |
146 | 146 | foreach ($r as $route) { |
147 | - $routes[$id . $route] = $id . $route; |
|
147 | + $routes[$id.$route] = $id.$route; |
|
148 | 148 | } |
149 | 149 | } |
150 | 150 | // Switch back to original app. |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | */ |
205 | 205 | protected function getRouteRecursive($module, &$result) |
206 | 206 | { |
207 | - $token = "Get Route of '" . get_class($module) . "' with id '" . $module->uniqueId . "'"; |
|
207 | + $token = "Get Route of '".get_class($module)."' with id '".$module->uniqueId."'"; |
|
208 | 208 | Yii::beginProfile($token, __METHOD__); |
209 | 209 | try { |
210 | 210 | foreach ($module->getModules() as $id => $child) { |
@@ -217,9 +217,9 @@ discard block |
||
217 | 217 | $this->getControllerActions($type, $id, $module, $result); |
218 | 218 | } |
219 | 219 | |
220 | - $namespace = trim($module->controllerNamespace, '\\') . '\\'; |
|
220 | + $namespace = trim($module->controllerNamespace, '\\').'\\'; |
|
221 | 221 | $this->getControllerFiles($module, $namespace, '', $result); |
222 | - $all = '/' . ltrim($module->uniqueId . '/*', '/'); |
|
222 | + $all = '/'.ltrim($module->uniqueId.'/*', '/'); |
|
223 | 223 | $result[$all] = $all; |
224 | 224 | } catch (\Exception $exc) { |
225 | 225 | Yii::error($exc->getMessage(), __METHOD__); |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function getControllerFiles($module, $namespace, $prefix, &$result) |
239 | 239 | { |
240 | - $path = Yii::getAlias('@' . str_replace('\\', '/', $namespace), false); |
|
240 | + $path = Yii::getAlias('@'.str_replace('\\', '/', $namespace), false); |
|
241 | 241 | $token = "Get controllers from '$path'"; |
242 | 242 | Yii::beginProfile($token, __METHOD__); |
243 | 243 | try { |
@@ -248,15 +248,15 @@ discard block |
||
248 | 248 | if ($file == '.' || $file == '..') { |
249 | 249 | continue; |
250 | 250 | } |
251 | - if (is_dir($path . '/' . $file) && preg_match('%^[a-z0-9_/]+$%i', $file . '/')) { |
|
252 | - $this->getControllerFiles($module, $namespace . $file . '\\', $prefix . $file . '/', $result); |
|
251 | + if (is_dir($path.'/'.$file) && preg_match('%^[a-z0-9_/]+$%i', $file.'/')) { |
|
252 | + $this->getControllerFiles($module, $namespace.$file.'\\', $prefix.$file.'/', $result); |
|
253 | 253 | } elseif (strcmp(substr($file, -14), 'Controller.php') === 0) { |
254 | 254 | $baseName = substr(basename($file), 0, -14); |
255 | 255 | $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', $baseName)); |
256 | 256 | $id = ltrim(str_replace(' ', '-', $name), '-'); |
257 | - $className = $namespace . $baseName . 'Controller'; |
|
257 | + $className = $namespace.$baseName.'Controller'; |
|
258 | 258 | if (strpos($className, '-') === false && class_exists($className) && is_subclass_of($className, 'yii\base\Controller')) { |
259 | - $this->getControllerActions($className, $prefix . $id, $module, $result); |
|
259 | + $this->getControllerActions($className, $prefix.$id, $module, $result); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | } |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | */ |
276 | 276 | protected function getControllerActions($type, $id, $module, &$result) |
277 | 277 | { |
278 | - $token = "Create controller with cofig=" . VarDumper::dumpAsString($type) . " and id='$id'"; |
|
278 | + $token = "Create controller with cofig=".VarDumper::dumpAsString($type)." and id='$id'"; |
|
279 | 279 | Yii::beginProfile($token, __METHOD__); |
280 | 280 | try { |
281 | 281 | /* @var $controller \yii\base\Controller */ |
@@ -296,19 +296,19 @@ discard block |
||
296 | 296 | */ |
297 | 297 | protected function getActionRoutes($controller, &$result) |
298 | 298 | { |
299 | - $token = "Get actions of controller '" . $controller->uniqueId . "'"; |
|
299 | + $token = "Get actions of controller '".$controller->uniqueId."'"; |
|
300 | 300 | Yii::beginProfile($token, __METHOD__); |
301 | 301 | try { |
302 | - $prefix = '/' . $controller->uniqueId . '/'; |
|
302 | + $prefix = '/'.$controller->uniqueId.'/'; |
|
303 | 303 | foreach ($controller->actions() as $id => $value) { |
304 | - $result[$prefix . $id] = $prefix . $id; |
|
304 | + $result[$prefix.$id] = $prefix.$id; |
|
305 | 305 | } |
306 | 306 | $class = new \ReflectionClass($controller); |
307 | 307 | foreach ($class->getMethods() as $method) { |
308 | 308 | $name = $method->getName(); |
309 | 309 | if ($method->isPublic() && !$method->isStatic() && strpos($name, 'action') === 0 && $name !== 'actions') { |
310 | 310 | $name = strtolower(preg_replace('/(?<![A-Z])[A-Z]/', ' \0', substr($name, 6))); |
311 | - $id = $prefix . ltrim(str_replace(' ', '-', $name), '-'); |
|
311 | + $id = $prefix.ltrim(str_replace(' ', '-', $name), '-'); |
|
312 | 312 | $result[$id] = $id; |
313 | 313 | } |
314 | 314 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | } |
122 | 122 | while (($pos = strrpos($r, '/')) > 0) { |
123 | 123 | $r = substr($r, 0, $pos); |
124 | - if ($user->can($r . '/*', $params)) { |
|
124 | + if ($user->can($r.'/*', $params)) { |
|
125 | 125 | return true; |
126 | 126 | } |
127 | 127 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | while (($pos = strrpos($r, '/')) > 0) { |
135 | 135 | $r = substr($r, 0, $pos); |
136 | - if (isset($routes[$r . '/*'])) { |
|
136 | + if (isset($routes[$r.'/*'])) { |
|
137 | 137 | return true; |
138 | 138 | } |
139 | 139 | } |
@@ -150,19 +150,19 @@ discard block |
||
150 | 150 | protected static function normalizeRoute($route, $advanced = false) |
151 | 151 | { |
152 | 152 | if ($route === '') { |
153 | - $normalized = '/' . Yii::$app->controller->getRoute(); |
|
153 | + $normalized = '/'.Yii::$app->controller->getRoute(); |
|
154 | 154 | } elseif (strncmp($route, '/', 1) === 0) { |
155 | 155 | $normalized = $route; |
156 | 156 | } elseif (strpos($route, '/') === false) { |
157 | - $normalized = '/' . Yii::$app->controller->getUniqueId() . '/' . $route; |
|
157 | + $normalized = '/'.Yii::$app->controller->getUniqueId().'/'.$route; |
|
158 | 158 | } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') { |
159 | - $normalized = '/' . $mid . '/' . $route; |
|
159 | + $normalized = '/'.$mid.'/'.$route; |
|
160 | 160 | } else { |
161 | - $normalized = '/' . $route; |
|
161 | + $normalized = '/'.$route; |
|
162 | 162 | } |
163 | 163 | // Prefix @app-id to route. |
164 | 164 | if ($advanced) { |
165 | - $normalized = Route::PREFIX_ADVANCED . Yii::$app->id . $normalized; |
|
165 | + $normalized = Route::PREFIX_ADVANCED.Yii::$app->id.$normalized; |
|
166 | 166 | } |
167 | 167 | return $normalized; |
168 | 168 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | } |
234 | 234 | return implode(' ', $result); |
235 | 235 | } |
236 | - return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) { |
|
236 | + return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) { |
|
237 | 237 | return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : ''; |
238 | 238 | }, $buttons); |
239 | 239 | } |