View GitHub Repository routing

Schedule Inspection
Subscribe
Completed
Push — master ( 5d4ad8...2aa3b5 )
by Sinnarasa
04:30
created
Status
Category
Toggle Patches
src/Routing/Middleware.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46 
                 if (is_array($blocks)) {
47 47 
                     foreach ($blocks as $block)
48 48 
                         if (class_exists($block))
49 
-                            if($this->callHandler($block) == false) return false;
49 
+                            if ($this->callHandler($block) == false) return false;
50 50 
                 }
51 51 
                 elseif (is_string($blocks) && class_exists($blocks))
52 52 
                     return $this->callHandler($blocks);
 
@@ -63,10 +63,10 @@  discard block
 
 block discarded – undo
63 63 
             $ctrl = str_replace('\\', '/', $this->router->route->getTarget('controller'));
64 64 
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
65 65 
                 $classes = $this->router->collection->middleware['class_middleware'][$ctrl];
66 
-                if(is_array($classes)){
66 
+                if (is_array($classes)) {
67 67 
                     foreach ($classes as $class)
68 
-                        if($this->callHandler($class) == false)return false;
69 
-                }elseif(is_string($classes))
68 
+                        if ($this->callHandler($class) == false)return false;
69 
+                }elseif (is_string($classes))
70 70 
                     return $this->callHandler($classes);
71 71 
             }
72 72 
         }
 
@@ -81,10 +81,10 @@  discard block
 
 block discarded – undo
81 81 
         if (isset($this->router->collection->middleware['route_middleware']))
82 82 
             if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
83 83 
                 $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
84 
-                if(is_array($classes)){
84 
+                if (is_array($classes)) {
85 85 
                     foreach ($classes as $class)
86 
-                        if($this->callHandler($class) == false)return false;
87 
-                }elseif(is_string($classes))
86 
+                        if ($this->callHandler($class) == false)return false;
87 
+                }elseif (is_string($classes))
88 88 
                     return $this->callHandler($classes);
89 89 
             }
90 90 
         return null;
 
@@ -94,8 +94,8 @@  discard block
 
 block discarded – undo
94 94 
      * @param $class
95 95 
      * @return mixed
96 96 
      */
97 
-    private function callHandler($class){
98 
-        $instance = call_user_func($this->router->getConfig()['di'],$class);
97 
+    private function callHandler($class) {
98 
+        $instance = call_user_func($this->router->getConfig()['di'], $class);
99 99 
         if (method_exists($instance, 'handle')) {
100 100 
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
101 101 
             $dependencies = [];
 
@@ -112,8 +112,8 @@  discard block
 
 block discarded – undo
112 112 
      * @param $class
113 113 
      * @return Route|RouteCollection|Router|mixed
114 114 
      */
115 
-    private function getClass($class){
116 
-        switch($class){
115 
+    private function getClass($class) {
116 
+        switch ($class) {
117 117 
             case 'JetFire\Routing\Route':
118 118 
                 return $this->router->route;
119 119 
             case 'JetFire\Routing\Router':
 
@@ -121,7 +121,7 @@  discard block
 
 block discarded – undo
121 121 
             case 'JetFire\Routing\RouteCollection':
122 122 
                 return $this->router->collection;
123 123 
             default:
124 
-                return call_user_func_array($this->router->getConfig()['di'],[$class]);
124 
+                return call_user_func_array($this->router->getConfig()['di'], [$class]);
125 125 
         }
126 126 
     }
127 127 
 }
Please login to merge, or discard this patch.
Braces   +35 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -29,9 +29,10 @@  discard block
 
 block discarded – undo
29 29 
      */
30 30 
     public function globalMiddleware()
31 31 
     {
32 
-        if (isset($this->router->collection->middleware['global_middleware']))
33 
-            foreach ($this->router->collection->middleware['global_middleware'] as $class)
34 
-                if (class_exists($class)) return $this->callHandler($class);
32 
+        if (isset($this->router->collection->middleware['global_middleware'])) {
33 
+                    foreach ($this->router->collection->middleware['global_middleware'] as $class)
34 
+                if (class_exists($class)) return $this->callHandler($class);
35 
+        }
35 36 
         return null;
36 37 
     }
37 38 
 
@@ -40,16 +41,18 @@  discard block
 
 block discarded – undo
40 41 
      */
41 42 
     public function blockMiddleware()
42 43 
     {
43 
-        if (isset($this->router->collection->middleware['block_middleware']))
44 
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
45 
-                $blocks = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
44 
+        if (isset($this->router->collection->middleware['block_middleware'])) {
45 
+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
46 
+                $blocks = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
47 
+        }
46 48 
                 if (is_array($blocks)) {
47 
-                    foreach ($blocks as $block)
48 
-                        if (class_exists($block))
49 
-                            if($this->callHandler($block) == false) return false;
50 
-                }
51 
-                elseif (is_string($blocks) && class_exists($blocks))
52 
-                    return $this->callHandler($blocks);
49 
+                    foreach ($blocks as $block) {
50 
+                                            if (class_exists($block))
51 
+                            if($this->callHandler($block) == false) return false;
52 
+                    }
53 
+                } elseif (is_string($blocks) && class_exists($blocks)) {
54 
+                                    return $this->callHandler($blocks);
55 
+                }
53 56 
             }
54 57 
         return null;
55 58 
     }
 
@@ -64,10 +67,12 @@  discard block
 
 block discarded – undo
64 67 
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
65 68 
                 $classes = $this->router->collection->middleware['class_middleware'][$ctrl];
66 69 
                 if(is_array($classes)){
67 
-                    foreach ($classes as $class)
68 
-                        if($this->callHandler($class) == false)return false;
69 
-                }elseif(is_string($classes))
70 
-                    return $this->callHandler($classes);
70 
+                    foreach ($classes as $class) {
71 
+                                            if($this->callHandler($class) == false)return false;
72 
+                    }
73 
+                } elseif(is_string($classes)) {
74 
+                                    return $this->callHandler($classes);
75 
+                }
71 76 
             }
