jetfirephp / routing

src/Routing/Match/RoutesMatch.php

Doc Comments +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     }
 
     /**
-     * @param $regex
+     * @param string $regex
      * @return bool
      */
     private function routeMatch($regex)

Braces +31 added lines, -18 removed lines

@@ -62,8 +62,9 @@ 
                 $this->request['path'] = $dependencies;
                 $this->request['index'] = $i;
                 $this->request['route'] = preg_replace_callback('#:([\w]+)#', [$this, 'paramMatch'], '/' . trim(trim($this->request['prefix'], '/') . '/' . trim($route, '/'), '/'));
-                if ($this->routeMatch('#^' . $this->request['route'] . '$#'))
-                    return $this->generateTarget();
+                if ($this->routeMatch('#^' . $this->request['route'] . '$#')) {

+                                    return $this->generateTarget();

+                }

             }
         }
         unset($this->request);
@@ -91,8 +92,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))
-                if (isset($this->request)) return true;
+            if (substr($this->router->route->getUrl(), 0, $pos) == substr($this->request['route'], 0, $pos)) {

+                            if (isset($this->request)) return true;

+            }

         }
         if (preg_match($regex, $this->router->route->getUrl(), $this->request['parameters'])) {
             array_shift($this->request['parameters']);
@@ -112,19 +114,26 @@ 
             $this->matchClosure();
             $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']);
         } else {
-            if (isset($this->request['path']['name'])) $this->router->route->setName($this->request['path']['name']);
-            if (isset($this->request['path']['method'])) $this->request['path']['method'] = is_array($this->request['path']['method']) ? $this->request['path']['method'] : [$this->request['path']['method']];
-            if (isset($this->request['path']))
-                (is_array($this->request['path']) && isset($this->request['path']['use']))
+            if (isset($this->request['path']['name'])) {

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

+            }

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

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

+            }

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

+                            (is_array($this->request['path']) && isset($this->request['path']['use']))
                     ? $this->router->route->setCallback($this->request['path']['use'])
-                    : $this->router->route->setCallback($this->request['path']);
+                    : $this->router->route->setCallback($this->request['path']);

+            }

             $this->router->route->setDetail($this->request);
             if($this->validMethod()) {
-                foreach($this->matcher as $matcher)
-                    call_user_func([$this,$matcher]);
+                foreach($this->matcher as $matcher) {

+                                    call_user_func([$this,$matcher]);

+                }

                 $this->router->route->setResponse(['code' => 202, 'message' => 'Accepted']);
-            }else
-                $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']);
+            } else {

+                            $this->router->route->setResponse(['code' => 405, 'message' => 'Method Not Allowed']);

+            }

         }
         return $this->router->route->hasTarget();
     }
@@ -134,8 +143,9 @@ 
      */
     public function validMethod()
     {
-        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')
-            return (isset($this->request['path']['ajax']) && $this->request['path']['ajax'] === true) ? true : false;
+        if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {

+                    return (isset($this->request['path']['ajax']) && $this->request['path']['ajax'] === true) ? true : false;

+        }

         $method = (isset($this->router->route->getDetail()['path']['method'])) ? $this->router->route->getDetail()['path']['method'] : ['GET'];
         return (in_array($this->router->route->getMethod(), $method)) ? true : false;
     }
