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/Dispatcher/ClosureDispatcher.php

Braces +5 added lines, -2 removed lines

@@ -42,8 +42,11 @@
             $this->response->setHeaders(['Content-Type' => 'text/html']);
         }
         $params = ($this->route->getParameters() == '') ? [] : $this->route->getParameters();
-        if(is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) $this->route->addTarget('data',$content);
-        elseif(!is_null($content)) $this->response->setContent($content);
+        if(is_array($content = call_user_func_array($this->route->getTarget('closure'), $params))) {

+            $this->route->addTarget('data',$content);

+        } elseif(!is_null($content)) {

+            $this->response->setContent($content);

+        }

     }
 
 }

src/Routing/Router.php

Braces +22 added lines, -12 removed lines

@@ -80,8 +80,9 @@ 
      * @param object|array $matcher
      */
     public function setMatcher($matcher){
-        if(is_object($matcher))
-            $matcher = [$matcher];
+        if(is_object($matcher)) {

+                    $matcher = [$matcher];

+        }

         $this->matcher = $matcher;
     }
 
@@ -98,7 +99,9 @@ 
     public function run()
     {
         $this->setUrl();
-        if ($this->config['generateRoutesPath']) $this->collection->generateRoutesPath();
+        if ($this->config['generateRoutesPath']) {

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

+        }

         if ($this->match()) {
             $this->handle();
             $this->callTarget();
@@ -111,8 +114,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], '/'));
     }
 
@@ -122,8 +126,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;
     }
@@ -170,11 +175,16 @@ 
         if (isset($this->route->getDetail()['response_templates']) && isset($this->route->getDetail()['response_templates'][$code = $this->response->getStatusCode()])) {
             $this->route->setCallback($this->route->getDetail()['response_templates'][$code]);
             $matcher = null;
-            foreach($this->matcher as $instance) if($instance instanceof ArrayMatcher) $matcher = $instance;
-            if(is_null($matcher))$matcher = new ArrayMatcher($this);
-            foreach (call_user_func([$matcher, 'getResolver']) as $match)
-                if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))){
-                    call_user_func_array([$matcher, 'setTarget'],[$target]);
+            foreach($this->matcher as $instance) {

+                if($instance instanceof ArrayMatcher) $matcher = $instance;

+            }

+            if(is_null($matcher)) {

+                $matcher = new ArrayMatcher($this);

+            }

+            foreach (call_user_func([$matcher, 'getResolver']) as $match) {

+                            if (is_array($target = call_user_func_array([$matcher, $match], [$this->route->getCallback()]))){
+                    call_user_func_array([$matcher, 'setTarget'],[$target]);

+            }

                     $this->callTarget();
                     break;
                 }

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +12 added lines, -7 removed lines

@@ -47,14 +47,19 @@
      */
     public function call()
     {
-        if ($this->response->getStatusCode() == 202)
-            $this->setContentType($this->route->getTarget('extension'));
-        if (isset($this->route->getTarget('callback')[$this->route->getTarget('extension')]))
-            $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));
-        else {
+        if ($this->response->getStatusCode() == 202) {

+                    $this->setContentType($this->route->getTarget('extension'));

+        }

+        if (isset($this->route->getTarget('callback')[$this->route->getTarget('extension')])) {

+                    $this->response->setContent(call_user_func_array($this->route->getTarget('callback')[$this->route->getTarget('extension')], [$this->route]));

+        } else {
             ob_start();
-            if(isset($this->route->getTarget()['data']))extract($this->route->getTarget('data'));
-            if(isset($this->route->getParams()['data']))extract($this->route->getParams()['data']);
+            if(isset($this->route->getTarget()['data'])) {

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

+            }

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

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

+            }

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

src/Routing/RouteCollection.php

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

Braces +16 added lines, -12 removed lines

@@ -29,9 +29,10 @@ 
      */
     public function globalMiddleware()
     {
-        if (isset($this->router->collection->middleware['global_middleware']))
-            foreach ($this->router->collection->middleware['global_middleware'] as $class)
-                if (class_exists($class)) return $this->callHandler($class);
+        if (isset($this->router->collection->middleware['global_middleware'])) {

+                    foreach ($this->router->collection->middleware['global_middleware'] as $class)
+                if (class_exists($class)) return $this->callHandler($class);

+        }

         return null;
     }
 
@@ -40,9 +41,10 @@ 
      */
     public function blockMiddleware()
     {
-        if (isset($this->router->collection->middleware['block_middleware']))
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];
+        if (isset($this->router->collection->middleware['block_middleware'])) {

+                    if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) {
+                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')];

+        }

                 return $this->callHandler($class);
             }
         return null;
@@ -68,9 +70,10 @@ 
      */
     public function routeMiddleware()
     {
-        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']])) {
-                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];
+        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']])) {
+                $class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']];

+        }

                 return $this->callHandler($class);
             }
         return null;
@@ -85,9 +88,10 @@ 
         if (method_exists($instance, 'handle')) {
             $reflectionMethod = new ReflectionMethod($instance, 'handle');
             $dependencies = [];
-            foreach ($reflectionMethod->getParameters() as $arg)
-                if (!is_null($arg->getClass()))
-                    $dependencies[] = $this->getClass($arg->getClass()->name);
+            foreach ($reflectionMethod->getParameters() as $arg) {

+                            if (!is_null($arg->getClass()))
+                    $dependencies[] = $this->getClass($arg->getClass()->name);

+            }

             $dependencies = array_merge($dependencies, [$this->router->route]);
             return $reflectionMethod->invokeArgs($instance, $dependencies);
         }

src/Routing/Matcher/UriMatcher.php

Braces +3 added lines, -2 removed lines

@@ -90,8 +90,9 @@
         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)
-                    return null;
+                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;
             }

src/Routing/Dispatcher/ControllerDispatcher.php

Braces +14 added lines, -8 removed lines

@@ -50,12 +50,17 @@ 
         }
         if($count == count($this->route->getParameters())) {
             $dependencies = array_merge($dependencies, ($this->route->getParameters() == '') ? [] : $this->route->getParameters());
-            if ($this->response->getStatusCode() == 202)
-                $this->response->setStatusCode(200);
-            if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) $this->route->addTarget('data', $content);
-            elseif (!is_null($content)) $this->response->setContent($content);
-        }else
-            $this->response->setStatusCode(404);
+            if ($this->response->getStatusCode() == 202) {

+                            $this->response->setStatusCode(200);

+            }

+            if (is_array($content = $reflectionMethod->invokeArgs($this->getController(), $dependencies))) {

+                $this->route->addTarget('data', $content);

+            } elseif (!is_null($content)) {

+                $this->response->setContent($content);

+            }

+        } else {

+                    $this->response->setStatusCode(404);

+        }

     }
 
 
@@ -66,8 +71,9 @@ 
     private function getController()
     {
         $reflector = new ReflectionClass($this->route->getTarget('controller'));
-        if (!$reflector->isInstantiable())
-            throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');
+        if (!$reflector->isInstantiable()) {

+                    throw new \Exception('Target [' . $this->route->getTarget('controller') . '] is not instantiable.');

+        }

         $constructor = $reflector->getConstructor();
         if (is_null($constructor)) {
             $class = $this->route->getTarget('controller');