@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | /** |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
| 27 | - private $matcher = ['matchClosure','matchController','matchTemplate']; |
|
| 27 | + private $matcher = ['matchClosure', 'matchController', 'matchTemplate']; |
|
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * @param Router $router |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | /** |
| 38 | 38 | * @param string $matcher |
| 39 | 39 | */ |
| 40 | - public function addMatcher($matcher){ |
|
| 40 | + public function addMatcher($matcher) { |
|
| 41 | 41 | $this->matcher[] = $matcher; |
| 42 | 42 | } |
| 43 | 43 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | private function generateTarget() |
| 108 | 108 | { |
| 109 | - if(is_callable($this->request['path'])){ |
|
| 109 | + if (is_callable($this->request['path'])) { |
|
| 110 | 110 | $this->router->route->setCallback($this->request['path']); |
| 111 | 111 | $this->router->route->setDetail($this->request); |
| 112 | 112 | $this->matchClosure(); |
@@ -119,11 +119,11 @@ discard block |
||
| 119 | 119 | ? $this->router->route->setCallback($this->request['path']['use']) |
| 120 | 120 | : $this->router->route->setCallback($this->request['path']); |
| 121 | 121 | $this->router->route->setDetail($this->request); |
| 122 | - if($this->validMethod()) { |
|
| 123 | - foreach($this->matcher as $matcher) |
|
| 124 | - call_user_func([$this,$matcher]); |
|
| 122 | + if ($this->validMethod()) { |
|
| 123 | + foreach ($this->matcher as $matcher) |
|
| 124 | + call_user_func([$this, $matcher]); |
|
| 125 | 125 | $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']); |
| 126 | - }else |
|
| 126 | + } else |
|
| 127 | 127 | $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']); |
| 128 | 128 | } |
| 129 | 129 | return $this->router->route->hasTarget(); |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | $index = isset($this->request['index']) ? $this->request['index'] : 0; |
| 166 | 166 | $class = (class_exists($routes[0])) |
| 167 | 167 | ? $routes[0] |
| 168 | - : $this->router->collection->getRoutes()['namespace_'.$index].$routes[0]; |
|
| 168 | + : $this->router->collection->getRoutes()['namespace_' . $index] . $routes[0]; |
|
| 169 | 169 | if (!class_exists($class)) |
| 170 | 170 | throw new \Exception('Class "' . $class . '." is not found'); |
| 171 | 171 | if (method_exists($class, $routes[1])) { |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | $extension = explode('.', $path); |
| 194 | 194 | $extension = end($extension); |
| 195 | 195 | $index = isset($this->request['index']) ? $this->request['index'] : 0; |
| 196 | - $block = $this->router->collection->getRoutes('path_'.$index); |
|
| 196 | + $block = $this->router->collection->getRoutes('path_' . $index); |
|
| 197 | 197 | if (in_array('.' . $extension, $this->router->getConfig()['viewExtension'])) { |
| 198 | 198 | if (is_file($block . $path)) { |
| 199 | 199 | $target = $block . $path; |
@@ -209,13 +209,13 @@ discard block |
||
| 209 | 209 | throw new \Exception('Template file "' . $path . '" is not found in "' . $block . '"'); |
| 210 | 210 | } else { |
| 211 | 211 | foreach ($this->router->getConfig()['viewExtension'] as $ext) { |
| 212 | - if (is_file($block . $path . $ext)){ |
|
| 212 | + if (is_file($block . $path . $ext)) { |
|
| 213 | 213 | $target = $block . $path . $ext; |
| 214 | - $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target,'block' => $block, 'extension' => str_replace('.', '', $ext),'callback' => $this->router->getConfig()['viewCallback']]); |
|
| 214 | + $this->router->route->setTarget(['dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', 'template' => $target, 'block' => $block, 'extension' => str_replace('.', '', $ext), 'callback' => $this->router->getConfig()['viewCallback']]); |
|
| 215 | 215 | return true; |
| 216 | 216 | } |
| 217 | 217 | } |
| 218 | - throw new \Exception('Template file "' . $path . '" is not found in "' .$block . '"'); |
|
| 218 | + throw new \Exception('Template file "' . $path . '" is not found in "' . $block . '"'); |
|
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | 221 | return false; |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /** |
| 21 | 21 | * @var array |
| 22 | 22 | */ |
| 23 | - private $matcher = ['matchTemplate','matchController']; |
|
| 23 | + private $matcher = ['matchTemplate', 'matchController']; |
|
| 24 | 24 | |
| 25 | 25 | /** |
| 26 | 26 | * @param Router $router |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | /** |
| 34 | 34 | * @param string $matcher |
| 35 | 35 | */ |
| 36 | - public function addMatcher($matcher){ |
|
| 36 | + public function addMatcher($matcher) { |
|
| 37 | 37 | $this->matcher[] = $matcher; |
| 38 | 38 | } |
| 39 | 39 | |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function match() |
| 52 | 52 | { |
| 53 | - foreach($this->matcher as $matcher){ |
|
| 54 | - if(call_user_func([$this,$matcher])) { |
|
| 53 | + foreach ($this->matcher as $matcher) { |
|
| 54 | + if (call_user_func([$this, $matcher])) { |
|
| 55 | 55 | $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']); |
| 56 | 56 | return true; |
| 57 | 57 | } |
@@ -66,9 +66,9 @@ discard block |
||
| 66 | 66 | { |
| 67 | 67 | foreach ($this->router->getConfig()['viewExtension'] as $extension) { |
| 68 | 68 | for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) { |
| 69 | - $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '',$this->router->route->getUrl())); |
|
| 69 | + $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '', $this->router->route->getUrl())); |
|
| 70 | 70 | $end = array_pop($url); |
| 71 | - $url = implode('/', array_map('ucwords', $url)).'/'.$end; |
|
| 71 | + $url = implode('/', array_map('ucwords', $url)) . '/' . $end; |
|
| 72 | 72 | if (is_file(($template = rtrim($this->router->collection->getRoutes('path_' . $i), '/') . $url . $extension))) { |
| 73 | 73 | $this->router->route->setTarget([ |
| 74 | 74 | 'dispatcher' => 'JetFire\Routing\Dispatcher\TemplateDispatcher', |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | { |
| 92 | 92 | $routes = array_slice(explode('/', $this->router->route->getUrl()), 1); |
| 93 | 93 | $i = 0; |
| 94 | - do{ |
|
| 95 | - $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) |
|
| 94 | + do { |
|
| 95 | + $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) |
|
| 96 | 96 | ? array_slice($routes, 1) : $routes; |
| 97 | 97 | if (isset($route[0])) { |
| 98 | - $class = (class_exists($this->router->collection->getRoutes('namespace_' . $i). ucfirst($route[0]) . 'Controller')) |
|
| 99 | - ? $this->router->collection->getRoutes('namespace_' . $i). ucfirst($route[0]) . 'Controller' |
|
| 98 | + $class = (class_exists($this->router->collection->getRoutes('namespace_' . $i) . ucfirst($route[0]) . 'Controller')) |
|
| 99 | + ? $this->router->collection->getRoutes('namespace_' . $i) . ucfirst($route[0]) . 'Controller' |
|
| 100 | 100 | : ucfirst($route[0]) . 'Controller'; |
| 101 | 101 | if (isset($route[1]) && method_exists($class, $route[1])) { |
| 102 | 102 | $this->router->route->setTarget([ |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | ++$i; |
| 113 | - }while($i < $this->router->collection->countRoutes); |
|
| 113 | + }while ($i < $this->router->collection->countRoutes); |
|
| 114 | 114 | return false; |
| 115 | 115 | } |
| 116 | 116 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | $this->collection = $collection; |
| 46 | 46 | $this->route = new Route(); |
| 47 | - $this->config['di'] = function($class){ |
|
| 47 | + $this->config['di'] = function($class) { |
|
| 48 | 48 | return new $class; |
| 49 | 49 | }; |
| 50 | 50 | } |
@@ -139,9 +139,9 @@ discard block |
||
| 139 | 139 | { |
| 140 | 140 | if (isset($this->route->getResponse()['templates']) && isset($this->route->getResponse()['templates'][$this->route->getResponse('code')])) { |
| 141 | 141 | $this->route->setCallback($this->route->getResponse()['templates'][$this->route->getResponse('code')]); |
| 142 | - foreach($this->config['matcherInstance'] as $matcher) { |
|
| 142 | + foreach ($this->config['matcherInstance'] as $matcher) { |
|
| 143 | 143 | foreach (call_user_func([$matcher, 'getMatcher']) as $match) |
| 144 | - if (call_user_func([$matcher, $match])){ $this->callTarget(); break; } |
|
| 144 | + if (call_user_func([$matcher, $match])) { $this->callTarget(); break; } |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | http_response_code($this->route->getResponse('code')); |