72 77 
         }
73 78 
         return null;
 
@@ -78,14 +83,17 @@  discard block
 
 block discarded – undo
78 83 
      */
79 84 
     public function routeMiddleware()
80 85 
     {
81 
-        if (isset($this->router->collection->middleware['route_middleware']))
82 
-            if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
83 
-                $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
86 
+        if (isset($this->router->collection->middleware['route_middleware'])) {
87 
+                    if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
88 
+                $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
89 
+        }
84 90 
                 if(is_array($classes)){
85 
-                    foreach ($classes as $class)
86 
-                        if($this->callHandler($class) == false)return false;
87 
-                }elseif(is_string($classes))
88 
-                    return $this->callHandler($classes);
91 
+                    foreach ($classes as $class) {
92 
+                                            if($this->callHandler($class) == false)return false;
93 
+                    }
94 
+                } elseif(is_string($classes)) {
95 
+                                    return $this->callHandler($classes);
96 
+                }
89 97 
             }
90 98 
         return null;
91 99 
     }
 
@@ -99,9 +107,10 @@  discard block
 
 block discarded – undo
99 107 
         if (method_exists($instance, 'handle')) {
100 108 
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
101 109 
             $dependencies = [];
102 
-            foreach ($reflectionMethod->getParameters() as $arg)
103 
-                if (!is_null($arg->getClass()))
104 
-                    $dependencies[] = $this->getClass($arg->getClass()->name);
110 
+            foreach ($reflectionMethod->getParameters() as $arg) {
111 
+                            if (!is_null($arg->getClass()))
112 
+                    $dependencies[] = $this->getClass($arg->getClass()->name);
113 
+            }
105 114 
             $dependencies = array_merge($dependencies, [$this->router->route]);
106 115 
             return $reflectionMethod->invokeArgs($instance, $dependencies);
107 116 
         }
Please login to merge, or discard this patch.
src/Routing/Matcher/ArrayMatcher.php 1 patch
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -25,7 +25,7 @@  discard block
 
 block discarded – undo
25 25 
     /**
26 26 
      * @var array
27 27 
      */
28 
-    private $resolver = ['isClosureAndTemplate','isControllerAndTemplate','isTemplate'];
28 
+    private $resolver = ['isClosureAndTemplate', 'isControllerAndTemplate', 'isTemplate'];
29 29
30 30 
     /**
31 31 
      * @var array
 
@@ -34,8 +34,8 @@  discard block
 
 block discarded – undo
34 34 
         'isClosure' => 'JetFire\Routing\Dispatcher\ClosureDispatcher',
35 35 
         'isController' => 'JetFire\Routing\Dispatcher\ControllerDispatcher',
36 36 
         'isTemplate' => 'JetFire\Routing\Dispatcher\TemplateDispatcher',
37 
-        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
38 
-        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
37 
+        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
38 
+        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
39 39 
     ];
40 40
41 41 
     /**
 
@@ -49,14 +49,14 @@  discard block
 
 block discarded – undo
49 49 
     /**
50 50 
      * @param array $resolver
51 51 
      */
