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

Braces +60 added lines, -31 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->routes['view_dir_' . $this->countRoutes] = (isset($options['view_dir']) && !empty($options['view_dir'])) ? rtrim($options['view_dir'], '/') . '/' : '';
@@ -62,8 +70,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;
     }
 
@@ -74,12 +83,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++;

+        }

     }
 
     /**
@@ -94,10 +109,14 @@ 
                 $this->routes['view_dir_' . $i] = (isset($args[$i]['view_dir']) && !empty($args[$i]['view_dir'])) ? rtrim($args[$i]['view_dir'], '/') . '/' : '';
                 $this->routes['ctrl_namespace_' . $i] = (isset($args[$i]['ctrl_namespace']) && !empty($args[$i]['ctrl_namespace'])) ? trim($args[$i]['ctrl_namespace'], '\\') . '\\' : '';
                 $this->routes['prefix_' . $i] = (isset($args[$i]['prefix']) && !empty($args[$i]['prefix'])) ? '/'.trim($args[$i]['prefix'], '/') : '';
-                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++;

+        }

     }
 
     /**
@@ -106,12 +125,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');

+        }

     }
 
     /**
@@ -123,14 +146,15 @@ 
         $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;

+                    }

                     (!is_callable($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
                     $count++;
                 }
@@ -147,9 +171,14 @@ 
     {
         foreach ($this->routesByName as $key => $route) {
             $param = explode('#', $key);
-            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)) $this->callHandler($class);
+        if (isset($this->router->collection->middleware['global_middleware'])) {

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

+        }

     }
 
     /**
@@ -39,9 +40,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')];

+        }

                 $this->callHandler($class);
             }
     }
@@ -65,9 +67,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']];

+        }

                 $this->callHandler($class);
             }
     }
@@ -81,9 +84,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]);
             $reflectionMethod->invokeArgs($instance, $dependencies);
         }

src/Routing/Matcher/ArrayMatcher.php

Braces +34 added lines, -21 removed lines

@@ -118,8 +118,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']);
@@ -133,10 +134,11 @@ 
      */
     private function generateTarget()
     {
-        if($this->validMethod())
-            foreach($this->matcher as $match)
+        if($this->validMethod()) {

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

+        }

                     $this->router->response->setStatusCode(202);
                     return true;
                 }
@@ -160,14 +162,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']];

+                }

             }
         }
     }
@@ -177,9 +183,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;
     }
@@ -243,13 +252,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['matchController'],
@@ -276,9 +288,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;
@@ -287,8 +299,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['matchTemplate'],
                 'template'   => $target,

src/Routing/Dispatcher/ControllerDispatcher.php

Braces +15 added lines, -9 removed lines

@@ -42,14 +42,19 @@ 
     {
         $reflectionMethod = new ReflectionMethod($this->route->getTarget('controller'), $this->route->getTarget('action'));
         $dependencies = [];
-        foreach ($reflectionMethod->getParameters() as $arg)
-            if (!is_null($arg->getClass()))
-                $dependencies[] = call_user_func_array($this->route->getTarget('di'),[$arg->getClass()->name]);
+        foreach ($reflectionMethod->getParameters() as $arg) {

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

+        }

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

+        }

     }
 
 
@@ -60,8 +65,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');

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

Braces +9 added lines, -6 removed lines

@@ -47,13 +47,16 @@
      */
     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->getTarget()['data'])) {

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

+            }

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

src/Routing/Router.php

Braces +17 added lines, -11 removed lines

@@ -86,7 +86,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();
@@ -99,8 +101,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], '/'));
     }
 
@@ -111,8 +114,9 @@ 
     {
         foreach ($this->config['matcher'] as $matcher) {
             $this->config['matcherInstance'][$matcher] = new $matcher($this);
-            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match']))
-                return true;
+            if (call_user_func([$this->config['matcherInstance'][$matcher], 'match'])) {

+                            return true;

+            }

         }
         return false;
     }
@@ -158,13 +162,15 @@ 
     {
         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]);
-            if(!isset($this->config['matcherInstance']))
-                foreach ($this->config['matcher'] as $matcher)
-                    $this->config['matcherInstance'][$matcher] = new $matcher($this);
+            if(!isset($this->config['matcherInstance'])) {

+                            foreach ($this->config['matcher'] as $matcher)
+                    $this->config['matcherInstance'][$matcher] = new $matcher($this);

+            }

             foreach($this->config['matcherInstance'] as $instance) {
-                foreach (call_user_func([$instance, 'getMatcher']) as $match)
-                    if (is_array($target = call_user_func_array([$instance, $match], [$this->route->getCallback()]))){
-                        call_user_func_array([$instance, 'setTarget'],[$target]);
+                foreach (call_user_func([$instance, 'getMatcher']) as $match) {

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

+                }

                         $this->callTarget();
                         break;
                     }