@@ -161,13 +171,16 @@ 
     {
         if (!$this->router->route->hasTarget() && strpos($this->router->route->getCallback(), '@') !== false) {
             $routes = explode('@', $this->router->route->getCallback());
-            if (!isset($routes[1])) $routes[1] = 'index';
+            if (!isset($routes[1])) {

+                $routes[1] = 'index';

+            }

             $index = isset($this->request['index']) ? $this->request['index'] : 0;
             $class = (class_exists($routes[0]))
                 ? $routes[0]
                 : $this->router->collection->getRoutes()['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])) {
                 $this->router->route->setTarget([
                     'dispatcher' => 'JetFire\Routing\Dispatcher\ControllerDispatcher',

src/Routing/Dispatcher/TemplateDispatcher.php

Braces +9 added lines, -7 removed lines

@@ -30,10 +30,11 @@ 
      */
     public function call()
     {
-        if ($this->route->getResponse('code') == 202)
-            switch ($this->route->getTarget('extension')) {
+        if ($this->route->getResponse('code') == 202) {

+                    switch ($this->route->getTarget('extension')) {
                 case 'json':
-                    $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'application/json']);
+                    $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'application/json']);

+        }

                     header('Content-Type: application/json');
                     break;
                 case 'xml':
@@ -44,10 +45,11 @@ 
                     $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);
                     break;
             }
-        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')]))
-            call_user_func_array($this->route->getTarget()['callback'][$this->route->getTarget('extension')], [$this->route]);
-        else
-            require($this->route->getTarget('template'));
+        if (isset($this->route->getTarget()['callback'][$this->route->getTarget('extension')])) {

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

+        } else {

+                    require($this->route->getTarget('template'));

+        }

     }
 
 }

src/Routing/Middleware.php

Braces +24 added lines, -13 removed lines

@@ -28,11 +28,14 @@ 
      */
     public function globalMiddleware()
     {
-        if (isset($this->router->collection->middleware['global_middleware']))
-            foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
+        if (isset($this->router->collection->middleware['global_middleware'])) {

+                    foreach ($this->router->collection->middleware['global_middleware'] as $mid) {
                 if (class_exists($mid)) {
-                    $mid_global = new $mid;
-                    if (method_exists($mid_global, 'handle')) $mid_global->handle($this->router->route);
+                    $mid_global = new $mid;

+        }

+                    if (method_exists($mid_global, 'handle')) {

+                        $mid_global->handle($this->router->route);

+                    }

                 }
             }
     }
@@ -42,11 +45,14 @@ 
      */
     public function blockMiddleware()
     {
-        if (isset($this->router->collection->middleware['block_middleware']))
-            if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) {
-                $class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()];
+        if (isset($this->router->collection->middleware['block_middleware'])) {

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

+        }

                 $mid_block = new $class;
-                if (method_exists($mid_block, 'handle')) $mid_block->handle($this->router->route);
+                if (method_exists($mid_block, 'handle')) {

+                    $mid_block->handle($this->router->route);

+                }

             }
     }
 
@@ -60,7 +66,9 @@ 
             if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) {
                 $class = $this->router->collection->middleware['class_middleware'][$ctrl];
                 $mid_class = new $class;
-                if (method_exists($mid_class, 'handle')) $mid_class->handle($this->router->route);
+                if (method_exists($mid_class, 'handle')) {

+                    $mid_class->handle($this->router->route);

+                }

             }
         }
     }
@@ -70,11 +78,14 @@ 
      */
     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']];

+        }

                 $mid_route = new $class;
-                if (method_exists($mid_route, 'handle')) $mid_route->handle($this->router->route);
+                if (method_exists($mid_route, 'handle')) {

+                    $mid_route->handle($this->router->route);

+                }

             }
     }
 

src/Routing/Route.php

Braces +29 added lines, -15 removed lines

@@ -62,11 +62,21 @@ 
      */
     public function set($args = [])
     {
-        if (isset($args['name'])) $this->name = $args['name'];
-        if (isset($args['callback'])) $this->callback = $args['callback'];
-        if (isset($args['code'])) $this->response['code'] = $args['code'];
-        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['code'])) {

+            $this->response['code'] = $args['code'];

+        }

+        if (isset($args['target'])) {

+            $this->target = $args['target'];

+        }

+        if (isset($args['detail'])) {

+            $this->detail = $args['detail'];

+        }

     }
 
     /**
@@ -123,8 +133,9 @@ 
      */
     public function getResponse($key = null)
     {
-        if (!is_null($key) && isset($this->response[$key]))
-            return $this->response[$key];
+        if (!is_null($key) && isset($this->response[$key])) {

+                    return $this->response[$key];

+        }

         return $this->response;
     }
 
@@ -134,10 +145,11 @@ 
      */
     public function setResponse($key = null, $value = null)
     {
-        if (!is_null($key) && !is_null($value))
-            $this->response[$key] = $value;
-        else
-            $this->response = array_merge($this->response, $key);
+        if (!is_null($key) && !is_null($value)) {

+                    $this->response[$key] = $value;

+        } else {

+                    $this->response = array_merge($this->response, $key);

+        }

     }
 
     /**
@@ -179,8 +191,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;
     }
 
@@ -199,8 +212,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 +58 added lines, -29 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['path_' . $this->countRoutes] = (isset($options['path']) && !empty($options['path'])) ? rtrim($options['path'], '/') . '/' : '';
@@ -61,8 +69,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;
     }
 
@@ -73,12 +82,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++;

+        }

     }
 
     /**
@@ -92,10 +107,14 @@ 
                 $this->routes['path_' . $i] = (isset($args[$i]['path']) && !empty($args[$i]['path'])) ? rtrim($args[$i]['path'], '/') . '/' : '';
                 $this->routes['namespace_' . $i] = (isset($args[$i]['namespace']) && !empty($args[$i]['namespace'])) ? trim($args[$i]['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++;

+        }

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

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

+        }

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

+                    $this->middleware = $mid;

+        } elseif (is_array($middleware)) {

+                    $this->middleware = $middleware;

+        } else {

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

+        }

     }
 
     /**
@@ -121,12 +144,13 @@ 
         $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_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');
-                    else
-                        $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');
+                        $use = (is_object($dependencies['use'])) ? 'closure-' . $count : trim($dependencies['use'], '/');

+            } else {

+                                            $use = (is_object($dependencies)) ? 'closure-' . $count : trim($dependencies, '/');

+                    }

                     (!is_object($dependencies) && isset($dependencies['name'])) ? $this->routesByName[$use . '#' . $dependencies['name']] = $root . $prefix . $route : $this->routesByName[$use] = $root . $prefix . $route;
                     $count++;
                 }
@@ -143,9 +167,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/Dispatcher/ClosureDispatcher.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
      */
     public function call()
     {
-        if ($this->route->getResponse('code') == 202) $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);
+        if ($this->route->getResponse('code') == 202) {

+            $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        }

         $params = ($this->route->getParameters() == '') ? [] : $this->route->getParameters();
         echo call_user_func_array($this->route->getTarget('closure'), $params);
     }

src/Routing/Dispatcher/ControllerDispatcher.php

Braces +6 added lines, -4 removed lines

@@ -40,8 +40,9 @@ 
                 array_unshift($dependencies, call_user_func_array($this->route->getTarget('di'),[$class]));
             }
         }
-        if ($this->route->getResponse('code') == 202)
-            $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);
+        if ($this->route->getResponse('code') == 202) {

+                    $this->route->setResponse(['code' => 200, 'message' => 'OK', 'type' => 'text/html']);

+        }

         return $reflectionMethod->invokeArgs($this->getController(), $dependencies);
     }
 
@@ -53,8 +54,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/Router.php

Braces +13 added lines, -7 removed lines

@@ -71,7 +71,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();
@@ -84,8 +86,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], '/'));
     }
 
@@ -96,8 +99,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;
     }
@@ -140,8 +144,10 @@ 
         if (isset($this->route->getResponse()['templates']) && isset($this->route->getResponse()['templates'][$this->route->getResponse('code')])) {
             $this->route->setCallback($this->route->getResponse()['templates'][$this->route->getResponse('code')]);
             foreach($this->config['matcherInstance'] as $matcher) {
-                foreach (call_user_func([$matcher, 'getMatcher']) as $match)
-                    if (call_user_func([$matcher, $match])){ $this->callTarget(); break; }
+                foreach (call_user_func([$matcher, 'getMatcher']) as $match) {

+                                    if (call_user_func([$matcher, $match])){ $this->callTarget();

+                }

+                break; }
             }
         }
         http_response_code($this->route->getResponse('code'));