@@ -52,7 +52,9 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $parts = preg_split('/\//', $string, 0, PREG_SPLIT_NO_EMPTY); |
| 54 | 54 | |
| 55 | - foreach ($parts as $name) if (!preg_match($regex, $name)) return false; |
|
| 55 | + foreach ($parts as $name) { |
|
| 56 | + if (!preg_match($regex, $name)) return false; |
|
| 57 | + } |
|
| 56 | 58 | |
| 57 | 59 | # ------------------------ |
| 58 | 60 | |
@@ -63,9 +65,13 @@ discard block |
||
| 63 | 65 | |
| 64 | 66 | private static function parseRoute(string $name, array $route) { |
| 65 | 67 | |
| 66 | - if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) return; |
|
| 68 | + if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) { |
|
| 69 | + return; |
|
| 70 | + } |
|
| 67 | 71 | |
| 68 | - if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return; |
|
| 72 | + if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) { |
|
| 73 | + return; |
|
| 74 | + } |
|
| 69 | 75 | |
| 70 | 76 | self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler)); |
| 71 | 77 | } |
@@ -74,14 +80,18 @@ discard block |
||
| 74 | 80 | |
| 75 | 81 | private static function parseItem(array $item) { |
| 76 | 82 | |
| 77 | - foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route); |
|
| 83 | + foreach ($item['routes'] as $route) { |
|
| 84 | + self::parseRoute($item['name'], $route); |
|
| 85 | + } |
|
| 78 | 86 | } |
| 79 | 87 | |
| 80 | 88 | # Autoloader |
| 81 | 89 | |
| 82 | 90 | public static function __autoload() { |
| 83 | 91 | |
| 84 | - foreach (Extend\Addons::items() as $item) self::parseItem($item); |
|
| 92 | + foreach (Extend\Addons::items() as $item) { |
|
| 93 | + self::parseItem($item); |
|
| 94 | + } |
|
| 85 | 95 | } |
| 86 | 96 | |
| 87 | 97 | # Get handler by url |