jetfirephp / routing

src/Routing/Response.php

Braces +3 added lines, -2 removed lines

@@ -166,8 +166,9 @@
      */
     public function sendHeaders()
     {
-        foreach($this->headers as $key => $content)
-            header($key.' : '.$content);
+        foreach($this->headers as $key => $content) {

+                    header($key.' : '.$content);

+        }

         http_response_code($this->getStatusCode());
         return $this;
     }

Spacing +21 added lines, -21 removed lines

@@ -7,7 +7,7 @@ 
  * Class Response
  * @package JetFire\Routing
  */
-class Response implements ResponseInterface{
+class Response implements ResponseInterface {
 
     /**
      * @var array
@@ -53,7 +53,7 @@ 
     public static $statusTexts = array(
         100 => 'Continue',
         101 => 'Switching Protocols',
-        102 => 'Processing',            // RFC2518
+        102 => 'Processing', // RFC2518
         200 => 'OK',
         201 => 'Created',
         202 => 'Accepted',
@@ -61,9 +61,9 @@ 
         204 => 'No Content',
         205 => 'Reset Content',
         206 => 'Partial Content',
-        207 => 'Multi-Status',          // RFC4918
-        208 => 'Already Reported',      // RFC5842
-        226 => 'IM Used',               // RFC3229
+        207 => 'Multi-Status', // RFC4918
+        208 => 'Already Reported', // RFC5842
+        226 => 'IM Used', // RFC3229
         300 => 'Multiple Choices',
         301 => 'Moved Permanently',
         302 => 'Found',
@@ -71,7 +71,7 @@ 
         304 => 'Not Modified',
         305 => 'Use Proxy',
         307 => 'Temporary Redirect',
-        308 => 'Permanent Redirect',    // RFC7238
+        308 => 'Permanent Redirect', // RFC7238
         400 => 'Bad Request',
         401 => 'Unauthorized',
         402 => 'Payment Required',
@@ -90,26 +90,26 @@ 
         415 => 'Unsupported Media Type',
         416 => 'Range Not Satisfiable',
         417 => 'Expectation Failed',
-        418 => 'I\'m a teapot',                                               // RFC2324
-        422 => 'Unprocessable Entity',                                        // RFC4918
-        423 => 'Locked',                                                      // RFC4918
-        424 => 'Failed Dependency',                                           // RFC4918
-        425 => 'Reserved for WebDAV advanced collections expired proposal',   // RFC2817
-        426 => 'Upgrade Required',                                            // RFC2817
-        428 => 'Precondition Required',                                       // RFC6585
-        429 => 'Too Many Requests',                                           // RFC6585
-        431 => 'Request Header Fields Too Large',                             // RFC6585
+        418 => 'I\'m a teapot', // RFC2324
+        422 => 'Unprocessable Entity', // RFC4918
+        423 => 'Locked', // RFC4918
+        424 => 'Failed Dependency', // RFC4918
+        425 => 'Reserved for WebDAV advanced collections expired proposal', // RFC2817
+        426 => 'Upgrade Required', // RFC2817
+        428 => 'Precondition Required', // RFC6585
+        429 => 'Too Many Requests', // RFC6585
+        431 => 'Request Header Fields Too Large', // RFC6585
         500 => 'Internal Server Error',
         501 => 'Not Implemented',
         502 => 'Bad Gateway',
         503 => 'Service Unavailable',
         504 => 'Gateway Timeout',
         505 => 'HTTP Version Not Supported',
-        506 => 'Variant Also Negotiates (Experimental)',                      // RFC2295
-        507 => 'Insufficient Storage',                                        // RFC4918
-        508 => 'Loop Detected',                                               // RFC5842
-        510 => 'Not Extended',                                                // RFC2774
-        511 => 'Network Authentication Required',                             // RFC6585
+        506 => 'Variant Also Negotiates (Experimental)', // RFC2295
+        507 => 'Insufficient Storage', // RFC4918
+        508 => 'Loop Detected', // RFC5842
+        510 => 'Not Extended', // RFC2774
+        511 => 'Network Authentication Required', // RFC6585
     );
 
     /**
@@ -166,7 +166,7 @@ 
      */
     public function sendHeaders()
     {
-        foreach($this->headers as $key => $content)
+        foreach ($this->headers as $key => $content)
             header($key.' : '.$content);
         http_response_code($this->getStatusCode());
         return $this;

src/Routing/Route.php

Braces +18 added lines, -8 removed lines

@@ -52,10 +52,18 @@ 
      */
     public function set($args = [])
     {
-        if (isset($args['name'])) $this->name = $args['name'];
-        if (isset($args['callback'])) $this->callback = $args['callback'];
-        if (isset($args['target'])) $this->target = $args['target'];
-        if (isset($args['detail'])) $this->detail = $args['detail'];
+        if (isset($args['name'])) {

+            $this->name = $args['name'];

+        }

+        if (isset($args['callback'])) {

+            $this->callback = $args['callback'];

+        }

+        if (isset($args['target'])) {

+            $this->target = $args['target'];

+        }

+        if (isset($args['detail'])) {

+            $this->detail = $args['detail'];

+        }

     }
 
     /**
@@ -145,8 +153,9 @@ 
      */
     public function getTarget($key = null)
     {
-        if (!is_null($key))
-            return isset($this->target[$key]) ? $this->target[$key] : '';
+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? $this->target[$key] : '';

+        }

         return empty($this->target) ? '' : $this->target;
     }
 
@@ -165,8 +174,9 @@ 
      */
     public function hasTarget($key = null)
     {
-        if (!is_null($key))
-            return isset($this->target[$key]) ? true : false;
+        if (!is_null($key)) {

+                    return isset($this->target[$key]) ? true : false;

+        }

         return empty($this->target) ? false : true;
     }
 

src/Routing/Matcher/MatcherInterface.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      * @param $method
      * @param $class
      */
-    public function addDispatcher($method,$class);
+    public function addDispatcher($method, $class);
 
     /**
      * @return mixed

src/Routing/Matcher/ArrayMatcher.php

Doc Comments +2 added lines, -2 removed lines

@@ -166,7 +166,7 @@ 
     }
 
     /**
-     * @param $regex
+     * @param string $regex
      * @return bool
      */
     private function routeMatch($regex)
@@ -216,7 +216,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      */
     private function checkRequest($key)
     {

Braces +12 added lines, -4 removed lines

@@ -125,7 +125,9 @@ 
         $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
         $host = explode(':', $host)[0];
         $domain = $this->router->collection->getDomain($url);
-        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;
+        if (!empty($this->request['subdomain']) && $route[0] == '/') {

+            $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;

+        }

         if ($route[0] == '/') {
             return ($host != $domain) ? false : true;
         } elseif ($route[0] != '/' && $host != $domain) {
@@ -333,14 +335,18 @@ 
     {
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             if ($routes[1] == '{method}') {
                 $params = explode('/', trim(preg_replace('#' . rtrim(str_replace('*', '', $this->request['route']), '/') . '#', '', $this->router->route->getUrl()), '/'));
                 $routes[1] = empty($params[0]) ? 'index' : $params[0];
                 $this->request['@method'] = $routes[1];
                 array_shift($params);
                 $this->request['parameters'] = array_merge($this->request['parameters'], $params);
-                if (preg_match('/[A-Z]/', $routes[1])) return false;
+                if (preg_match('/[A-Z]/', $routes[1])) {

+                    return false;

+                }

                 $routes[1] = lcfirst(str_replace(' ', '', ucwords(str_replace('-', ' ', $routes[1]))));
             }
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
@@ -378,7 +384,9 @@ 
             $target = null;
             if (in_array('.' . $extension, $this->router->getConfig()['templateExtension'])){
                 foreach ($viewDir as $dir) {
-                    if (is_file($fullPath = rtrim($dir, '/') . '/' . $path) || is_file($fullPath = $path)) $target = $fullPath;
+                    if (is_file($fullPath = rtrim($dir, '/') . '/' . $path) || is_file($fullPath = $path)) {

+                        $target = $fullPath;

+                    }

                 }
             }
             if(is_null($target)){

Spacing +28 added lines, -28 removed lines

@@ -97,15 +97,15 @@ 
     {
         $this->request = [];
         for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
-            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_' . $i) != '') ? $this->router->collection->getRoutes('prefix_' . $i) : '';
-            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_' . $i) != '') ? $this->router->collection->getRoutes('subdomain_' . $i) : '';
-            foreach ($this->router->collection->getRoutes('routes_' . $i) as $route => $params) {
+            $this->request['prefix'] = ($this->router->collection->getRoutes('prefix_'.$i) != '') ? $this->router->collection->getRoutes('prefix_'.$i) : '';
+            $this->request['subdomain'] = ($this->router->collection->getRoutes('subdomain_'.$i) != '') ? $this->router->collection->getRoutes('subdomain_'.$i) : '';
+            foreach ($this->router->collection->getRoutes('routes_'.$i) as $route => $params) {
                 $this->request['params'] = $params;
                 $this->request['collection_index'] = $i;
                 if ($this->checkSubdomain($route)) {
                     $route = strstr($route, '/');
-                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
-                    if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {
+                    $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/'.trim(trim($this->request['prefix'], '/').'/'.trim($route, '/'), '/'));
+                    if ($this->routeMatch('#^'.$this->request['route'].'$#')) {
                         $this->setCallback();
                         return $this->generateTarget();
                     }
@@ -121,19 +121,19 @@ 
      */
     private function checkSubdomain($route)
     {
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
         $host = explode(':', $host)[0];
         $domain = $this->router->collection->getDomain($url);
-        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.') . '.' . $domain . $route;
+        if (!empty($this->request['subdomain']) && $route[0] == '/') $route = trim($this->request['subdomain'], '.').'.'.$domain.$route;
         if ($route[0] == '/') {
             return ($host != $domain) ? false : true;
         } elseif ($route[0] != '/' && $host != $domain) {
             $route = substr($route, 0, strpos($route, "/"));
             $route = str_replace('{host}', $domain, $route);
             $route = preg_replace_callback('#{subdomain}#', [$this, 'subdomainMatch'], $route);
-            if (preg_match('#^' . $route . '$#', $host, $this->request['called_subdomain'])) {
+            if (preg_match('#^'.$route.'$#', $host, $this->request['called_subdomain'])) {
                 $this->request['called_subdomain'] = array_shift($this->request['called_subdomain']);
-                $this->request['subdomain'] = str_replace('.' . $domain, '', $host);
+                $this->request['subdomain'] = str_replace('.'.$domain, '', $host);
                 return true;
             }
         }
@@ -146,7 +146,7 @@ 
     private function subdomainMatch()
     {
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
-            return '(' . $this->request['params']['subdomain'] . ')';
+            return '('.$this->request['params']['subdomain'].')';
         }
         return '([^/]+)';
     }
@@ -159,11 +159,11 @@ 
     {
         if (is_array($this->request['params']) && isset($this->request['params']['arguments'][$match[1]])) {
             $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->request['params']['arguments'][$match[1]]);
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
+            return '('.$this->request['params']['arguments'][$match[1]].')';
         }
-        if(isset($this->router->collection->getRoutes('params_' . $this->request['collection_index'])['arguments'][$match[1]])){
-            $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->router->collection->getRoutes('params_' . $this->request['collection_index'])['arguments'][$match[1]]);
-            return '(' . $this->request['params']['arguments'][$match[1]] . ')';
+        if (isset($this->router->collection->getRoutes('params_'.$this->request['collection_index'])['arguments'][$match[1]])) {
+            $this->request['params']['arguments'][$match[1]] = str_replace('(', '(?:', $this->router->collection->getRoutes('params_'.$this->request['collection_index'])['arguments'][$match[1]]);
+            return '('.$this->request['params']['arguments'][$match[1]].')';
         }
         return '([^/]+)';
     }
@@ -174,7 +174,7 @@ 
      */
     private function routeMatch($regex)
     {
-        $regex = (substr($this->request['route'], -1) == '*') ? '#^' . $this->request['route'] . '#' : $regex;
+        $regex = (substr($this->request['route'], -1) == '*') ? '#^'.$this->request['route'].'#' : $regex;
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
             return true;
@@ -209,9 +209,9 @@ 
         $this->checkRequest('prefix');
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
-        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_' . $index));
-        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
-        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_' . $index));
+        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_'.$index));
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_'.$index));
+        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_'.$index));
     }
 
     /**
@@ -222,8 +222,8 @@ 
         if (strpos($this->request[$key], ':') !== false && isset($this->request['parameters'][0])) {
             $replacements = $this->request['parameters'];
             $keys = [];
-            $this->request['@' . $key] = $this->request[$key];
-            $this->request[$key] = preg_replace_callback('#:([\w?]+)#', function ($matches) use (&$replacements, &$keys) {
+            $this->request['@'.$key] = $this->request[$key];
+            $this->request[$key] = preg_replace_callback('#:([\w?]+)#', function($matches) use (&$replacements, &$keys) {
                 $route_key = preg_replace("/[^A-Za-z0-9\\-_:]/", '', $matches[0]);
                 $keys[$route_key] = isset($replacements[0]) ? $replacements[0] : null;
                 return is_null($keys[$route_key]) ? '' : array_shift($replacements);
@@ -339,7 +339,7 @@ 
             $routes = explode('@', $callback);
             if (!isset($routes[1])) $routes[1] = 'index';
             if ($routes[1] == '{method}') {
-                $params = explode('/', trim(preg_replace('#' . rtrim(str_replace('*', '', $this->request['route']), '/') . '#', '', $this->router->route->getUrl()), '/'));
+                $params = explode('/', trim(preg_replace('#'.rtrim(str_replace('*', '', $this->request['route']), '/').'#', '', $this->router->route->getUrl()), '/'));
                 $routes[1] = empty($params[0]) ? 'index' : $params[0];
                 $this->request['@method'] = $routes[1];
                 array_shift($params);
@@ -350,7 +350,7 @@ 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $class = (class_exists($routes[0]))
                 ? $routes[0]
-                : $this->router->collection->getRoutes()['ctrl_namespace_' . $index] . $routes[0];
+                : $this->router->collection->getRoutes()['ctrl_namespace_'.$index].$routes[0];
             if (method_exists($class, $routes[1])) {
                 return [
                     'dispatcher' => $this->dispatcher['isController'],
@@ -360,7 +360,7 @@ 
                 ];
             }
             if (!strpos($callback, '{method}') !== false) {
-                throw new \Exception('The required method "' . $routes[1] . '" is not found in "' . $class . '"');
+                throw new \Exception('The required method "'.$routes[1].'" is not found in "'.$class.'"');
             }
         }
         return false;
@@ -378,17 +378,17 @@ 
             $path = str_replace('{template}', $replace, trim($callback, '/'));
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
-            $viewDir = is_array($viewDir = $this->router->collection->getRoutes('view_dir_' . $index)) ? $viewDir : [$viewDir];
+            $viewDir = is_array($viewDir = $this->router->collection->getRoutes('view_dir_'.$index)) ? $viewDir : [$viewDir];
             $target = null;
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension'])){
+            if (in_array('.'.$extension, $this->router->getConfig()['templateExtension'])) {
                 foreach ($viewDir as $dir) {
-                    if (is_file($fullPath = rtrim($dir, '/') . '/' . $path) || is_file($fullPath = $path)) $target = $fullPath;
+                    if (is_file($fullPath = rtrim($dir, '/').'/'.$path) || is_file($fullPath = $path)) $target = $fullPath;
                 }
             }
-            if(is_null($target)){
+            if (is_null($target)) {
                 foreach ($viewDir as $dir) {
                     foreach ($this->router->getConfig()['templateExtension'] as $ext) {
-                        if (is_file($fullPath = rtrim($dir, '/') . '/' . $path . $ext) || is_file($fullPath = $path . $ext)) {
+                        if (is_file($fullPath = rtrim($dir, '/').'/'.$path.$ext) || is_file($fullPath = $path.$ext)) {
                             $target = $fullPath;
                             $extension = substr(strrchr($ext, "."), 1);
                             break;

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +6 added lines, -2 removed lines

@@ -44,8 +44,12 @@
             $this->router->response->setContent(call_user_func_array($this->router->route->getTarget('callback')[$this->router->route->getTarget('extension')], [$this->router->route]));
         } else {
             ob_start();
-            if (isset($this->router->route->getTarget()['data'])) extract($this->router->route->getTarget('data'));
-            if (isset($this->router->route->getParams()['data'])) extract($this->router->route->getParams()['data']);
+            if (isset($this->router->route->getTarget()['data'])) {

+                extract($this->router->route->getTarget('data'));

+            }

+            if (isset($this->router->route->getParams()['data'])) {

+                extract($this->router->route->getParams()['data']);

+            }

             require($this->router->route->getTarget('template'));
             $this->router->response->setContent(ob_get_clean());
         }

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     public function call()
     {
         if (!is_file($this->router->route->getTarget('template'))) {
-            throw new \Exception('Template file not found : "' . $this->router->route->getTarget('template') . '"');
+            throw new \Exception('Template file not found : "'.$this->router->route->getTarget('template').'"');
         }
         $this->setContentType($this->router->route->getTarget('extension'));
         if (isset($this->router->route->getTarget('callback')[$this->router->route->getTarget('extension')])) {

src/Routing/Router.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
         $this->collection = $collection;
         $this->response = is_null($response) ? new Response() : $response;
         $this->route = is_null($route) ? new Route() : $route;
-        $this->config['di'] = function ($class) {
+        $this->config['di'] = function($class) {
             return new $class;
         };
     }
@@ -123,10 +123,10 @@ 
         if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
         if ($this->match() === true) {
             $this->callMiddleware('before');
-            if (!in_array(substr($this->response->getStatusCode(), 0, 1), [3,4,5])) {
+            if (!in_array(substr($this->response->getStatusCode(), 0, 1), [3, 4, 5])) {
                 $this->callTarget();
             }
-        }else{
+        } else {
             $this->response->setStatusCode(404);
         }
         $this->callMiddleware('after');
@@ -157,7 +157,7 @@ 
     {
         if (is_null($url))
             $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);
-        $this->route->setUrl('/' . trim(explode('?', $url)[0], '/'));
+        $this->route->setUrl('/'.trim(explode('?', $url)[0], '/'));
     }
 
     /**

Braces +10 added lines, -5 removed lines

@@ -120,13 +120,15 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
+        if ($this->config['generateRoutesPath']) {

+            $this->collection->generateRoutesPath();

+        }

         if ($this->match() === true) {
             $this->callMiddleware('before');
             if (!in_array(substr($this->response->getStatusCode(), 0, 1), [3,4,5])) {
                 $this->callTarget();
             }
-        }else{
+        } else{
             $this->response->setStatusCode(404);
         }
         $this->callMiddleware('after');
@@ -155,8 +157,9 @@ 
      */
     public function setUrl($url = null)
     {
-        if (is_null($url))
-            $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);
+        if (is_null($url)) {

+                    $url = (isset($_GET['url'])) ? $_GET['url'] : substr(str_replace(str_replace('/index.php', '', $_SERVER['SCRIPT_NAME']), '', $_SERVER['REQUEST_URI']), 1);

+        }

         $this->route->setUrl('/' . trim(explode('?', $url)[0], '/'));
     }
 
@@ -166,7 +169,9 @@ 
     public function match()
     {
         foreach ($this->matcher as $key => $matcher) {
-            if (call_user_func([$this->matcher[$key], 'match'])) return true;
+            if (call_user_func([$this->matcher[$key], 'match'])) {

+                return true;

+            }

         }
         return false;
     }

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 
     /**
      * @description call the middleware before and after the target
-     * @param $action
+     * @param string $action
      */
     public function callMiddleware($action)
     {

src/Routing/Middleware.php

Spacing +6 added lines, -6 removed lines

@@ -154,10 +154,10 @@ 
      * @param $handlers
      * @param array $params
      */
-    private function callHandlers($handlers, $params = []){
+    private function callHandlers($handlers, $params = []) {
         $handlers = is_array($handlers) ? $handlers : [$handlers];
         foreach ($handlers as $handler) {
-            if($this->next && $this->handle($handler, $params) !== true){
+            if ($this->next && $this->handle($handler, $params) !== true) {
                 break;
             }
         }
@@ -185,13 +185,13 @@ 
                 }
                 $dependencies = array_merge($dependencies, [$this->router->route]);
                 $response = $reflectionMethod->invokeArgs($instance, $dependencies);
-                if(is_array($response) && isset($response['call'])){
-                    if(isset($response['response']) && $response['response'] instanceof ResponseInterface){
+                if (is_array($response) && isset($response['call'])) {
+                    if (isset($response['response']) && $response['response'] instanceof ResponseInterface) {
                         $this->router->response = $response['response'];
                     }
-                    $params = isset($response['params']) ? $response['params']: [];
+                    $params = isset($response['params']) ? $response['params'] : [];
                     $this->callHandlers($response['call'], $params);
-                    $this->next = isset($response['next']) ? (bool)$response['next'] : false;
+                    $this->next = isset($response['next']) ? (bool) $response['next'] : false;
                 } else if ($response instanceof ResponseInterface) {
                     $this->router->response = $response;
                 }

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     {
 
         if (!class_exists($this->router->route->getTarget('controller'))) {
-            throw new \Exception('Class not found : "' . $this->router->route->getTarget('controller') . '"');
+            throw new \Exception('Class not found : "'.$this->router->route->getTarget('controller').'"');
         }
 
         $classInstance = [
@@ -92,7 +92,7 @@ 
     {
         $reflector = new ReflectionClass($this->router->route->getTarget('controller'));
         if (!$reflector->isInstantiable()) {
-            throw new \Exception('Target [' . $this->router->route->getTarget('controller') . '] is not instantiable.');
+            throw new \Exception('Target ['.$this->router->route->getTarget('controller').'] is not instantiable.');
         }
         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {

src/Routing/Matcher/UriMatcher.php

Spacing +12 added lines, -12 removed lines

@@ -108,9 +108,9 @@ 
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
-        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_' . $index));
-        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_' . $index));
-        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_' . $index));
+        $this->router->route->addTarget('block', $this->router->collection->getRoutes('block_'.$index));
+        $this->router->route->addTarget('view_dir', $this->router->collection->getRoutes('view_dir_'.$index));
+        $this->router->route->addTarget('params', $this->router->collection->getRoutes('params_'.$index));
     }
 
     /**
@@ -136,12 +136,12 @@ 
     {
         foreach ($this->router->getConfig()['templateExtension'] as $extension) {
             for ($i = 0; $i < $this->router->collection->countRoutes; ++$i) {
-                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_' . $i), '', $this->router->route->getUrl()));
+                $url = explode('/', str_replace($this->router->collection->getRoutes('prefix_'.$i), '', $this->router->route->getUrl()));
                 $end = array_pop($url);
-                $url = implode('/', array_map('ucwords', $url)) . '/' . $end;
-                $viewDir = is_array($viewDir = $this->router->collection->getRoutes('view_dir_' . $i)) ? $viewDir : [$viewDir];
+                $url = implode('/', array_map('ucwords', $url)).'/'.$end;
+                $viewDir = is_array($viewDir = $this->router->collection->getRoutes('view_dir_'.$i)) ? $viewDir : [$viewDir];
                 foreach ($viewDir as $dir) {
-                    if (is_file(($template = rtrim($dir, '/') . $url . $extension))) {
+                    if (is_file(($template = rtrim($dir, '/').$url.$extension))) {
                         $this->request['collection_index'] = $i;
                         return [
                             'dispatcher' => $this->dispatcher['isTemplate'],
@@ -164,11 +164,11 @@ 
         $routes = array_slice(explode('/', $this->router->route->getUrl()), 1);
         $i = 0;
         do {
-            $route = ('/' . $routes[0] == $this->router->collection->getRoutes('prefix_' . $i)) ? array_slice($routes, 1) : $routes;
+            $route = ('/'.$routes[0] == $this->router->collection->getRoutes('prefix_'.$i)) ? array_slice($routes, 1) : $routes;
             if (isset($route[0])) {
-                $class = (class_exists($this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'))
-                    ? $this->router->collection->getRoutes('ctrl_namespace_' . $i) . ucfirst($route[0]) . 'Controller'
-                    : ucfirst($route[0]) . 'Controller';
+                $class = (class_exists($this->router->collection->getRoutes('ctrl_namespace_'.$i).ucfirst($route[0]).'Controller'))
+                    ? $this->router->collection->getRoutes('ctrl_namespace_'.$i).ucfirst($route[0]).'Controller'
+                    : ucfirst($route[0]).'Controller';
                 $route[1] = isset($route[1]) ? $route[1] : 'index';
                 if (method_exists($class, $route[1])) {
                     $this->request['parameters'] = array_slice($route, 2);
@@ -182,7 +182,7 @@ 
                 }
             }
             ++$i;
-        } while ($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }