jetfirephp / routing

src/Routing/RouteCollection.php

Doc Comments +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
     }
 
     /**
-     * @param null $key
+     * @param string $key
      * @return array
      */
     public function getRoutes($key = null)
@@ -96,7 +96,7 @@ 
 
     /**
      * @param array $args
-     * @param $i
+     * @param integer $i
      */
     private function setRoutes($args = [], $i)
     {
@@ -152,7 +152,7 @@ 
     }
 
     /**
-     * @param $url
+     * @param string $url
      * @return bool
      */
     public function getDomain($url)

Spacing +21 added lines, -21 removed lines

@@ -43,12 +43,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++;
     }
@@ -72,10 +72,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++;
     }
 
@@ -88,7 +88,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++;
@@ -100,11 +100,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'] : '';
     }
 
     /**
@@ -126,24 +126,24 @@ 
      */
     public function generateRoutesPath()
     {
-        $root = (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']);
+        $root = (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']);
         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] : '';
-            if (isset($this->routes['routes_' . $i]))
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
+            $prefix = (isset($this->routes['prefix_'.$i])) ? $this->routes['prefix_'.$i] : '';
+            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']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
+                        (!is_callable($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use.'#'.$dependencies['name']] = $root.$prefix.$route : $this->routesByName[$use] = $root.$prefix.$route;
                     } else {
-                        (!is_callable($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $_SERVER['REQUEST_SCHEME'] . '://' . str_replace('{host}', $new_domain, $route) . $prefix : $this->routesByName[$use] = $_SERVER['REQUEST_SCHEME'] . '://' . str_replace('{host}', $new_domain, $route) . $prefix;
+                        (!is_callable($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use.'#'.$dependencies['name']] = $_SERVER['REQUEST_SCHEME'].'://'.str_replace('{host}', $new_domain, $route).$prefix : $this->routesByName[$use] = $_SERVER['REQUEST_SCHEME'].'://'.str_replace('{host}', $new_domain, $route).$prefix;
                     }
                     $count++;
                 }
@@ -176,7 +176,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;
         }

Braces +63 added lines, -33 removed lines

@@ -33,7 +33,9 @@ 
      */
     public function __construct($routes = null, $options = [])
     {
-        if (!is_null($routes) || !empty($options)) $this->addRoutes($routes, $options);
+        if (!is_null($routes) || !empty($options)) {

+            $this->addRoutes($routes, $options);

+        }

     }
 
     /**
@@ -43,10 +45,16 @@ 
     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;
-            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');
+            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');

+            }

         }
         $this->routes['routes_' . $this->countRoutes] = is_array($routes) ? $routes : [];
         $this->setRoutes($options, $this->countRoutes);
@@ -59,8 +67,9 @@ 
      */
     public function getRoutes($key = null)
     {
-        if (!is_null($key))
-            return isset($this->routes[$key]) ? $this->routes[$key] : '';
+        if (!is_null($key)) {

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

+        }

         return $this->routes;
     }
 
@@ -71,12 +80,18 @@ 
     {
         if (is_array($args)) {
             $nbrArgs = count($args);
-            for ($i = 0; $i < $nbrArgs; ++$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, '/');
-        if ($this->countRoutes == 0) $this->countRoutes++;
+            for ($i = 0; $i < $nbrArgs; ++$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, '/');

+            }

+        if ($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }
 
     /**
@@ -88,10 +103,14 @@ 
         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++;
+        if ($this->countRoutes == 0) {

+            $this->countRoutes++;

+        }

     }
 
     /**
@@ -113,12 +132,16 @@ 
      */
     public function setMiddleware($middleware)
     {
-        if (is_string($middleware)) $middleware = rtrim($middleware, '/');
-        if (is_array($middleware))
-            $this->middleware = $middleware;
-        elseif (is_file($middleware) && is_array($mid = include $middleware))
-            $this->middleware = $mid;
-        else throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');
+        if (is_string($middleware)) {

+            $middleware = rtrim($middleware, '/');

+        }

+        if (is_array($middleware)) {

+                    $this->middleware = $middleware;

+        } elseif (is_file($middleware) && is_array($mid = include $middleware)) {

+                    $this->middleware = $mid;

+        } else {

+            throw new \InvalidArgumentException('Accepted argument for setMiddleware are array and array file');

+        }

     }
 
     /**
@@ -127,19 +150,21 @@ 
     public function generateRoutesPath()
     {
         $root = (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']);
-        if (strpos($domain, ($new_domain = $this->getDomain($root))) !== false)
-            $root = str_replace($domain, $new_domain, $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] : '';
-            if (isset($this->routes['routes_' . $i]))
-                foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
+            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'], '/');
-                    elseif (!is_array($dependencies))
-                        $use = (is_callable($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
-                    else
-                        $use = $route;
+                        $use = (is_callable($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');

+            } elseif (!is_array($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']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
                     } else {
@@ -176,9 +201,14 @@ 
         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);
-            if ($param[0] == trim($name, '/')) return $route;
-            else if (isset($param[1]) && $param[1] == $name) return $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;

+            }

         }
         return null;
     }

src/Routing/Matcher/ArrayMatcher.php

Spacing +42 added lines, -42 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,15 +92,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)) {
+                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();
                     }
@@ -114,17 +114,17 @@ 
      * @param $route
      * @return bool
      */
-    private function checkSubdomain($route){
-        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
+    private function checkSubdomain($route) {
+        $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http').'://'.($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
         $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']);
                 return true;
             }
@@ -139,7 +139,7 @@ 
     {
         if (is_array($this->request['params']) && isset($this->request['params']['subdomain'])) {
             $this->request['params']['subdomain'] = str_replace('(', '(?:', $this->request['params']['subdomain']);
-            return '(' . $this->request['params']['subdomain'] . ')';
+            return '('.$this->request['params']['subdomain'].')';
         }
         return '([^/]+)';
     }
@@ -152,7 +152,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 '([^/]+)';
     }
@@ -180,9 +180,9 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->resolver as $resolver)
-                if (is_array($target = call_user_func_array([$this,$resolver],[$this->router->route->getCallback()]))) {
+        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);
                     $this->router->response->setStatusCode(202);
                     return true;
@@ -194,7 +194,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);
@@ -205,9 +205,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']))
@@ -224,7 +224,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'];
@@ -236,10 +236,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']
                 ]);
             }
