jetfirephp / routing

src/Routing/RouteCollection.php

Spacing +25 added lines, -25 removed lines

@@ -47,12 +47,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++;
     }
@@ -76,10 +76,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++;
     }
 
@@ -92,7 +92,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++;
@@ -104,11 +104,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'] : '';
     }
 
     /**
@@ -135,32 +135,32 @@ 
         $protocol = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : 'http';
         $domain = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null;
         $root = (is_null($root))
-            ? $protocol . '://' . $domain . ((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/' . $script_file, '', $_SERVER['SCRIPT_NAME'])
+            ? $protocol.'://'.$domain.((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':'.$_SERVER['SERVER_PORT'] : '').str_replace('/'.$script_file, '', $_SERVER['SCRIPT_NAME'])
             : $root;
         $new_domain = $this->getDomain($root);
         if (!is_null($domain) && strpos($domain, $new_domain) !== 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] : '';
-            $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) {
+            $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 (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']] = $url . $prefix . $route
-                            : $this->routesByName[$use] = $url . $prefix . $route;
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $url.$prefix.$route
+                            : $this->routesByName[$use] = $url.$prefix.$route;
                     } else {
                         (!is_callable($dependencies) && isset($dependencies['name']))
-                            ? $this->routesByName[$use . '#' . $dependencies['name']] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix
-                            : $this->routesByName[$use] = $protocol . '://' . str_replace('{host}', $new_domain, $route) . $prefix;
+                            ? $this->routesByName[$use.'#'.$dependencies['name']] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix
+                            : $this->routesByName[$use] = $protocol.'://'.str_replace('{host}', $new_domain, $route).$prefix;
                     }
                     $count++;
                 }
@@ -193,7 +193,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

@@ -37,7 +37,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);

+        }

     }
 
     /**
@@ -47,10 +49,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);
@@ -63,8 +71,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;
     }
 
@@ -75,12 +84,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 @@ 
         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++;

+        }

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

+        }

     }
 
     /**
@@ -138,21 +161,23 @@ 
             ? $protocol . '://' . $domain . ((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/' . $script_file, '', $_SERVER['SCRIPT_NAME'])
             : $root;
         $new_domain = $this->getDomain($root);
-        if (!is_null($domain) && strpos($domain, $new_domain) !== false)
-            $root = str_replace($domain, $new_domain, $root);
+        if (!is_null($domain) && strpos($domain, $new_domain) !== 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] : '';
             $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']))
-                        $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']] = $url . $prefix . $route
@@ -193,9 +218,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;
     }