Completed
Push — master ( 3e8504...bdb393 )
by Sinnarasa
02:04
created
src/Routing/RouteCollection.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -43,12 +43,12 @@  discard block
 block discarded – undo
43 43
     public function addRoutes($routes = null, $options = [])
44 44
     {
45 45
         if (!is_null($routes) && !is_array($routes)) {
46
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
47
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
46
+            if (strpos($routes, '.php') === false) $routes = trim($routes, '/').'/';
47
+            if (is_file($routes.'/routes.php') && is_array($routesFile = include $routes.'/routes.php')) $routes = $routesFile;
48 48
             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
49
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');
49
+            else throw new \InvalidArgumentException('Argument for "'.get_called_class().'" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
50 50
         }
51
-        $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
51
+        $this->routes['routes_'.$this->countRoutes] = is_array($routes) ? $routes : [];
52 52
         $this->setRoutes($options, $this->countRoutes);
53 53
         $this->countRoutes++;
54 54
     }
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
         if (is_array($args)) {
73 73
             $nbrArgs = count($args);
74 74
             for ($i = 0; $i < $nbrArgs; ++$i)
75
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
75
+                $this->routes['prefix_'.$i] = '/'.trim($args[$i], '/');
76 76
         } elseif (is_string($args))
77 77
             for ($i = 0; $i < $this->countRoutes; ++$i)
78
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
78
+                $this->routes['prefix_'.$i] = '/'.trim($args, '/');
79 79
         if ($this->countRoutes == 0) $this->countRoutes++;
80 80
     }
81 81
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
         for ($i = 0; $i < $nbrArgs; ++$i) {
89 89
             if (is_array($args[$i])) {
90 90
                 $this->setRoutes($args[$i], $i);
91
-                if (!isset($this->routes['routes_' . $i])) $this->routes['routes_' . $i] = [];
91
+                if (!isset($this->routes['routes_'.$i])) $this->routes['routes_'.$i] = [];
92 92
             }
93 93
         }
94 94
         if ($this->countRoutes == 0) $this->countRoutes++;
@@ -100,13 +100,13 @@  discard block
 block discarded – undo
100 100
      */
101 101
     private function setRoutes($args = [], $i)
