Completed
Push — master ( d1c5d4...5d4ad8 )
by Sinnarasa
05:27
created
src/Routing/Dispatcher/DispatcherInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
     /**
16 16
      * @param Route $route
17 17
      */
18
-    public function __construct(Route $route,ResponseInterface $response);
18
+    public function __construct(Route $route, ResponseInterface $response);
19 19
 
20 20
     /**
21 21
      * @return mixed
Please login to merge, or discard this patch.
src/Routing/Route.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
      */
128 128
     public function setDetail($detail)
129 129
     {
130
-        $this->detail = array_merge($detail,$this->detail);
130
+        $this->detail = array_merge($detail, $this->detail);
131 131
     }
132 132
 
133 133
     /**
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
173 173
     /**
174 174
      * @return array
175 175
      */
176
-    public function getData(){
177
-        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data']))?$this->getDetail()['data']:[];
176
+    public function getData() {
177
+        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data'])) ? $this->getDetail()['data'] : [];
178 178
     }
179 179
 
180 180
     /**
Please login to merge, or discard this patch.
src/Routing/Matcher/MatcherInterface.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,5 +41,5 @@
 block discarded – undo
41 41
      * @param $class
42 42
      * @return mixed
43 43
      */
44
-    public function addDispatcher($method,$class);
44
+    public function addDispatcher($method, $class);
45 45
 }
Please login to merge, or discard this patch.
src/Routing/Middleware.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
      * @param $class
77 77
      * @return mixed
78 78
      */
