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;
     }

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/Middleware.php

Braces +12 added lines, -4 removed lines

@@ -101,7 +101,9 @@ 
     {
         if (isset($this->middleware[$action][$action]['global_middleware'])) {
             foreach ($this->middleware[$action]['global_middleware'] as $class) {
-                if (class_exists($class)) return $this->callHandler($class);
+                if (class_exists($class)) {

+                    return $this->callHandler($class);

+                }

             }
         }
         return true;
@@ -120,7 +122,9 @@ 
                 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)) {
@@ -144,7 +148,9 @@ 
                 $classes = $this->middleware[$action]['class_middleware'][$ctrl];
                 if (is_array($classes)) {
                     foreach ($classes as $class) {
-                        if ($this->callHandler($class) === false) return false;
+                        if ($this->callHandler($class) === false) {

+                            return false;

+                        }

                     }
                 } elseif (is_string($classes)) {
                     return $this->callHandler($classes);
@@ -166,7 +172,9 @@ 
                 $classes = $this->middleware[$action]['route_middleware'][$this->router->route->getPath()['middleware']];
                 if (is_array($classes)) {
                     foreach ($classes as $class) {
-                        if ($this->callHandler($class) === false) return false;
+                        if ($this->callHandler($class) === false) {

+                            return false;

+                        }

                     }
                 } elseif (is_string($classes)) {
                     return $this->callHandler($classes);

src/Routing/RouteCollection.php

Braces +46 added lines, -21 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++;

+        }

     }
 
     /**
@@ -128,10 +147,11 @@ 
             $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 (isset($this->routes['routes_' . $i])) {

+                            foreach ($this->routes['routes_' . $i] as $route => $dependencies) {
                     if (is_array($dependencies) && isset($dependencies['use']) && !is_array($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, '/');
                     } else {
@@ -177,9 +197,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/Dispatcher/ControllerDispatcher.php

Braces +5 added lines, -4 removed lines

@@ -49,10 +49,11 @@
 
         foreach ($reflectionMethod->getParameters() as $arg) {
             if (!is_null($arg->getClass())) {
-                if (isset($classInstance[$arg->getClass()->name]))
-                $dependencies[] = $classInstance[$arg->getClass()->name];
-            else
-                $dependencies[] = call_user_func_array($this->router->route->getTarget('di'), [$arg->getClass()->name]);
+                if (isset($classInstance[$arg->getClass()->name])) {

+                                $dependencies[] = $classInstance[$arg->getClass()->name];

+                } else {

+                            $dependencies[] = call_user_func_array($this->router->route->getTarget('di'), [$arg->getClass()->name]);

+            }

             } else {
                 $count++;
             }

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());
         }

src/Routing/Matcher/ArrayMatcher.php

Braces +10 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) {
@@ -239,7 +241,7 @@ 
                 if (is_array($this->request['params']) && isset($this->request['params']['use'])) {
                     if(is_array($this->request['params']['use']) && isset($this->request['params']['use'][$this->router->route->getMethod()])){
                         $this->router->route->setCallback($this->request['params']['use'][$this->router->route->getMethod()]);
-                    }elseif(!is_array($this->request['params']['use'])){
+                    } elseif(!is_array($this->request['params']['use'])){
                         $this->router->route->setCallback($this->request['params']['use']);
                     }
                 } else {
@@ -331,12 +333,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';

+            }

             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;
+                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;

src/Routing/Router.php

Braces +10 added lines, -5 removed lines

@@ -120,14 +120,16 @@ 
     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();
             }
             $this->callMiddleware('after');
-        }else{
+        } else{
             $this->response->setStatusCode(404);
         }
         return $this->callResponse();
@@ -158,8 +160,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], '/'));
     }
 
@@ -169,7 +172,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;
     }