52 
-    public function setResolver($resolver = []){
52 
+    public function setResolver($resolver = []) {
53 53 
         $this->resolver = $resolver;
54 54 
     }
55 55
56 56 
     /**
57 57 
      * @param string $resolver
58 58 
      */
59 
-    public function addResolver($resolver){
59 
+    public function addResolver($resolver) {
60 60 
         $this->resolver[] = $resolver;
61 61 
     }
62 62 
 
@@ -71,7 +71,7 @@  discard block
 
 block discarded – undo
71 71 
     /**
72 72 
      * @param array $dispatcher
73 73 
      */
74 
-    public function setDispatcher($dispatcher = []){
74 
+    public function setDispatcher($dispatcher = []) {
75 75 
         $this->dispatcher = $dispatcher;
76 76 
     }
77 77 
 
@@ -81,7 +81,7 @@  discard block
 
 block discarded – undo
81 81 
      * @return mixed|void
82 82 
      * @internal param array $dispatcher
83 83 
      */
84 
-    public function addDispatcher($method,$class){
84 
+    public function addDispatcher($method, $class) {
85 85 
         $this->dispatcher[$method] = $class;
86 86 
     }
87 87 
 
@@ -92,17 +92,17 @@  discard block
 
 block discarded – undo
92 92 
     {
93 93 
         $this->request = [];
94 94 
         for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
95 
-            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_' . $i) != '') ? $this->router->collection->getRoutes('prefix_' . $i) : '';
96 
-            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_' . $i) != '') ? $this->router->collection->getRoutes('subdomain_' . $i) : '';
97 
-            foreach ($this->router->collection->getRoutes('routes_' . $i) as $route => $params) {
95 
+            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_'.$i) != '') ? $this->router->collection->getRoutes('prefix_'.$i) : '';
96 
+            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_'.$i) != '') ? $this->router->collection->getRoutes('subdomain_'.$i) : '';
97 
+            foreach ($this->router->collection->getRoutes('routes_'.$i) as $route => $params) {
98 98 
                 $this->request['params'] = $params;
99 99 
                 $this->request['collection_index'] = $i;
100 
-                if($this->checkSubdomain($route)) {
100 
+                if ($this->checkSubdomain($route)) {
101 101 
                     $route = strstr($route, '/');
102 
-                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
103 
-                    if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
102 
+                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/'.trim(trim($this->request['prefix'], '/').'/'.trim($route, '/'), '/'));
103 
+                    if ($this->routeMatch('#^'.$this->request['route'].'$#')) {
104 104 
                         $this->setCallback();
105 
-                        if(!is_null($response = $this->generateTarget())) return $response;
105 
+                        if (!is_null($response = $this->generateTarget())) return $response;
106 106 
                     }
107 107 
                 }
108 108 
             }
 
@@ -114,20 +114,20 @@  discard block
 
 block discarded – undo
114 114 
      * @param $route
115 115 
      * @return bool
116 116 
      */
117 
-    private function checkSubdomain($route){
118 
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
119 
-        $host = explode(':',$host)[0];
117 
+    private function checkSubdomain($route) {
118 
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
119 
+        $host = explode(':', $host)[0];
120 120 
         $domain = $this->router->collection->getDomain($url);
121 
-        if(!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'],'.').'.'.$domain.$route;
122 
-        if($route[0] == '/'){
121 
+        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.').'.'.$domain.$route;
122 
+        if ($route[0] == '/') {
123 123 
             return ($host != $domain) ? false : true;
124 
-        }elseif($route[0] != '/' && $host != $domain){
124 
+        }elseif ($route[0] != '/' && $host != $domain) {
125 125 
             $route = substr($route, 0, strpos($route, "/"));
126 126 
             $route = str_replace('{host}', $domain, $route);
127 127 
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
128 
-            if (preg_match('#^' . $route . '$#', $host, $this->request['called_subdomain'])) {
128 
+            if (preg_match('#^'.$route.'$#', $host, $this->request['called_subdomain'])) {
129 129 
                 $this->request['called_subdomain'] = array_shift($this->request['called_subdomain']);
130 
-                $this->request['subdomain'] = str_replace('.'.$domain,'',$host);
130 
+                $this->request['subdomain'] = str_replace('.'.$domain, '', $host);
131 131 
                 return true;
132 132 
             }
133 133 
         }
 
@@ -140,7 +140,7 @@  discard block
 
 block discarded – undo
140 140 
     private function subdomainMatch()
141 141 
     {
142 142 
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
143 
-            return '(' . $this->request['params']['subdomain'] . ')';
143 
+            return '('.$this->request['params']['subdomain'].')';
144 144 
         }
145 145 
         return '([^/]+)';
146 146 
     }
 
@@ -153,7 +153,7 @@  discard block
 
 block discarded – undo
153 153 
     {
154 154 
         if (is_array($this->request['params']) && isset($this->request['params']['arguments'][$match[1]])) {
155 155 
             $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->request['params']['arguments'][$match[1]]);
156 
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
156 
+            return '('.$this->request['params']['arguments'][$match[1]].')';
157 157 
         }
158 158 
         return '([^/]+)';
159 159 
     }
 
@@ -181,7 +181,7 @@  discard block
 
 block discarded – undo
181 181 
      */
182 182 
     private function generateTarget()
183 183 
     {
184 
-        if($this->validMethod()) {
184 
+        if ($this->validMethod()) {
185 185 
             foreach ($this->resolver as $resolver) {
186 186 
                 if (is_array($target = call_user_func_array([$this, $resolver], [$this->router->route->getCallback()]))) {
187 187 
                     $this->setTarget($target);
 
@@ -200,7 +200,7 @@  discard block
 
 block discarded – undo
200 200 
     /**
201 201 
      * @param array $target
202 202 
      */
203 
-    public function setTarget($target = []){
203 
+    public function setTarget($target = []) {
204 204 
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
205 205 
         $this->router->route->setDetail($this->request);
206 206 
         $this->router->route->setTarget($target);
 
@@ -211,9 +211,9 @@  discard block
 
 block discarded – undo
211 211 
     /**
212 212 
      *
213 213 
      */
214 
-    private function setCallback(){
214 
+    private function setCallback() {
215 215 
         if (isset($this->request['params'])) {
216 
-            if(is_callable($this->request['params']))
216 
+            if (is_callable($this->request['params']))
217 217 
                 $this->router->route->setCallback($this->request['params']);
218 218 
             else {
219 219 
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
 
@@ -230,7 +230,7 @@  discard block
 
 block discarded – undo
230 230 
      */
231 231 
     public function validMethod()
232 232 
     {
233 
-        if(is_callable($this->request['params']))return true;
233 
+        if (is_callable($this->request['params']))return true;
234 234 
         if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
235 235 
             return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;
236 236 
         $method = (isset($this->request['params']['method'])) ? $this->request['params']['method'] : ['GET'];
 
@@ -242,10 +242,10 @@  discard block
 
 block discarded – undo
242 242 
      * @return array|bool
243 243 
      * @throws \Exception
244 244 
      */
245 
-    public function isClosureAndTemplate($callback){
246 
-        if(is_array($cls = $this->isClosure($callback))) {
245 
+    public function isClosureAndTemplate($callback) {
246 
+        if (is_array($cls = $this->isClosure($callback))) {
247 247 
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
248 
-                return array_merge(array_merge($cls, $tpl),[
248 
+                return array_merge(array_merge($cls, $tpl), [
249 249 
                     'dispatcher' => $this->dispatcher['isClosureAndTemplate']
250 250 
                 ]);
251 251 
             }
 
@@ -259,10 +259,10 @@  discard block
 
 block discarded – undo
259 259 
      * @return array|bool
260 260 
      * @throws \Exception
261 261 
      */
262 
-    public function isControllerAndTemplate($callback){
263 
-        if(is_array($ctrl = $this->isController($callback))) {
262 
+    public function isControllerAndTemplate($callback) {
263 
+        if (is_array($ctrl = $this->isController($callback))) {
264 264 
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
265 
-                return array_merge(array_merge($ctrl, $tpl),[
265 
+                return array_merge(array_merge($ctrl, $tpl), [
266 266 
                     'dispatcher' => $this->dispatcher['isControllerAndTemplate']
267 267 
                 ]);
268 268 
             }
 
@@ -297,19 +297,19 @@  discard block
 
 block discarded – undo
297 297 
         if (is_string($callback) && strpos($callback, '@') !== false) {
298 298 
             $routes = explode('@', $callback);
299 299 
             if (!isset($routes[1])) $routes[1] = 'index';
300 
-            if ($routes[1] == '{method}'){
301 
-                $this->request['parameters'] = explode('/',str_replace(str_replace('*','',$this->request['route']),'',$this->router->route->getUrl()));
300 
+            if ($routes[1] == '{method}') {
301 
+                $this->request['parameters'] = explode('/', str_replace(str_replace('*', '', $this->request['route']), '', $this->router->route->getUrl()));
302 302 
                 $routes[1] = $this->request['parameters'][0];
303 303 
                 array_shift($this->request['parameters']);
304 
-                if(preg_match('/[A-Z]/', $routes[1])) return false;
305 
-                $routes[1] = lcfirst(str_replace(' ','',ucwords(str_replace('-',' ',$routes[1]))));
304 
+                if (preg_match('/[A-Z]/', $routes[1])) return false;
305 
+                $routes[1] = lcfirst(str_replace(' ', '', ucwords(str_replace('-', ' ', $routes[1]))));
306 306 
             }
307 307 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
308 308 
             $class = (class_exists($routes[0]))
309 309 
                 ? $routes[0]
310 
-                : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
310 
+                : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
311 311 
             if (!class_exists($class))
312 
-                throw new \Exception('Class "' . $class . '." is not found');
312 
+                throw new \Exception('Class "'.$class.'." is not found');
313 313 
             if (method_exists($class, $routes[1])) {
314 314 
                 return [
315 315 
                     'dispatcher' => $this->dispatcher['isController'],
 
@@ -319,7 +319,7 @@  discard block
 
 block discarded – undo
319 319 
                 ];
320 320 
             }
321 321 
             if (!strpos($callback, '{method}') !== false)
322 
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
322 
+                throw new \Exception('The required method "'.$routes[1].'" is not found in "'.$class.'"');
323 323 
         }
324 324 
         return false;
325 325 
     }
 
@@ -331,25 +331,25 @@  discard block
 
 block discarded – undo
331 331 
      */
332 332 
     public function isTemplate($callback)
333 333 
     {
334 
-        if(is_string($callback) && strpos($callback, '@') === false) {
334 
+        if (is_string($callback) && strpos($callback, '@') === false) {
335 335 
             $path = trim($callback, '/');
336 336 
             $extension = substr(strrchr($path, "."), 1);
337 337 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
338 
-            $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
338 
+            $viewDir = $this->router->collection->getRoutes('view_dir_'.$index);
339 339 
             $target = null;
340 
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path)))
340 
+            if (in_array('.'.$extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir.$path) || is_file($fullPath = $path)))
341 341 
                 $target = $fullPath;
342 342 
             else {
343 343 
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
344 
-                    if (is_file($fullPath = $viewDir . $path . $ext) || is_file($fullPath = $path . $ext)) {
344 
+                    if (is_file($fullPath = $viewDir.$path.$ext) || is_file($fullPath = $path.$ext)) {
345 345 
                         $target = $fullPath;
346 346 
                         $extension = substr(strrchr($ext, "."), 1);
347 347 
                         break;
348 348 
                     }
349 349 
                 }
350 350 
             }
351 
-            if(is_null($target))
352 
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
351 
+            if (is_null($target))
352 
+                throw new \Exception('Template file "'.$path.'" is not found in "'.$viewDir.'"');
353 353 
             return [
354 354 
                 'dispatcher' => $this->dispatcher['isTemplate'],
355 355 
                 'template'   => $target,
Please login to merge, or discard this patch.
src/Routing/Dispatcher/ControllerDispatcher.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -27,7 +27,7 @@  discard block
 
 block discarded – undo
27 27 
     /**
28 28 
      * @param Route $route
29 29 
      */
30 
-    public function __construct(Route $route,ResponseInterface $response)
30 
+    public function __construct(Route $route, ResponseInterface $response)
31 31 
     {
32 32 
         $this->route = $route;
33 33 
         $this->response = $response;
 
@@ -48,13 +48,13 @@  discard block
 
 block discarded – undo
48 48 
                 ? $count++
49 49 
                 : $dependencies[] = call_user_func_array($this->route->getTarget('di'), [$arg->getClass()->name]);
50 50 
         }
51 
-        if($count == count($this->route->getParameters()) || ($this->route->getParameters() == '' && $count == 0)) {
51 
+        if ($count == count($this->route->getParameters()) || ($this->route->getParameters() == '' && $count == 0)) {
52 52 
             $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
53 53 
             if ($this->response->getStatusCode() == 202)
54 54 
                 $this->response->setStatusCode(200);
55 55 
             if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) $this->route->addTarget('data', $content);
56 56 
             elseif (!is_null($content)) $this->response->setContent($content);
57 
-        }else
57 
+        } else
58 58 
             $this->response->setStatusCode(404);
59 59 
     }
60 60 
 
@@ -67,17 +67,17 @@  discard block
 
 block discarded – undo
67 67 
     {
68 68 
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
69 69 
         if (!$reflector->isInstantiable())
70 
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
70 
+            throw new \Exception('Target ['.$this->route->getTarget('controller').'] is not instantiable.');
71 71 
         $constructor = $reflector->getConstructor();
72 72 
         if (is_null($constructor)) {
73 73 
             $class = $this->route->getTarget('controller');
74 
-            return call_user_func_array($this->route->getTarget('di'),[$class]);
74 
+            return call_user_func_array($this->route->getTarget('di'), [$class]);
75 75 
         }
76 76 
         $dependencies = $constructor->getParameters();
77 77 
         $arguments = [];
78 78 
         foreach ($dependencies as $dep) {
79 79 
             $class = $dep->getClass()->name;
80 
-            array_push($arguments, call_user_func_array($this->route->getTarget('di'),[$class]));
80 
+            array_push($arguments, call_user_func_array($this->route->getTarget('di'), [$class]));
81 81 
         }
82 82 
         return $reflector->newInstanceArgs($arguments);
83 83 
     }
Please login to merge, or discard this patch.
src/Routing/RouteCollection.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch 
@@ -47,12 +47,12 @@  discard block
 
 block discarded – undo
47 47 
     public function addRoutes($routes = null, $options = [])
48 48 
     {
49 49 
         if (!is_null($routes) && !is_array($routes)) {
50 
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
51 
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
50 
+            if (strpos($routes, '.php') === false) $routes = trim($routes, '/').'/';
51 
+            if (is_file($routes.'/routes.php') && is_array($routesFile = include $routes.'/routes.php')) $routes = $routesFile;
52 52 
             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
53 
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');
53 
+            else throw new \InvalidArgumentException('Argument for "'.get_called_class().'" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
54 54 
         }
55 
-        $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
55 
+        $this->routes['routes_'.$this->countRoutes] = is_array($routes) ? $routes : [];
56 56 
         $this->setRoutes($options, $this->countRoutes);
57 57 
         $this->countRoutes++;
58 58 
     }
 
@@ -76,10 +76,10 @@  discard block
 
 block discarded – undo
76 76 
         if (is_array($args)) {
77 77 
             $nbrArgs = count($args);
78 78 
             for ($i = 0; $i < $nbrArgs; ++$i)
79 
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
79 
+                $this->routes['prefix_'.$i] = '/'.trim($args[$i], '/');
80 80 
         } elseif (is_string($args))
81 81 
             for ($i = 0; $i < $this->countRoutes; ++$i)
82 
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
82 
+                $this->routes['prefix_'.$i] = '/'.trim($args, '/');
83 83 
         if ($this->countRoutes == 0) $this->countRoutes++;
84 84 
     }
85 85 
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
         for ($i = 0; $i < $nbrArgs; ++$i) {
93 93 
             if (is_array($args[$i])) {
94 94 
                 $this->setRoutes($args[$i], $i);
95 
-                if (!isset($this->routes['routes_' . $i])) $this->routes['routes_' . $i] = [];
95 
+                if (!isset($this->routes['routes_'.$i])) $this->routes['routes_'.$i] = [];
96 96 
             }
97 97 
         }
98 98 
         if ($this->countRoutes == 0) $this->countRoutes++;
 
@@ -104,11 +104,11 @@  discard block
 
 block discarded – undo
104 104 
      */
105 105 
     private function setRoutes($args = [], $i)
106 106 
     {
107 
-        $this->routes['block_' . $i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/') . '/' : '';
108 
-        $this->routes['view_dir_' . $i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/') . '/' : '';
109 
-        $this->routes['ctrl_namespace_' . $i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\') . '\\' : '';
110 
-        $this->routes['prefix_' . $i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/' . trim($args['prefix'], '/') : '';
111 
-        $this->routes['subdomain_' . $i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
107 
+        $this->routes['block_'.$i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/').'/' : '';
108 
+        $this->routes['view_dir_'.$i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/').'/' : '';
109 
+        $this->routes['ctrl_namespace_'.$i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\').'\\' : '';
110 
+        $this->routes['prefix_'.$i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/'.trim($args['prefix'], '/') : '';
111 
+        $this->routes['subdomain_'.$i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
112 112 
     }
113 113
114 114 
     /**
 
@@ -130,30 +130,30 @@  discard block
 
 block discarded – undo
130 130 
      */
131 131 
     public function generateRoutesPath()
132 132 
     {
133 
-        $root = ($protocol = (isset($_SERVER['REQUEST_SCHEME'])?$_SERVER['REQUEST_SCHEME']:'http')) . '://' . ($domain = $_SERVER['SERVER_NAME']) . (!empty($_SERVER['SERVER_PORT']) ? ':'.$_SERVER['SERVER_PORT'] : '' ) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
133 
+        $root = ($protocol = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http')).'://'.($domain = $_SERVER['SERVER_NAME']).(!empty($_SERVER['SERVER_PORT']) ? ':'.$_SERVER['SERVER_PORT'] : '').str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
134 134 
         if (strpos($domain, ($new_domain = $this->getDomain($root))) !== false)
135 135 
             $root = str_replace($domain, $new_domain, $root);
136 136 
         $count = 0;
137 137 
         for ($i = 0; $i < $this->countRoutes; ++$i) {
138 
-            $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
139 
-            $subdomain = (isset($this->routes['subdomain_' . $i])) ? $this->routes['subdomain_' . $i] : '';
140 
-            $url = (!empty($subdomain)) ? str_replace($protocol.'://',$protocol.'://'.$subdomain.'.' ,$root) : $root;
141 
-            if (isset($this->routes['routes_' . $i]))
142 
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
138 
+            $prefix = (isset($this->routes['prefix_'.$i])) ? $this->routes['prefix_'.$i] : '';
139 
+            $subdomain = (isset($this->routes['subdomain_'.$i])) ? $this->routes['subdomain_'.$i] : '';
140 
+            $url = (!empty($subdomain)) ? str_replace($protocol.'://', $protocol.'://'.$subdomain.'.', $root) : $root;
141 
+            if (isset($this->routes['routes_'.$i]))
142 
+                foreach ($this->routes['routes_'.$i] as $route => $dependencies) {
143 143 
                     if (is_array($dependencies) && isset($dependencies['use']))
144 
-                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
144 
+                        $use = (is_callable($dependencies['use'])) ? 'closure-'.$count : trim($dependencies['use'], '/');
145 145 
                     elseif (!is_array($dependencies))
146 
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
146 
+                        $use = (is_callable($dependencies)) ? 'closure-'.$count : trim($dependencies, '/');
147 147 
                     else
148 148 
                         $use = $route;
149 149 
                     if (isset($route[0]) && $route[0] == '/') {
150 150 
                         (!is_callable($dependencies) && isset($dependencies['name']))
151 
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $url . $prefix . $route
152 
-                            : $this->routesByName[$use] = $url . $prefix . $route;
151 
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $url.$prefix.$route
152 
+                            : $this->routesByName[$use] = $url.$prefix.$route;
153 153 
                     } else {
154 154 
                         (!is_callable($dependencies) && isset($dependencies['name']))
155 
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix
156 
-                            : $this->routesByName[$use] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix;
155 
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix
156 
+                            : $this->routesByName[$use] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix;
157 157 
                     }
158 158 
                     $count++;
159 159 
                 }
 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186 
         foreach ($this->routesByName as $key => $route) {
187 187 
             $param = explode('#', $key);
188 188 
             $route = str_replace('{subdomain}', $subdomain, $route);
189 
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
189 
+            foreach ($params as $key2 => $value) $route = str_replace(':'.$key2, $value, $route);
190 190 
             if ($param[0] == trim($name, '/')) return $route;
191 191 
             else if (isset($param[1]) && $param[1] == $name) return $route;
192 192 
         }
Please login to merge, or discard this patch.