79
-    private function callHandler($class){
80
-        $instance = call_user_func($this->router->getConfig()['di'],$class);
79
+    private function callHandler($class) {
80
+        $instance = call_user_func($this->router->getConfig()['di'], $class);
81 81
         if (method_exists($instance, 'handle')) {
82 82
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
83 83
             $dependencies = [];
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
93 93
      * @param $class
94 94
      * @return Route|RouteCollection|Router|mixed
95 95
      */
96
-    private function getClass($class){
97
-        switch($class){
96
+    private function getClass($class) {
97
+        switch ($class) {
98 98
             case 'JetFire\Routing\Route':
99 99
                 return $this->router->route;
100 100
                 break;
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
                 return $this->router->collection;
106 106
                 break;
107 107
             default:
108
-                return call_user_func_array($this->router->getConfig()['di'],[$class]);
108
+                return call_user_func_array($this->router->getConfig()['di'], [$class]);
109 109
                 break;
110 110
         }
111 111
     }
Please login to merge, or discard this patch.
src/Routing/Dispatcher/ClosureDispatcher.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     /**
26 26
      * @param Route $route
27 27
      */
28
-    public function __construct(Route $route,ResponseInterface $response)
28
+    public function __construct(Route $route, ResponseInterface $response)
29 29
     {
30 30
         $this->route = $route;
31 31
         $this->response = $response;
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
             $this->response->setHeaders(['Content-Type' => 'text/html']);
43 43
         }
44 44
         $params = ($this->route->getParameters() == '') ? [] : $this->route->getParameters();
45
-        if(is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) $this->route->addTarget('data',$content);
46
-        elseif(!is_null($content)) $this->response->setContent($content);
45
+        if (is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) $this->route->addTarget('data', $content);
46
+        elseif (!is_null($content)) $this->response->setContent($content);
47 47
     }
48 48
 
49 49
 }
Please login to merge, or discard this patch.
src/Routing/Dispatcher/TemplateDispatcher.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
     /**
37 37
      * @param Route $route
38 38
      */
39
-    public function __construct(Route $route,ResponseInterface $response)
39
+    public function __construct(Route $route, ResponseInterface $response)
40 40
     {
41 41
         $this->route = $route;
42 42
         $this->response = $response;
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
             $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));
54 54
         else {
55 55
             ob_start();
56
-            if(isset($this->route->getTarget()['data']))extract($this->route->getTarget('data'));
57
-            if(isset($this->route->getParams()['data']))extract($this->route->getParams()['data']);
56
+            if (isset($this->route->getTarget()['data']))extract($this->route->getTarget('data'));
57
+            if (isset($this->route->getParams()['data']))extract($this->route->getParams()['data']);
58 58
             require($this->route->getTarget('template'));
59 59
             $this->response->setContent(ob_get_clean());
60 60
         }
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
     /**
64 64
      * @param $extension
65 65
      */
66
-    public function setContentType($extension){
66
+    public function setContentType($extension) {
67 67
         $this->response->setStatusCode(200);
68 68
         isset($this->types[$extension])
69 69
             ? $this->response->setHeaders(['Content-Type' => $this->types[$extension]])
Please login to merge, or discard this patch.
src/Routing/Response.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
  * Class Response
8 8
  * @package JetFire\Routing
9 9
  */
10
-class Response implements ResponseInterface{
10
+class Response implements ResponseInterface {
11 11
 
12 12
     /**
13 13
      * @var array
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
     public static $statusTexts = array(
54 54
         100 => 'Continue',
55 55
         101 => 'Switching Protocols',
56
-        102 => 'Processing',            // RFC2518
56
+        102 => 'Processing', // RFC2518
57 57
         200 => 'OK',
58 58
         201 => 'Created',
59 59
         202 => 'Accepted',
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
         204 => 'No Content',
62 62
         205 => 'Reset Content',
63 63
         206 => 'Partial Content',
64
-        207 => 'Multi-Status',          // RFC4918
65
-        208 => 'Already Reported',      // RFC5842
66
-        226 => 'IM Used',               // RFC3229
64
+        207 => 'Multi-Status', // RFC4918
65
+        208 => 'Already Reported', // RFC5842
66
+        226 => 'IM Used', // RFC3229
67 67
         300 => 'Multiple Choices',
68 68
         301 => 'Moved Permanently',
69 69
         302 => 'Found',
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         304 => 'Not Modified',
72 72
         305 => 'Use Proxy',
73 73
         307 => 'Temporary Redirect',
74
-        308 => 'Permanent Redirect',    // RFC7238
74
+        308 => 'Permanent Redirect', // RFC7238
75 75
         400 => 'Bad Request',
76 76
         401 => 'Unauthorized',
77 77
         402 => 'Payment Required',
@@ -90,26 +90,26 @@  discard block
 block discarded – undo
90 90
         415 => 'Unsupported Media Type',
91 91
         416 => 'Range Not Satisfiable',
92 92
         417 => 'Expectation Failed',
93
-        418 => 'I\'m a teapot',                                               // RFC2324
94
-        422 => 'Unprocessable Entity',                                        // RFC4918
95
-        423 => 'Locked',                                                      // RFC4918
96
-        424 => 'Failed Dependency',                                           // RFC4918
97
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
98
-        426 => 'Upgrade Required',                                            // RFC2817
99
-        428 => 'Precondition Required',                                       // RFC6585
100
-        429 => 'Too Many Requests',                                           // RFC6585
101
-        431 => 'Request Header Fields Too Large',                             // RFC6585
93
+        418 => 'I\'m a teapot', // RFC2324
94
+        422 => 'Unprocessable Entity', // RFC4918
95
+        423 => 'Locked', // RFC4918
96
+        424 => 'Failed Dependency', // RFC4918
97
+        425 => 'Reserved for WebDAV advanced collections expired proposal', // RFC2817
98
+        426 => 'Upgrade Required', // RFC2817
99
+        428 => 'Precondition Required', // RFC6585
100
+        429 => 'Too Many Requests', // RFC6585
101
+        431 => 'Request Header Fields Too Large', // RFC6585
102 102
         500 => 'Internal Server Error',
103 103
         501 => 'Not Implemented',
104 104
         502 => 'Bad Gateway',
105 105
         503 => 'Service Unavailable',
106 106
         504 => 'Gateway Timeout',
107 107
         505 => 'HTTP Version Not Supported',
108
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
109
-        507 => 'Insufficient Storage',                                        // RFC4918
110
-        508 => 'Loop Detected',                                               // RFC5842
111
-        510 => 'Not Extended',                                                // RFC2774
112
-        511 => 'Network Authentication Required',                             // RFC6585
108
+        506 => 'Variant Also Negotiates (Experimental)', // RFC2295
109
+        507 => 'Insufficient Storage', // RFC4918
110
+        508 => 'Loop Detected', // RFC5842
111
+        510 => 'Not Extended', // RFC2774
112
+        511 => 'Network Authentication Required', // RFC6585
113 113
     );
114 114
 
115 115
     /**
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
      */
167 167
     public function sendHeaders()
168 168
     {
169
-        foreach($this->headers as $key => $content)
169
+        foreach ($this->headers as $key => $content)
170 170
             header($key.' : '.$content);
171 171
         http_response_code($this->getStatusCode());
172 172
         return $this;
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
@@ -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,11 +100,11 @@  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'] : '';
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 108
     }
109 109
 
110 110
     /**
@@ -126,30 +126,30 @@  discard block
 block discarded – undo
126 126
      */
127 127
     public function generateRoutesPath()
128 128
     {
129
-        $root = ($protocol = (isset($_SERVER['REQUEST_SCHEME'])?$_SERVER['REQUEST_SCHEME']:'http')) . '://' . ($domain = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])) . str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
129
+        $root = ($protocol = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http')).'://'.($domain = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])).str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']);
130 130
         if (strpos($domain, ($new_domain = $this->getDomain($root))) !== false)
131 131
             $root = str_replace($domain, $new_domain, $root);
132 132
         $count = 0;
133 133
         for ($i = 0; $i < $this->countRoutes; ++$i) {
134
-            $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
135
-            $subdomain = (isset($this->routes['subdomain_' . $i])) ? $this->routes['subdomain_' . $i] : '';
136
-            $url = (!empty($subdomain)) ? str_replace($protocol.'://',$protocol.'://'.$subdomain.'.' ,$root) : $root;
137
-            if (isset($this->routes['routes_' . $i]))
138
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
134
+            $prefix = (isset($this->routes['prefix_'.$i])) ? $this->routes['prefix_'.$i] : '';
135
+            $subdomain = (isset($this->routes['subdomain_'.$i])) ? $this->routes['subdomain_'.$i] : '';
136
+            $url = (!empty($subdomain)) ? str_replace($protocol.'://', $protocol.'://'.$subdomain.'.', $root) : $root;
137
+            if (isset($this->routes['routes_'.$i]))
138
+                foreach ($this->routes['routes_'.$i] as $route => $dependencies) {
139 139
                     if (is_array($dependencies) && isset($dependencies['use']))
140
-                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
140
+                        $use = (is_callable($dependencies['use'])) ? 'closure-'.$count : trim($dependencies['use'], '/');
141 141
                     elseif (!is_array($dependencies))
142
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
142
+                        $use = (is_callable($dependencies)) ? 'closure-'.$count : trim($dependencies, '/');
143 143
                     else
144 144
                         $use = $route;
145 145
                     if (isset($route[0]) && $route[0] == '/') {
146 146
                         (!is_callable($dependencies) && isset($dependencies['name']))
147
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $url . $prefix . $route
148
-                            : $this->routesByName[$use] = $url . $prefix . $route;
147
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $url.$prefix.$route
148
+                            : $this->routesByName[$use] = $url.$prefix.$route;
149 149
                     } else {
150 150
                         (!is_callable($dependencies) && isset($dependencies['name']))
151
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix
152
-                            : $this->routesByName[$use] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix;
151
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix
152
+                            : $this->routesByName[$use] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix;
153 153
                     }
154 154
                     $count++;
155 155
                 }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         foreach ($this->routesByName as $key => $route) {
183 183
             $param = explode('#', $key);
184 184
             $route = str_replace('{subdomain}', $subdomain, $route);
185
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
185
+            foreach ($params as $key2 => $value) $route = str_replace(':'.$key2, $value, $route);
186 186
             if ($param[0] == trim($name, '/')) return $route;
187 187
             else if (isset($param[1]) && $param[1] == $name) return $route;
188 188
         }
Please login to merge, or discard this patch.
src/Routing/Matcher/ArrayMatcher.php 2 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
     }
159 159
 
160 160
     /**
161
-     * @param $regex
161
+     * @param string $regex
162 162
      * @return bool
163 163
      */
164 164
     private function routeMatch($regex)
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
     }
177 177
 
178 178
     /**
179
-     * @return bool
179
+     * @return null|boolean
180 180
      */
181 181
     private function generateTarget()
182 182
     {
Please login to merge, or discard this patch.
Spacing   +47 added lines, -47 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,19 +114,19 @@  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['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
117
+    private function checkSubdomain($route) {
118
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
119 119
         $domain = $this->router->collection->getDomain($url);
120
-        if(!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'],'.').'.'.$domain.$route;
121
-        if($route[0] == '/'){
120
+        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.').'.'.$domain.$route;
121
+        if ($route[0] == '/') {
122 122
             return ($host != $domain) ? false : true;
123
-        }elseif($route[0] != '/' && $host != $domain){
123
+        }elseif ($route[0] != '/' && $host != $domain) {
124 124
             $route = substr($route, 0, strpos($route, "/"));
125 125
             $route = str_replace('{host}', $domain, $route);
126 126
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
127
-            if (preg_match('#^' . $route . '$#', $host, $this->request['called_subdomain'])) {
127
+            if (preg_match('#^'.$route.'$#', $host, $this->request['called_subdomain'])) {
128 128
                 $this->request['called_subdomain'] = array_shift($this->request['called_subdomain']);
129
-                $this->request['subdomain'] = str_replace('.'.$domain,'',$host);
129
+                $this->request['subdomain'] = str_replace('.'.$domain, '', $host);
130 130
                 return true;
131 131
             }
132 132
         }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     private function subdomainMatch()
140 140
     {
141 141
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
142
-            return '(' . $this->request['params']['subdomain'] . ')';
142
+            return '('.$this->request['params']['subdomain'].')';
143 143
         }
144 144
         return '([^/]+)';
145 145
     }
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
     {
153 153
         if (is_array($this->request['params']) && isset($this->request['params']['arguments'][$match[1]])) {
154 154
             $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->request['params']['arguments'][$match[1]]);
155
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
155
+            return '('.$this->request['params']['arguments'][$match[1]].')';
156 156
         }
157 157
         return '([^/]+)';
158 158
     }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
      */
181 181
     private function generateTarget()
182 182
     {
183
-        if($this->validMethod()) {
183
+        if ($this->validMethod()) {
184 184
             foreach ($this->resolver as $resolver) {
185 185
                 if (is_array($target = call_user_func_array([$this, $resolver], [$this->router->route->getCallback()]))) {
186 186
                     $this->setTarget($target);
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
     /**
200 200
      * @param array $target
201 201
      */
202
-    public function setTarget($target = []){
202
+    public function setTarget($target = []) {
203 203
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
204 204
         $this->router->route->setDetail($this->request);
205 205
         $this->router->route->setTarget($target);
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
     /**
211 211
      *
212 212
      */
213
-    private function setCallback(){
213
+    private function setCallback() {
214 214
         if (isset($this->request['params'])) {
215
-            if(is_callable($this->request['params']))
215
+            if (is_callable($this->request['params']))
216 216
                 $this->router->route->setCallback($this->request['params']);
217 217
             else {
218 218
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
      */
230 230
     public function validMethod()
231 231
     {
232
-        if(is_callable($this->request['params']))return true;
232
+        if (is_callable($this->request['params']))return true;
233 233
         if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
234 234
             return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;
235 235
         $method = (isset($this->request['params']['method'])) ? $this->request['params']['method'] : ['GET'];
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
      * @return array|bool
242 242
      * @throws \Exception
243 243
      */
244
-    public function isClosureAndTemplate($callback){
245
-        if(is_array($cls = $this->isClosure($callback))) {
244
+    public function isClosureAndTemplate($callback) {
245
+        if (is_array($cls = $this->isClosure($callback))) {
246 246
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
247
-                return array_merge(array_merge($cls, $tpl),[
247
+                return array_merge(array_merge($cls, $tpl), [
248 248
                     'dispatcher' => $this->dispatcher['isClosureAndTemplate']
249 249
                 ]);
250 250
             }
@@ -258,10 +258,10 @@  discard block
 block discarded – undo
258 258
      * @return array|bool
259 259
      * @throws \Exception
260 260
      */
261
-    public function isControllerAndTemplate($callback){
262
-        if(is_array($ctrl = $this->isController($callback))) {
261
+    public function isControllerAndTemplate($callback) {
262
+        if (is_array($ctrl = $this->isController($callback))) {
263 263
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
264
-                return array_merge(array_merge($ctrl, $tpl),[
264
+                return array_merge(array_merge($ctrl, $tpl), [
265 265
                     'dispatcher' => $this->dispatcher['isControllerAndTemplate']
266 266
                 ]);
267 267
             }
@@ -296,19 +296,19 @@  discard block
 block discarded – undo
296 296
         if (is_string($callback) && strpos($callback, '@') !== false) {
297 297
             $routes = explode('@', $callback);
298 298
             if (!isset($routes[1])) $routes[1] = 'index';
299
-            if ($routes[1] == '{method}'){
300
-                $this->request['parameters'] = explode('/',str_replace(str_replace('*','',$this->request['route']),'',$this->router->route->getUrl()));
299
+            if ($routes[1] == '{method}') {
300
+                $this->request['parameters'] = explode('/', str_replace(str_replace('*', '', $this->request['route']), '', $this->router->route->getUrl()));
301 301
                 $routes[1] = $this->request['parameters'][0];
302 302
                 array_shift($this->request['parameters']);
303
-                if(preg_match('/[A-Z]/', $routes[1])) return false;
304
-                $routes[1] = lcfirst(str_replace('-','',ucwords($routes[1],'-')));
303
+                if (preg_match('/[A-Z]/', $routes[1])) return false;
304
+                $routes[1] = lcfirst(str_replace('-', '', ucwords($routes[1], '-')));
305 305
             }
306 306
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
307 307
             $class = (class_exists($routes[0]))
308 308
                 ? $routes[0]
309
-                : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
309
+                : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
310 310
             if (!class_exists($class))
311
-                throw new \Exception('Class "' . $class . '." is not found');
311
+                throw new \Exception('Class "'.$class.'." is not found');
312 312
             if (method_exists($class, $routes[1])) {
313 313
                 return [
314 314
                     'dispatcher' => $this->dispatcher['isController'],
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
                 ];
319 319
             }
320 320
             if (!strpos($callback, '{method}') !== false)
321
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
321
+                throw new \Exception('The required method "'.$routes[1].'" is not found in "'.$class.'"');
322 322
         }
323 323
         return false;
324 324
     }
@@ -330,25 +330,25 @@  discard block
 block discarded – undo
330 330
      */
331 331
     public function isTemplate($callback)
332 332
     {
333
-        if(is_string($callback) && strpos($callback, '@') === false) {
333
+        if (is_string($callback) && strpos($callback, '@') === false) {
334 334
             $path = trim($callback, '/');
335 335
             $extension = substr(strrchr($path, "."), 1);
336 336
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
337
-            $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
337
+            $viewDir = $this->router->collection->getRoutes('view_dir_'.$index);
338 338
             $target = null;
339
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path)))
339
+            if (in_array('.'.$extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir.$path) || is_file($fullPath = $path)))
340 340
                 $target = $fullPath;
341 341
             else {
342 342
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
343
-                    if (is_file($fullPath = $viewDir . $path . $ext) || is_file($fullPath = $path . $ext)) {
343
+                    if (is_file($fullPath = $viewDir.$path.$ext) || is_file($fullPath = $path.$ext)) {
344 344
                         $target = $fullPath;
345 345
                         $extension = substr(strrchr($ext, "."), 1);
346 346
                         break;
347 347
                     }
348 348
                 }
349 349
             }
350
-            if(is_null($target))
351
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
350
+            if (is_null($target))
351
+                throw new \Exception('Template file "'.$path.'" is not found in "'.$viewDir.'"');
352 352
             return [
353 353
                 'dispatcher' => $this->dispatcher['isTemplate'],
354 354
                 'template'   => $target,
Please login to merge, or discard this patch.