jetfirephp / routing

src/Routing/Route.php

Spacing +3 added lines, -3 removed lines

@@ -127,7 +127,7 @@ 
      */
     public function setDetail($detail)
     {
-        $this->detail = array_merge($detail,$this->detail);
+        $this->detail = array_merge($detail, $this->detail);
     }
 
     /**
@@ -173,8 +173,8 @@ 
     /**
      * @return array
      */
-    public function getData(){
-        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data']))?$this->getDetail()['data']:[];
+    public function getData() {
+        return (isset($this->getDetail()['data']) && is_array($this->getDetail()['data'])) ? $this->getDetail()['data'] : [];
     }
 
     /**

src/Routing/Matcher/MatcherInterface.php

Spacing +1 added lines, -1 removed lines

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

src/Routing/Response.php

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/Matcher/UriMatcher.php

Spacing +20 added lines, -20 removed lines

@@ -32,7 +32,7 @@ 
     private $dispatcher = [
         'isTemplate' => 'JetFire\Routing\Dispatcher\TemplateDispatcher',
         'isController' => 'JetFire\Routing\Dispatcher\ControllerDispatcher',
-        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
+        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
     ];
 
     /**
@@ -46,14 +46,14 @@ 
     /**
      * @param array $resolver
      */
-    public function setResolver($resolver = []){
+    public function setResolver($resolver = []) {
         $this->resolver = $resolver;
     }
 
     /**
      * @param string $resolver
      */
-    public function addResolver($resolver){
+    public function addResolver($resolver) {
         $this->resolver[] = $resolver;
     }
 
@@ -78,7 +78,7 @@ 
      * @param $class
      * @return mixed|void
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -87,10 +87,10 @@ 
      */
     public function match()
     {
-        foreach($this->resolver as $resolver){
-            if(is_array($target = call_user_func([$this,$resolver]))) {
+        foreach ($this->resolver as $resolver) {
+            if (is_array($target = call_user_func([$this, $resolver]))) {
                 $this->setTarget($target);
-                if($this->router->middleware->globalMiddleware() === false || $this->router->middleware->blockMiddleware() === false || $this->router->middleware->classMiddleware() === false || $this->router->middleware->routeMiddleware() === false)
+                if ($this->router->middleware->globalMiddleware() === false || $this->router->middleware->blockMiddleware() === false || $this->router->middleware->classMiddleware() === false || $this->router->middleware->routeMiddleware() === false)
                     return null;
                 $this->router->response->setStatusCode(202);
                 return true;
@@ -102,7 +102,7 @@ 
     /**
      * @param array $target
      */
-    public function setTarget($target = []){
+    public function setTarget($target = []) {
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
@@ -113,10 +113,10 @@ 
     /**
      * @return array|bool
      */
-    public function isControllerAndTemplate(){
-        if(is_array($ctrl = $this->isController())) {
+    public function isControllerAndTemplate() {
+        if (is_array($ctrl = $this->isController())) {
             if (is_array($tpl = $this->isTemplate())) {
-                return array_merge(array_merge($ctrl, $tpl),[
+                return array_merge(array_merge($ctrl, $tpl), [
                     'dispatcher' => $this->dispatcher['isControllerAndTemplate']
                 ]);
             }
@@ -132,10 +132,10 @@ 
     {
         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;
-                if (is_file(($template = rtrim($this->router->collection->getRoutes('view_dir_' . $i), '/') . $url . $extension))) {
+                if (is_file(($template = rtrim($this->router->collection->getRoutes('view_dir_'.$i), '/').$url.$extension))) {
                     $this->request['collection_index'] = $i;
                     return [
                         'dispatcher' => $this->dispatcher['isTemplate'],
@@ -156,13 +156,13 @@ 
     {
         $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;
+        do {
+            $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';
-                $route[1] = isset($route[1])?$route[1]:'index';
+                $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);
                     $this->request['collection_index'] = $i;
@@ -175,7 +175,7 @@ 
                 }
             }
             ++$i;
-        }while($i < $this->router->collection->countRoutes);
+        }while ($i < $this->router->collection->countRoutes);
         return false;
     }
 

src/Routing/Matcher/ArrayMatcher.php

Spacing +48 added lines, -48 removed lines

@@ -25,7 +25,7 @@ 
     /**
      * @var array
      */
-    private $resolver = ['isClosureAndTemplate','isControllerAndTemplate','isTemplate'];
+    private $resolver = ['isClosureAndTemplate', 'isControllerAndTemplate', 'isTemplate'];
 
     /**
      * @var array
@@ -34,8 +34,8 @@ 
         'isClosure' => 'JetFire\Routing\Dispatcher\ClosureDispatcher',
         'isController' => 'JetFire\Routing\Dispatcher\ControllerDispatcher',
         'isTemplate' => 'JetFire\Routing\Dispatcher\TemplateDispatcher',
-        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
-        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher','JetFire\Routing\Dispatcher\TemplateDispatcher'],
+        'isControllerAndTemplate' => ['JetFire\Routing\Dispatcher\ControllerDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
+        'isClosureAndTemplate' => ['JetFire\Routing\Dispatcher\ClosureDispatcher', 'JetFire\Routing\Dispatcher\TemplateDispatcher'],
     ];
 
     /**
@@ -49,14 +49,14 @@ 
     /**
      * @param array $resolver
      */
-    public function setResolver($resolver = []){
+    public function setResolver($resolver = []) {
         $this->resolver = $resolver;
     }
 
     /**
      * @param string $resolver
      */
-    public function addResolver($resolver){
+    public function addResolver($resolver) {
         $this->resolver[] = $resolver;
     }
 
@@ -71,7 +71,7 @@ 
     /**
      * @param array $dispatcher
      */
-    public function setDispatcher($dispatcher = []){
+    public function setDispatcher($dispatcher = []) {
         $this->dispatcher = $dispatcher;
     }
 
@@ -81,7 +81,7 @@ 
      * @return mixed|void
      * @internal param array $dispatcher
      */
-    public function addDispatcher($method,$class){
+    public function addDispatcher($method, $class) {
         $this->dispatcher[$method] = $class;
     }
 
@@ -92,17 +92,17 @@ 
     {
         $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)) {
+                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();
-                        if(!is_null($response = $this->generateTarget())) return $response;
+                        if (!is_null($response = $this->generateTarget())) return $response;
                     }
                 }
             }
@@ -114,20 +114,20 @@ 
      * @param $route
      * @return bool
      */
-    private function checkSubdomain($route){
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']));
-        $host = explode(':',$host)[0];
+    private function checkSubdomain($route) {
+        $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($route[0] == '/'){
+        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){
+        }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;
             }
         }
@@ -140,7 +140,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 '([^/]+)';
     }
@@ -153,7 +153,7 @@ 
     {
         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]].')';
         }
         return '([^/]+)';
     }
@@ -181,7 +181,7 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod()) {
+        if ($this->validMethod()) {
             foreach ($this->resolver as $resolver) {
                 if (is_array($target = call_user_func_array([$this, $resolver], [$this->router->route->getCallback()]))) {
                     $this->setTarget($target);
@@ -200,7 +200,7 @@ 
     /**
      * @param array $target
      */
-    public function setTarget($target = []){
+    public function setTarget($target = []) {
         $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
         $this->router->route->setDetail($this->request);
         $this->router->route->setTarget($target);
@@ -211,9 +211,9 @@ 
     /**
      *
      */
-    private function setCallback(){
+    private function setCallback() {
         if (isset($this->request['params'])) {
-            if(is_callable($this->request['params']))
+            if (is_callable($this->request['params']))
                 $this->router->route->setCallback($this->request['params']);
             else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
@@ -230,7 +230,7 @@ 
      */
     public function validMethod()
     {
-        if(is_callable($this->request['params']))return true;
+        if (is_callable($this->request['params']))return true;
         if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
             return (isset($this->request['params']['ajax']) && $this->request['params']['ajax'] === true) ? true : false;
         $method = (isset($this->request['params']['method'])) ? $this->request['params']['method'] : ['GET'];
@@ -242,10 +242,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function isClosureAndTemplate($callback){
-        if(is_array($cls = $this->isClosure($callback))) {
+    public function isClosureAndTemplate($callback) {
+        if (is_array($cls = $this->isClosure($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
-                return array_merge(array_merge($cls, $tpl),[
+                return array_merge(array_merge($cls, $tpl), [
                     'dispatcher' => $this->dispatcher['isClosureAndTemplate']
                 ]);
             }
@@ -259,10 +259,10 @@ 
      * @return array|bool
      * @throws \Exception
      */
-    public function isControllerAndTemplate($callback){
-        if(is_array($ctrl = $this->isController($callback))) {
+    public function isControllerAndTemplate($callback) {
+        if (is_array($ctrl = $this->isController($callback))) {
             if (is_array($this->request['params']) && isset($this->request['params']['template']) && is_array($tpl = $this->isTemplate($this->request['params']['template']))) {
-                return array_merge(array_merge($ctrl, $tpl),[
+                return array_merge(array_merge($ctrl, $tpl), [
                     'dispatcher' => $this->dispatcher['isControllerAndTemplate']
                 ]);
             }
@@ -297,19 +297,19 @@ 
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
             if (!isset($routes[1])) $routes[1] = 'index';
-            if ($routes[1] == '{method}'){
-                $this->request['parameters'] = explode('/',str_replace(str_replace('*','',$this->request['route']),'',$this->router->route->getUrl()));
+            if ($routes[1] == '{method}') {
+                $this->request['parameters'] = explode('/', str_replace(str_replace('*', '', $this->request['route']), '', $this->router->route->getUrl()));
                 $routes[1] = $this->request['parameters'][0];
                 array_shift($this->request['parameters']);
-                if(preg_match('/[A-Z]/', $routes[1])) return false;
-                $routes[1] = lcfirst(str_replace(' ','',ucwords(str_replace('-',' ',$routes[1]))));
+                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;
             $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 (!class_exists($class))
-                throw new \Exception('Class "' . $class . '." is not found');
+                throw new \Exception('Class "'.$class.'." is not found');
             if (method_exists($class, $routes[1])) {
                 return [
                     'dispatcher' => $this->dispatcher['isController'],
@@ -319,7 +319,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;
     }
@@ -331,25 +331,25 @@ 
      */
     public function isTemplate($callback)
     {
-        if(is_string($callback) && strpos($callback, '@') === false) {
+        if (is_string($callback) && strpos($callback, '@') === false) {
             $path = trim($callback, '/');
             $extension = substr(strrchr($path, "."), 1);
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
-            $viewDir = $this->router->collection->getRoutes('view_dir_' . $index);
+            $viewDir = $this->router->collection->getRoutes('view_dir_'.$index);
             $target = null;
-            if (in_array('.' . $extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir . $path) || is_file($fullPath = $path)))
+            if (in_array('.'.$extension, $this->router->getConfig()['templateExtension']) && (is_file($fullPath = $viewDir.$path) || is_file($fullPath = $path)))
                 $target = $fullPath;
             else {
                 foreach ($this->router->getConfig()['templateExtension'] as $ext) {
-                    if (is_file($fullPath = $viewDir . $path . $ext) || is_file($fullPath = $path . $ext)) {
+                    if (is_file($fullPath = $viewDir.$path.$ext) || is_file($fullPath = $path.$ext)) {
                         $target = $fullPath;
                         $extension = substr(strrchr($ext, "."), 1);
                         break;
                     }
                 }
             }
-            if(is_null($target))
-                throw new \Exception('Template file "' . $path . '" is not found in "' . $viewDir . '"');
+            if (is_null($target))
+                throw new \Exception('Template file "'.$path.'" is not found in "'.$viewDir.'"');
             return [
                 'dispatcher' => $this->dispatcher['isTemplate'],
                 'template'   => $target,

src/Routing/Middleware.php

Spacing +12 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
                 if (is_array($blocks)) {
                     foreach ($blocks as $block)
                         if (class_exists($block))
-                            if($this->callHandler($block) === false) return false;
+                            if ($this->callHandler($block) === false) return false;
                 }
                 elseif (is_string($blocks) && class_exists($blocks))
                     return $this->callHandler($blocks);
@@ -63,10 +63,10 @@ 
             $ctrl = str_replace('\\', '/', $this->router->route->getTarget('controller'));
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
                 $classes = $this->router->collection->middleware['class_middleware'][$ctrl];
-                if(is_array($classes)){
+                if (is_array($classes)) {
                     foreach ($classes as $class)
-                        if($this->callHandler($class) === false)return false;
-                }elseif(is_string($classes))
+                        if ($this->callHandler($class) === false)return false;
+                }elseif (is_string($classes))
                     return $this->callHandler($classes);
             }
         }
@@ -81,10 +81,10 @@ 
         if (isset($this->router->collection->middleware['route_middleware']))
             if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) {
                 $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
-                if(is_array($classes)){
+                if (is_array($classes)) {
                     foreach ($classes as $class)
-                        if($this->callHandler($class) === false)return false;
-                }elseif(is_string($classes))
+                        if ($this->callHandler($class) === false)return false;
+                }elseif (is_string($classes))
                     return $this->callHandler($classes);
             }
         return null;
@@ -94,8 +94,8 @@ 
      * @param $class
      * @return mixed
      */
-    private function callHandler($class){
-        $instance = call_user_func($this->router->getConfig()['di'],$class);
+    private function callHandler($class) {
+        $instance = call_user_func($this->router->getConfig()['di'], $class);
         if (method_exists($instance, 'handle')) {
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
             $dependencies = [];
@@ -112,8 +112,8 @@ 
      * @param $class
      * @return Route|RouteCollection|Router|mixed
      */
-    private function getClass($class){
-        switch($class){
+    private function getClass($class) {
+        switch ($class) {
             case 'JetFire\Routing\Route':
                 return $this->router->route;
             case 'JetFire\Routing\Router':
@@ -121,7 +121,7 @@ 
             case 'JetFire\Routing\RouteCollection':
                 return $this->router->collection;
             default:
-                return call_user_func_array($this->router->getConfig()['di'],[$class]);
+                return call_user_func_array($this->router->getConfig()['di'], [$class]);
         }
     }
 }

src/Routing/Router.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
         $this->response->setStatusCode(404);
         $this->route = is_null($route) ? new Route() : $route;
         $this->middleware = new Middleware($this);
-        $this->config['di'] = function ($class) {
+        $this->config['di'] = function($class) {
             return new $class;
         };
     }
@@ -114,7 +114,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], '/'));
     }
 
     /**

src/Routing/RouteCollection.php

Spacing +25 added lines, -25 removed lines

@@ -47,12 +47,12 @@ 
     public function addRoutes($routes = null, $options = [])
     {
         if (!is_null($routes) && !is_array($routes)) {
-            if (strpos($routes, '.php') === false) $routes = trim($routes, '/') . '/';
-            if (is_file($routes . '/routes.php') && is_array($routesFile = include $routes . '/routes.php')) $routes = $routesFile;
+            if (strpos($routes, '.php') === false) $routes = trim($routes, '/').'/';
+            if (is_file($routes.'/routes.php') && is_array($routesFile = include $routes.'/routes.php')) $routes = $routesFile;
             elseif (is_file($routes) && is_array($routesFile = include $routes)) $routes = $routesFile;
-            else throw new \InvalidArgumentException('Argument for "' . get_called_class() . '" constructor is not recognized. Expected argument array or file containing array but "' . $routes . '" given');
+            else throw new \InvalidArgumentException('Argument for "'.get_called_class().'" constructor is not recognized. Expected argument array or file containing array but "'.$routes.'" given');
         }
-        $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
+        $this->routes['routes_'.$this->countRoutes] = is_array($routes) ? $routes : [];
         $this->setRoutes($options, $this->countRoutes);
         $this->countRoutes++;
     }
@@ -76,10 +76,10 @@ 
         if (is_array($args)) {
             $nbrArgs = count($args);
             for ($i = 0; $i < $nbrArgs; ++$i)
-                $this->routes['prefix_' . $i] = '/' . trim($args[$i], '/');
+                $this->routes['prefix_'.$i] = '/'.trim($args[$i], '/');
         } elseif (is_string($args))
             for ($i = 0; $i < $this->countRoutes; ++$i)
-                $this->routes['prefix_' . $i] = '/' . trim($args, '/');
+                $this->routes['prefix_'.$i] = '/'.trim($args, '/');
         if ($this->countRoutes == 0) $this->countRoutes++;
     }
 
@@ -92,7 +92,7 @@ 
         for ($i = 0; $i < $nbrArgs; ++$i) {
             if (is_array($args[$i])) {
                 $this->setRoutes($args[$i], $i);
-                if (!isset($this->routes['routes_' . $i])) $this->routes['routes_' . $i] = [];
+                if (!isset($this->routes['routes_'.$i])) $this->routes['routes_'.$i] = [];
             }
         }
         if ($this->countRoutes == 0) $this->countRoutes++;
@@ -104,11 +104,11 @@ 
      */
     private function setRoutes($args = [], $i)
     {
-        $this->routes['block_' . $i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/') . '/' : '';
-        $this->routes['view_dir_' . $i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/') . '/' : '';
-        $this->routes['ctrl_namespace_' . $i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\') . '\\' : '';
-        $this->routes['prefix_' . $i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/' . trim($args['prefix'], '/') : '';
-        $this->routes['subdomain_' . $i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
+        $this->routes['block_'.$i] = (isset($args['block']) && !empty($args['block'])) ? rtrim($args['block'], '/').'/' : '';
+        $this->routes['view_dir_'.$i] = (isset($args['view_dir']) && !empty($args['view_dir'])) ? rtrim($args['view_dir'], '/').'/' : '';
+        $this->routes['ctrl_namespace_'.$i] = (isset($args['ctrl_namespace']) && !empty($args['ctrl_namespace'])) ? trim($args['ctrl_namespace'], '\\').'\\' : '';
+        $this->routes['prefix_'.$i] = (isset($args['prefix']) && !empty($args['prefix'])) ? '/'.trim($args['prefix'], '/') : '';
+        $this->routes['subdomain_'.$i] = (isset($args['subdomain'])) ? $args['subdomain'] : '';
     }
 
     /**
@@ -135,31 +135,31 @@ 
         $protocol = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http');
         $domain = $_SERVER['SERVER_NAME'];
         $root = (is_null($root))
-            ? $protocol . '://' . $domain . ((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 8080) ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/' . $script_file, '', $_SERVER['SCRIPT_NAME'])
+            ? $protocol.'://'.$domain.((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 8080) ? ':'.$_SERVER['SERVER_PORT'] : '').str_replace('/'.$script_file, '', $_SERVER['SCRIPT_NAME'])
             : $root;
         if (strpos($domain, ($new_domain = $this->getDomain($root))) !== false)
             $root = str_replace($domain, $new_domain, $root);
         $count = 0;
         for ($i = 0; $i < $this->countRoutes; ++$i) {
-            $prefix = (isset($this->routes['prefix_' . $i])) ? $this->routes['prefix_' . $i] : '';
-            $subdomain = (isset($this->routes['subdomain_' . $i])) ? $this->routes['subdomain_' . $i] : '';
-            $url = (!empty($subdomain)) ? str_replace($protocol.'://',$protocol.'://'.$subdomain.'.' ,$root) : $root;
-            if (isset($this->routes['routes_' . $i]))
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
+            $prefix = (isset($this->routes['prefix_'.$i])) ? $this->routes['prefix_'.$i] : '';
+            $subdomain = (isset($this->routes['subdomain_'.$i])) ? $this->routes['subdomain_'.$i] : '';
+            $url = (!empty($subdomain)) ? str_replace($protocol.'://', $protocol.'://'.$subdomain.'.', $root) : $root;
+            if (isset($this->routes['routes_'.$i]))
+                foreach ($this->routes['routes_'.$i] as $route => $dependencies) {
                     if (is_array($dependencies) && isset($dependencies['use']))
-                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
+                        $use = (is_callable($dependencies['use'])) ? 'closure-'.$count : trim($dependencies['use'], '/');
                     elseif (!is_array($dependencies))
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
+                        $use = (is_callable($dependencies)) ? 'closure-'.$count : trim($dependencies, '/');
                     else
                         $use = $route;
                     if (isset($route[0]) && $route[0] == '/') {
                         (!is_callable($dependencies) && isset($dependencies['name']))
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $url . $prefix . $route
-                            : $this->routesByName[$use] = $url . $prefix . $route;
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $url.$prefix.$route
+                            : $this->routesByName[$use] = $url.$prefix.$route;
                     } else {
                         (!is_callable($dependencies) && isset($dependencies['name']))
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix
-                            : $this->routesByName[$use] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix;
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix
+                            : $this->routesByName[$use] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix;
                     }
                     $count++;
                 }
@@ -192,7 +192,7 @@ 
         foreach ($this->routesByName as $key => $route) {
             $param = explode('#', $key);
             $route = str_replace('{subdomain}', $subdomain, $route);
-            foreach ($params as $key2 => $value) $route = str_replace(':' . $key2, $value, $route);
+            foreach ($params as $key2 => $value) $route = str_replace(':'.$key2, $value, $route);
             if ($param[0] == trim($name, '/')) return $route;
             else if (isset($param[1]) && $param[1] == $name) return $route;
         }

src/Routing/Dispatcher/ControllerDispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
     {
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
         if (!$reflector->isInstantiable())
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
+            throw new \Exception('Target ['.$this->route->getTarget('controller').'] is not instantiable.');
         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');