jetfirephp / routing

src/Routing/Matcher/ArrayMatcher.php

Braces +9 added lines, -3 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) {
@@ -333,14 +335,18 @@ 
     {
         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}') {
                 $params = explode('/', preg_replace('#' . str_replace('*', '', $this->request['route']) . '#', '', $this->router->route->getUrl()));
                 $routes[1] = empty($params[0]) ? 'index' : $params[0];
                 $this->request['@method'] = $routes[1];
                 array_shift($params);
                 array_merge($this->request['parameters'], $params);
-                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/RouteCollection.php

Braces +53 added lines, -24 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++;

+        }

     }
 
     /**
@@ -122,7 +141,7 @@ 
         if(!is_null($root)){
             $protocol = explode('://', $root);
             $protocol = $protocol[0];
-        }else{
+        } else{
             $root = $protocol . '://' . $domain . ((!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != 80) ? ':' . $_SERVER['SERVER_PORT'] : '') . str_replace('/' . $script_file, '', $_SERVER['SCRIPT_NAME']);
         }
 
@@ -137,10 +156,11 @@ 
             $subdomain = (isset($this->routes['subdomain_' . $i])) ? $this->routes['subdomain_' . $i] : '';
             $block_protocol = (isset($this->routes['protocol_' . $i])) ? $this->routes['protocol_' . $i] : 'http';
             $url = (!empty($subdomain)) ? str_replace($protocol . '://', $block_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 {
@@ -186,11 +206,20 @@ 
     {
         foreach ($this->routesByName as $key => $route) {
             $param = explode('#', $key);
-            if(isset($params['{subdomain}'])) $route = str_replace('*', $params['{subdomain}'], $route);
-            if(isset($params['{method}'])) $route = str_replace('*', $params['{method}'], $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;
+            if(isset($params['{subdomain}'])) {

+                $route = str_replace('*', $params['{subdomain}'], $route);

+            }

+            if(isset($params['{method}'])) {

+                $route = str_replace('*', $params['{method}'], $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;
     }