102 102
     {
103
-        $this->routes['block_' . $i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/') . '/' : '';
104
-        $this->routes['view_dir_' . $i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/') . '/' : '';
105
-        $this->routes['ctrl_namespace_' . $i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\') . '\\' : '';
106
-        $this->routes['prefix_' . $i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/' . trim($args['prefix'], '/') : '';
107
-        $this->routes['subdomain_' . $i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
108
-        $this->routes['protocol_' . $i] = (isset($args['protocol'])) ? $args['protocol'] : 'http';
109
-        $this->routes['params_' . $i] = (isset($args['params'])) ? $args['params'] : [];
103
+        $this->routes['block_'.$i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/').'/' : '';
104
+        $this->routes['view_dir_'.$i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/').'/' : '';
105
+        $this->routes['ctrl_namespace_'.$i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\').'\\' : '';
106
+        $this->routes['prefix_'.$i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/'.trim($args['prefix'], '/') : '';
107
+        $this->routes['subdomain_'.$i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
108
+        $this->routes['protocol_'.$i] = (isset($args['protocol'])) ? $args['protocol'] : 'http';
109
+        $this->routes['params_'.$i] = (isset($args['params'])) ? $args['params'] : [];
110 110
     }
111 111
 
112 112
     /**
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
         $protocol = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http';
120 120
         $domain = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
121 121
 
122
-        if(!is_null($root)){
122
+        if (!is_null($root)) {
123 123
             $protocol = explode('://', $root);
124 124
             $protocol = $protocol[0];
125
-        }else{
126
-            $root = $protocol . '://' . $domain . ((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/' . $script_file, '', $_SERVER['SCRIPT_NAME']);
125
+        } else {
126
+            $root = $protocol.'://'.$domain.((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':'.$_SERVER['SERVER_PORT'] : '').str_replace('/'.$script_file, '', $_SERVER['SCRIPT_NAME']);
127 127
         }
128 128
 
129 129
         $new_domain = $this->getDomain($root);
@@ -133,29 +133,29 @@  discard block
 block discarded – undo
133 133
 
134 134
         $count = 0;
135 135
         for ($i = 0; $i < $this->countRoutes; ++$i) {
136
-            $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
137
-            $subdomain = (isset($this->routes['subdomain_' . $i])) ? $this->routes['subdomain_' . $i] : '';
138
-            $block_protocol = (isset($this->routes['protocol_' . $i])) ? $this->routes['protocol_' . $i] : 'http';
139
-            $url = (!empty($subdomain)) ? str_replace($protocol . '://', $block_protocol . '://' . $subdomain . '.', $root) : $root;
140
-            if (isset($this->routes['routes_' . $i]))
141
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
136
+            $prefix = (isset($this->routes['prefix_'.$i])) ? $this->routes['prefix_'.$i] : '';
137
+            $subdomain = (isset($this->routes['subdomain_'.$i])) ? $this->routes['subdomain_'.$i] : '';
138
+            $block_protocol = (isset($this->routes['protocol_'.$i])) ? $this->routes['protocol_'.$i] : 'http';
139
+            $url = (!empty($subdomain)) ? str_replace($protocol.'://', $block_protocol.'://'.$subdomain.'.', $root) : $root;
140
+            if (isset($this->routes['routes_'.$i]))
141
+                foreach ($this->routes['routes_'.$i] as $route => $dependencies) {
142 142
                     if (is_array($dependencies) && isset($dependencies['use']) && !is_array($dependencies['use'])) {
143
-                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
143
+                        $use = (is_callable($dependencies['use'])) ? 'closure-'.$count : trim($dependencies['use'], '/');
144 144
                     } elseif (!is_array($dependencies)) {
145
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
145
+                        $use = (is_callable($dependencies)) ? 'closure-'.$count : trim($dependencies, '/');
146 146
                     } else {
147 147
                         $use = $route;
148 148
                     }
149 149
                     if (isset($route[0]) && $route[0] == '/') {
150
-                        $full_url = rtrim($url, '/') . '/' . trim($prefix, '/') . (empty($prefix) ? '' : '/') . trim($route, '/');
150
+                        $full_url = rtrim($url, '/').'/'.trim($prefix, '/').(empty($prefix) ? '' : '/').trim($route, '/');
151 151
                         (!is_callable($dependencies) && isset($dependencies['name']))
152
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $full_url
152
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $full_url
153 153
                             : $this->routesByName[$use] = $full_url;
154 154
                     } else {
155
-                        $full_url = $block_protocol . '://' . str_replace('{host}', $new_domain, $route);
155
+                        $full_url = $block_protocol.'://'.str_replace('{host}', $new_domain, $route);
156 156
                         (!is_callable($dependencies) && isset($dependencies['name']))
157
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $full_url . $prefix
158
-                            : $this->routesByName[$use] = $full_url . $prefix;
157
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $full_url.$prefix
158
+                            : $this->routesByName[$use] = $full_url.$prefix;
159 159
                     }
160 160
                     $count++;
161 161
                 }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         foreach ($this->routesByName as $key => $route) {
189 189
             $param = explode('#', $key);
190 190
             $route = str_replace('{subdomain}', $subdomain, $route);
191
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
191
+            foreach ($params as $key2 => $value) $route = str_replace(':'.$key2, $value, $route);
192 192
             if ($param[0] == trim($name, '/')) return $route;
193 193
             else if (isset($param[1]) && $param[1] == $name) return $route;
194 194
         }
Please login to merge, or discard this patch.
src/Routing/Middleware.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
      * @param $handlers
155 155
      * @param array $params
156 156
      */
157
-    private function callHandlers($handlers, $params = []){
157
+    private function callHandlers($handlers, $params = []) {
158 158
         $handlers = is_array($handlers) ? $handlers : [$handlers];
159 159
         foreach ($handlers as $handler) {
160
-            if($this->next && $this->handle($handler, $params) !== true){
160
+            if ($this->next && $this->handle($handler, $params) !== true) {
161 161
                 break;
162 162
             }
163 163
         }
@@ -185,13 +185,13 @@  discard block
 block discarded – undo
185 185
                 }
186 186
                 $dependencies = array_merge($dependencies, [$this->router->route]);
187 187
                 $response = $reflectionMethod->invokeArgs($instance, $dependencies);
188
-                if(is_array($response) && isset($response['call'])){
189
-                    if(isset($response['response']) && $response['response'] instanceof ResponseInterface){
188
+                if (is_array($response) && isset($response['call'])) {
189
+                    if (isset($response['response']) && $response['response'] instanceof ResponseInterface) {
190 190
                         $this->router->response = $response['response'];
191 191
                     }
192
-                    $params = isset($response['params']) ? $response['params']: [];
192
+                    $params = isset($response['params']) ? $response['params'] : [];
193 193
                     $this->callHandlers($response['call'], $params);
194
-                    $this->next = isset($response['next']) ? (bool)$response['next'] : false;
194
+                    $this->next = isset($response['next']) ? (bool) $response['next'] : false;
195 195
                 } else if ($response instanceof ResponseInterface) {
196 196
                     $this->router->response = $response;
197 197
                 }
Please login to merge, or discard this patch.
src/Routing/Matcher/ArrayMatcher.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
     {
99 99
         $this->request = [];
100 100
         for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
101
-            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_' . $i) != '') ? $this->router->collection->getRoutes('prefix_' . $i) : '';
102
-            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_' . $i) != '') ? $this->router->collection->getRoutes('subdomain_' . $i) : '';
103
-            foreach ($this->router->collection->getRoutes('routes_' . $i) as $route => $params) {
101
+            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_'.$i) != '') ? $this->router->collection->getRoutes('prefix_'.$i) : '';
102
+            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_'.$i) != '') ? $this->router->collection->getRoutes('subdomain_'.$i) : '';
103
+            foreach ($this->router->collection->getRoutes('routes_'.$i) as $route => $params) {
104 104
                 $this->request['params'] = $params;
105 105
                 $this->request['collection_index'] = $i;
106 106
                 if ($this->checkSubdomain($route)) {
107 107
                     $route = strstr($route, '/');
108
-                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
109
-                    if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
108
+                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/'.trim(trim($this->request['prefix'], '/').'/'.trim($route, '/'), '/'));
109
+                    if ($this->routeMatch('#^'.$this->request['route'].'$#')) {
110 110
                         $this->setCallback();
111 111
                         return $this->generateTarget();
112 112
                     }
@@ -122,19 +122,19 @@  discard block
 block discarded – undo
122 122
      */
123 123
     private function checkSubdomain($route)
124 124
     {
125
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
125
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
126 126
         $host = explode(':', $host)[0];
127 127
         $domain = $this->router->collection->getDomain($url);
128
-        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;
128
+        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.').'.'.$domain.$route;
129 129
         if ($route[0] == '/') {
130 130
             return ($host != $domain) ? false : true;
131 131
         } elseif ($route[0] != '/' && $host != $domain) {
132 132
             $route = substr($route, 0, strpos($route, "/"));
133 133
             $route = str_replace('{host}', $domain, $route);
134 134
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
135
-            if (preg_match('#^' . $route . '$#', $host, $this->request['called_subdomain'])) {
135
+            if (preg_match('#^'.$route.'$#', $host, $this->request['called_subdomain'])) {
136 136
                 $this->request['called_subdomain'] = array_shift($this->request['called_subdomain']);
137
-                $this->request['subdomain'] = str_replace('.' . $domain, '', $host);
137
+                $this->request['subdomain'] = str_replace('.'.$domain, '', $host);
138 138
                 return true;
139 139
             }
140 140
         }
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     private function subdomainMatch()
148 148
     {
149 149
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
150
-            return '(' . $this->request['params']['subdomain'] . ')';
150
+            return '('.$this->request['params']['subdomain'].')';
151 151
         }
152 152
         return '([^/]+)';
153 153
     }
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
     {
161 161
         if (is_array($this->request['params']) && isset($this->request['params']['arguments'][$match[1]])) {
162 162
             $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->request['params']['arguments'][$match[1]]);
163
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
163
+            return '('.$this->request['params']['arguments'][$match[1]].')';
164 164
         }
165 165
         return '([^/]+)';
166 166
     }
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
211 211
         $this->checkRequest('prefix');
212 212
         $this->router->route->setDetail($this->request);
213 213
         $this->router->route->setTarget($target);
214
-        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_' . $index));
215
-        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
216
-        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_' . $index));
214
+        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_'.$index));
215
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_'.$index));
216
+        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_'.$index));
217 217
     }
218 218
 
219 219
     /**
@@ -224,8 +224,8 @@  discard block
 block discarded – undo
224 224
         if (strpos($this->request[$key], ':') !== false && isset($this->request['parameters'][0])) {
225 225
             $replacements = $this->request['parameters'];
226 226
             $keys = [];
227
-            $this->request['@' . $key] = $this->request[$key];
228
-            $this->request[$key] = preg_replace_callback('#:([\w]+)#', function ($matches) use (&$replacements, &$keys) {
227
+            $this->request['@'.$key] = $this->request[$key];
228
+            $this->request[$key] = preg_replace_callback('#:([\w]+)#', function($matches) use (&$replacements, &$keys) {
229 229
                 $keys[$matches[0]] = $replacements[0];
230 230
                 return array_shift($replacements);
231 231
             }, $this->request[$key]);
@@ -244,9 +244,9 @@  discard block
 block discarded – undo
244 244
                 $this->router->route->setCallback($this->request['params']);
245 245
             } else {
246 246
                 if (is_array($this->request['params']) && isset($this->request['params']['use'])) {
247
-                    if(is_array($this->request['params']['use']) && isset($this->request['params']['use'][$this->router->route->getMethod()])){
247
+                    if (is_array($this->request['params']['use']) && isset($this->request['params']['use'][$this->router->route->getMethod()])) {
248 248
                         $this->router->route->setCallback($this->request['params']['use'][$this->router->route->getMethod()]);
249
-                    }elseif(!is_array($this->request['params']['use'])){
249
+                    }elseif (!is_array($this->request['params']['use'])) {
250 250
                         $this->router->route->setCallback($this->request['params']['use']);
251 251
                     }
252 252
                 } else {
@@ -349,9 +349,9 @@  discard block
 block discarded – undo
349 349
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
350 350
             $class = (class_exists($routes[0]))
351 351
                 ? $routes[0]
352
-                : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
352
+                : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
353 353
             if (!class_exists($class)) {
354
-                throw new \Exception('Class "' . $class . '." is not found');
354
+                throw new \Exception('Class "'.$class.'." is not found');
355 355
             }
356 356
             if (method_exists($class, $routes[1])) {
357 357
                 return [
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
                 ];
363 363
             }
364 364
             if (!strpos($callback, '{method}') !== false) {
365
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
365
+                throw new \Exception('The required method "'.$routes[1].'" is not found in "'.$class.'"');
366 366
             }
367 367
         }
368 368
         return false;
@@ -379,13 +379,13 @@  discard block
 block discarded – undo
379 379
             $path = trim($callback, '/');
380 380
             $extension = substr(strrchr($path, "."), 1);
381 381
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
382
-            $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
382
+            $viewDir = $this->router->collection->getRoutes('view_dir_'.$index);
383 383
             $target = null;
384
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path))) {
384
+            if (in_array('.'.$extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir.$path) || is_file($fullPath = $path))) {
385 385
                 $target = $fullPath;
386 386
             } else {
387 387
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
388
-                    if (is_file($fullPath = $viewDir . $path . $ext) || is_file($fullPath = $path . $ext)) {
388
+                    if (is_file($fullPath = $viewDir.$path.$ext) || is_file($fullPath = $path.$ext)) {
389 389
                         $target = $fullPath;
390 390
                         $extension = substr(strrchr($ext, "."), 1);
391 391
                         break;
@@ -393,7 +393,7 @@  discard block
 block discarded – undo
393 393
                 }
394 394
             }
395 395
             if (is_null($target)) {
396
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
396
+                throw new \Exception('Template file "'.$path.'" is not found in "'.$viewDir.'"');
397 397
             }
398 398
             return [
399 399
                 'dispatcher' => $this->dispatcher['isTemplate'],
Please login to merge, or discard this patch.
src/Routing/Matcher/UriMatcher.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -108,9 +108,9 @@  discard block
 block discarded – undo
108 108
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
109 109
         $this->router->route->setDetail($this->request);
110 110
         $this->router->route->setTarget($target);
111
-        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_' . $index));
112
-        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
113
-        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_' . $index));
111
+        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_'.$index));
112
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_'.$index));
113
+        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_'.$index));
114 114
     }
115 115
 
116 116
     /**
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
     {
137 137
         foreach ($this->router->getConfig()['templateExtension'] as $extension) {
138 138
             for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
139
-                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '', $this->router->route->getUrl()));
139
+                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_'.$i), '', $this->router->route->getUrl()));
140 140
                 $end = array_pop($url);
141
-                $url = implode('/', array_map('ucwords', $url)) . '/' . $end;
142
-                if (is_file(($template = rtrim($this->router->collection->getRoutes('view_dir_' . $i), '/') . $url . $extension))) {
141
+                $url = implode('/', array_map('ucwords', $url)).'/'.$end;
142
+                if (is_file(($template = rtrim($this->router->collection->getRoutes('view_dir_'.$i), '/').$url.$extension))) {
143 143
                     $this->request['collection_index'] = $i;
144 144
                     return [
145 145
                         'dispatcher' => $this->dispatcher['isTemplate'],
@@ -161,11 +161,11 @@  discard block
 block discarded – undo
161 161
         $routes = array_slice(explode('/', $this->router->route->getUrl()), 1);
162 162
         $i = 0;
163 163
         do {
164
-            $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) ? array_slice($routes, 1) : $routes;
164
+            $route = ('/'.$routes[0] == $this->router->collection->getRoutes('prefix_'.$i)) ? array_slice($routes, 1) : $routes;
165 165
             if (isset($route[0])) {
166
-                $class = (class_exists($this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'))
167
-                    ? $this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'
168
-                    : ucfirst($route[0]) . 'Controller';
166
+                $class = (class_exists($this->router->collection->getRoutes('ctrl_namespace_'.$i).ucfirst($route[0]).'Controller'))
167
+                    ? $this->router->collection->getRoutes('ctrl_namespace_'.$i).ucfirst($route[0]).'Controller'
168
+                    : ucfirst($route[0]).'Controller';
169 169
                 $route[1] = isset($route[1]) ? $route[1] : 'index';
170 170
                 if (method_exists($class, $route[1])) {
171 171
                     $this->request['parameters'] = array_slice($route, 2);
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                 }
180 180
             }
181 181
             ++$i;
182
-        } while ($i < $this->router->collection->countRoutes);
182
+        }while ($i < $this->router->collection->countRoutes);
183 183
         return false;
184 184
     }
185 185
 
Please login to merge, or discard this patch.