@@ -253,10 +253,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']
                 ]);
             }
@@ -296,7 +296,7 @@ 
                 ? $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'],
@@ -305,7 +305,7 @@ 
                     'action' => $routes[1]
                 ];
             }
-            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;
     }
@@ -317,25 +317,25 @@ 
      */
     public function isTemplate($callback)
     {
-        if(is_string($callback)) {
+        if (is_string($callback)) {
             $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,

Braces +38 added lines, -23 removed lines

@@ -117,10 +117,12 @@ 
     private function checkSubdomain($route){
         $url = (isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http') . '://' . ($host = (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
         $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){
+        } 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);
@@ -165,8 +167,9 @@ 
     {
         if (substr($this->request['route'], -1) == '*') {
             $pos = strpos($this->request['route'], '*');
-            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos) && isset($this->request['params']))
-                return true;
+            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos) && isset($this->request['params'])) {

+                            return true;

+            }

         }
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
@@ -180,10 +183,11 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->resolver as $resolver)
+        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);
+                    $this->setTarget($target);

+        }

                     $this->router->response->setStatusCode(202);
                     return true;
                 }
@@ -207,14 +211,18 @@ 
      */
     private function setCallback(){
         if (isset($this->request['params'])) {
-            if(is_callable($this->request['params']))
-                $this->router->route->setCallback($this->request['params']);
-            else {
+            if(is_callable($this->request['params'])) {

+                            $this->router->route->setCallback($this->request['params']);

+            } else {
                 (is_array($this->request['params']) && isset($this->request['params']['use']))
                     ? $this->router->route->setCallback($this->request['params']['use'])
                     : $this->router->route->setCallback($this->request['params']);
-                if (isset($this->request['params']['name'])) $this->router->route->setName($this->request['params']['name']);
-                if (isset($this->request['params']['method'])) $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];
+                if (isset($this->request['params']['name'])) {

+                    $this->router->route->setName($this->request['params']['name']);

+                }

+                if (isset($this->request['params']['method'])) {

+                    $this->request['params']['method'] = is_array($this->request['params']['method']) ? $this->request['params']['method'] : [$this->request['params']['method']];

+                }

             }
         }
     }
@@ -224,9 +232,12 @@ 
      */
     public function validMethod()
     {
-        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;
+        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'];
         return (in_array($this->router->route->getMethod(), $method)) ? true : false;
     }
@@ -290,13 +301,16 @@ 
     {
         if (is_string($callback) && strpos($callback, '@') !== false) {
             $routes = explode('@', $callback);
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             $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];
-            if (!class_exists($class))
-                throw new \Exception('Class "' . $class . '." is not found');
+            if (!class_exists($class)) {

+                            throw new \Exception('Class "' . $class . '." is not found');

+            }

             if (method_exists($class, $routes[1])) {
                 return [
                     'dispatcher' => $this->dispatcher['isController'],
@@ -323,9 +337,9 @@ 
             $index = isset($this->request['collection_index']) ? $this->request['collection_index'] : 0;
             $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)))
-                $target = $fullPath;
-            else {
+            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)) {
                         $target = $fullPath;
@@ -334,8 +348,9 @@ 
                     }
                 }
             }
-            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,

Autoload.php

Spacing +32 added lines, -32 removed lines

@@ -28,30 +28,30 @@ 
     /**
      * @return array
      */
-    public function getLoadedClass(){
+    public function getLoadedClass() {
         return $this->loaded_classes;
     }
 
     /**
      * @return array
      */
-    public function getNamespaces(){
+    public function getNamespaces() {
         return $this->loaded_classes;
     }
 
     /**
      * @return array
      */
-    public function getClassCollection(){
+    public function getClassCollection() {
         return $this->loaded_classes;
     }
 
     /**
      * @param null $base_path
      */
-    public function register($base_path = null){
-        if(!is_null($base_path))$this->base_path = rtrim($base_path,'/');
-        spl_autoload_register(array($this,'loadClass'));
+    public function register($base_path = null) {
+        if (!is_null($base_path))$this->base_path = rtrim($base_path, '/');
+        spl_autoload_register(array($this, 'loadClass'));
     }
 
     /**
@@ -65,13 +65,13 @@ 
     /**
      * @param $class
      */
-    private function loadClass($class){
-        if(!isset($this->loaded_classes[$class])) {
+    private function loadClass($class) {
+        if (!isset($this->loaded_classes[$class])) {
             if (isset($this->class_collection[$class]) && $this->loadFile($this->class_collection[$class], $class)) return;
-            elseif($this->findClass($class))return;
-            else{
+            elseif ($this->findClass($class))return;
+            else {
                 $file = $this->base_path.'/'.str_replace('\\', '/', $class).'.php';
-                $this->loadFile($file,$class);
+                $this->loadFile($file, $class);
                 return;
             }
         }
@@ -82,8 +82,8 @@ 
      * @param $class
      * @return bool
      */
-    private function loadFile($file,$class){
-        if(is_file($file)){
+    private function loadFile($file, $class) {
+        if (is_file($file)) {
             require $file;
             $this->loaded_classes[$class] = $file;
             return true;
@@ -96,15 +96,15 @@ 
      * @param $class
      * @return bool
      */
-    private function findClass($class){
+    private function findClass($class) {
         $prefix = $class;
         while (false !== $pos = strrpos($prefix, '\\')) {
             $prefix = substr($class, 0, $pos + 1);
             $relative_class = substr($class, $pos + 1);
-            if(isset($this->namespaces[$prefix])){
-                foreach($this->namespaces[$prefix] as $dir) {
-                    $file = $dir . str_replace('\\', '/', $relative_class) . '.php';
-                    if ($this->loadFile($file,$class)) return true;
+            if (isset($this->namespaces[$prefix])) {
+                foreach ($this->namespaces[$prefix] as $dir) {
+                    $file = $dir.str_replace('\\', '/', $relative_class).'.php';
+                    if ($this->loadFile($file, $class)) return true;
                 }
             }
             $prefix = rtrim($prefix, '\\');
@@ -120,13 +120,13 @@ 
      */
     public function addNamespace($prefix, $base_dirs, $prepend = false)
     {
-        if(is_array($base_dirs))
-            foreach($base_dirs as $dir)
+        if (is_array($base_dirs))
+            foreach ($base_dirs as $dir)
                 $this->addNamespace($prefix, $dir, $prepend);
-        else{
+        else {
             $prefix = trim($prefix, '\\').'\\';
             $base_dir = rtrim($base_dirs, '/').'/';
-            if(!isset($this->namespaces[$prefix]))
+            if (!isset($this->namespaces[$prefix]))
                 $this->namespaces[$prefix] = [];
             ($prepend)
                 ? array_unshift($this->namespaces[$prefix], $base_dir)
@@ -137,27 +137,27 @@ 
     /**
      * @param array $prefixes
      */
-    public function setNamespaces($prefixes){
-        if(is_string($prefixes))$prefixes = include $prefixes;
-        if(is_array($prefixes))
-            foreach($prefixes as $prefix => $base_dir)
-                $this->addNamespace($prefix,$base_dir);
+    public function setNamespaces($prefixes) {
+        if (is_string($prefixes))$prefixes = include $prefixes;
+        if (is_array($prefixes))
+            foreach ($prefixes as $prefix => $base_dir)
+                $this->addNamespace($prefix, $base_dir);
     }
 
     /**
      * @param $class
      * @param $path
      */
-    public function addClass($class,$path){
+    public function addClass($class, $path) {
         $this->class_collection[$class] = $path;
     }
 
     /**
      * @param array $collection
      */
-    public function setClassCollection($collection){
-        if(is_string($collection))$collection = include $collection;
-        if(is_array($collection))
-            $this->class_collection = array_merge($this->class_collection,$collection);
+    public function setClassCollection($collection) {
+        if (is_string($collection))$collection = include $collection;
+        if (is_array($collection))
+            $this->class_collection = array_merge($this->class_collection, $collection);
     }
 }

Braces +31 added lines, -18 removed lines

@@ -50,7 +50,9 @@ 
      * @param null $base_path
      */
     public function register($base_path = null){
-        if(!is_null($base_path))$this->base_path = rtrim($base_path,'/');
+        if(!is_null($base_path)) {

+            $this->base_path = rtrim($base_path,'/');

+        }

         spl_autoload_register(array($this,'loadClass'));
     }
 
@@ -67,9 +69,11 @@ 
      */
     private function loadClass($class){
         if(!isset($this->loaded_classes[$class])) {
-            if (isset($this->class_collection[$class]) && $this->loadFile($this->class_collection[$class], $class)) return;
-            elseif($this->findClass($class))return;
-            else{
+            if (isset($this->class_collection[$class]) && $this->loadFile($this->class_collection[$class], $class)) {

+                return;

+            } elseif($this->findClass($class)) {

+                return;

+            } else{
                 $file = $this->base_path.'/'.str_replace('\\', '/', $class).'.php';
                 $this->loadFile($file,$class);
                 return;
@@ -104,7 +108,9 @@ 
             if(isset($this->namespaces[$prefix])){
                 foreach($this->namespaces[$prefix] as $dir) {
                     $file = $dir . str_replace('\\', '/', $relative_class) . '.php';
-                    if ($this->loadFile($file,$class)) return true;
+                    if ($this->loadFile($file,$class)) {

+                        return true;

+                    }

                 }
             }
             $prefix = rtrim($prefix, '\\');
@@ -120,14 +126,15 @@ 
      */
     public function addNamespace($prefix, $base_dirs, $prepend = false)
     {
-        if(is_array($base_dirs))
-            foreach($base_dirs as $dir)
-                $this->addNamespace($prefix, $dir, $prepend);
-        else{
+        if(is_array($base_dirs)) {

+                    foreach($base_dirs as $dir)
+                $this->addNamespace($prefix, $dir, $prepend);

+        } else{
             $prefix = trim($prefix, '\\').'\\';
             $base_dir = rtrim($base_dirs, '/').'/';
-            if(!isset($this->namespaces[$prefix]))
-                $this->namespaces[$prefix] = [];
+            if(!isset($this->namespaces[$prefix])) {

+                            $this->namespaces[$prefix] = [];

+            }

             ($prepend)
                 ? array_unshift($this->namespaces[$prefix], $base_dir)
                 : array_push($this->namespaces[$prefix], $base_dir);
@@ -138,10 +145,13 @@ 
      * @param array $prefixes
      */
     public function setNamespaces($prefixes){
-        if(is_string($prefixes))$prefixes = include $prefixes;
-        if(is_array($prefixes))
-            foreach($prefixes as $prefix => $base_dir)
-                $this->addNamespace($prefix,$base_dir);
+        if(is_string($prefixes)) {

+            $prefixes = include $prefixes;

+        }

+        if(is_array($prefixes)) {

+                    foreach($prefixes as $prefix => $base_dir)
+                $this->addNamespace($prefix,$base_dir);

+        }

     }
 
     /**
@@ -156,8 +166,11 @@ 
      * @param array $collection
      */
     public function setClassCollection($collection){
-        if(is_string($collection))$collection = include $collection;
-        if(is_array($collection))
-            $this->class_collection = array_merge($this->class_collection,$collection);
+        if(is_string($collection)) {

+            $collection = include $collection;

+        }

+        if(is_array($collection)) {

+                    $this->class_collection = array_merge($this->class_collection,$collection);

+        }

     }
 }

index.php

Spacing +6 added lines, -6 removed lines

@@ -4,28 +4,28 @@
 
 require __DIR__.'/Autoload.php';
 
-$autoload =  new Autoload();
-$autoload->addNamespace('JetFire\Routing',[
+$autoload = new Autoload();
+$autoload->addNamespace('JetFire\Routing', [
     __DIR__.'/src/Routing',
     __DIR__.'/',
 ]);
-$autoload->addClass('Normal1Controller',__DIR__.'/Block1/Normal1Controller.php');
+$autoload->addClass('Normal1Controller', __DIR__.'/Block1/Normal1Controller.php');
 $autoload->register();
 
 
 // Create RouteCollection instance
 $collection = new RouteCollection();
-$collection->addRoutes(__DIR__.'/Block1/routes.php',['view_dir'=>__DIR__.'/Block1/Views','prefix'=>'block']);
+$collection->addRoutes(__DIR__.'/Block1/routes.php', ['view_dir'=>__DIR__.'/Block1/Views', 'prefix'=>'block']);
 $router = new \JetFire\Routing\Router($collection);
 $matcher = new \JetFire\Routing\Matcher\ArrayMatcher($router);
 
 $router->addMatcher($matcher);
 $router->setResponses([
     // you can use a closure to handle error
-    '404' => function(){
+    '404' => function() {
         return '404';
     },
-    '405' => function(){
+    '405' => function() {
         return '405';
     }
 ]);

Block1/routes.php

Indentation +7 added lines, -7 removed lines

@@ -2,17 +2,17 @@ 
 
 return [
 	
-	'/'	=> 'index',
+    '/'	=> 'index',
 
     '/user1-:id' => [
         'use' => 'user.html',
         'arguments' => ['id' => '[0-9]+']
     ],
 
-	'/home1'	=> [
-		'use' => 'JetFire\Routing\Block1\Namespace1Controller@index',
+    '/home1'	=> [
+        'use' => 'JetFire\Routing\Block1\Namespace1Controller@index',
         'template' => 'index.php'
-	],
+    ],
 
     '/home-:id'	=> [
         'use' => 'JetFire\Routing\Block1\Namespace1Controller@index2',
@@ -24,10 +24,10 @@ 
         'name' => 'contact'
     ],
 
-	'/search1-:id-:name' => [
-		'use' => function($id,$name){
+    '/search1-:id-:name' => [
+        'use' => function($id,$name){
             return 'Search'.$id.$name;
         },
         'arguments' => ['id' => '[0-9]+','name' => '[a-z]*'],
-	],
+    ],
 ];
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -25,9 +25,9 @@
     ],
 
 	'/search1-:id-:name' => [
-		'use' => function($id,$name){
+		'use' => function($id, $name) {
             return 'Search'.$id.$name;
         },
-        'arguments' => ['id' => '[0-9]+','name' => '[a-z]*'],
+        'arguments' => ['id' => '[0-9]+', 'name' => '[a-z]*'],
 	],
 ];
\ No newline at end of file

Block1/Normal1Controller.php

Spacing +2 added lines, -2 removed lines

@@ -2,11 +2,11 @@
 
 class Normal1Controller {
 
-    public function contact(){
+    public function contact() {
         echo 'Contact1';
     }
 
-    public function user($name = null){
+    public function user($name = null) {
         echo 'User : '.$name;
     }
 

Block1/Namespace1Controller.php

Spacing +5 added lines, -5 removed lines

@@ -3,16 +3,16 @@
 
 class Namespace1Controller {
 
-    public function index(){
+    public function index() {
         return ['message' => 'index'];
     }
 
-    public function index2($id){
-        if($id == 2){
+    public function index2($id) {
+        if ($id == 2) {
             header('Location: http://localhost/JetFire/Routing/block/search1-1-tse');
             return true;
-        }else {
-            return 'Index-' . $id;
+        } else {
+            return 'Index-'.$id;
         }
     }
 

Braces +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
         if($id == 2){
             header('Location: http://localhost/JetFire/Routing/block/search1-1-tse');
             return true;
-        }else {
+        } else {
             return 'Index-' . $id;
         }
     }