ingeniasoftware / luthier

src/Core/Route.php

Braces +106 added lines, -86 removed lines

@@ -140,11 +140,13 @@ 
         $controller = $parsedController[1];
         $method     = $parsedController[2];
 
-        if(!is_string($path))
-            show_error('Route path must be a string ', 500, 'Route error: bad route path');
+        if(!is_string($path)) {
+                    show_error('Route path must be a string ', 500, 'Route error: bad route path');
+        }
 
-        if(!is_string($verb))
-            show_error('Route HTTP Verb must be a string', 500, 'Route error: bad verb type');
+        if(!is_string($verb)) {
+                    show_error('Route HTTP Verb must be a string', 500, 'Route error: bad verb type');
+        }
 
         $verb = strtoupper($verb);
 
@@ -170,8 +172,7 @@ 
         if(isset($attr['as']))
         {
             $route['name'] = $attr['as'];
-        }
-        else
+        } else
         {
             $route['name'] = NULL;
         }
@@ -181,30 +182,36 @@ 
         $route['prefix'] = NULL;
         $group_prefix = end(self::$prefix);
 
-        if($group_prefix)
-            $route['prefix'] = $group_prefix.'/';
+        if($group_prefix) {
+                    $route['prefix'] = $group_prefix.'/';
+        }
 
-        if(isset($attr['prefix']))
-            $route['prefix'] .= $attr['prefix'];
+        if(isset($attr['prefix'])) {
+                    $route['prefix'] .= $attr['prefix'];
+        }
 
         // Setting up the namespace
 
         $route['namespace'] = NULL;
         $group_namespace = end(self::$namespace);
 
-        if(!is_null($group_namespace))
-            $route['namespace'] = $group_namespace.'/';
-        if(isset($attr['namespace']))
-            $route['namespace'] .= $attr['namespace'];
+        if(!is_null($group_namespace)) {
+                    $route['namespace'] = $group_namespace.'/';
+        }
+        if(isset($attr['namespace'])) {
+                    $route['namespace'] .= $attr['namespace'];
+        }
 
         $route['prefix']    = trim($route['prefix'], '/');
         $route['namespace'] = trim($route['namespace'],'/');
 
-        if(empty($route['prefix']))
-            $route['prefix'] = NULL;
+        if(empty($route['prefix'])) {
+                    $route['prefix'] = NULL;
+        }
 
-        if(empty($route['namespace']))
-            $route['namespace'] = NULL;
+        if(empty($route['namespace'])) {
+                    $route['namespace'] = NULL;
+        }
 
         $route['middleware'] = array();
 
@@ -212,14 +219,14 @@ 
         {
             if(is_array($attr['middleware']))
             {
-                foreach($attr['middleware'] as $middleware)
-                    $route['middleware'][] = $middleware; # Group
-            }
-            elseif( is_string($attr['middleware']))
+                foreach($attr['middleware'] as $middleware) {
+                                    $route['middleware'][] = $middleware;
+                }
+                # Group
+            } elseif( is_string($attr['middleware']))
             {
                 $route['middleware'][] = $attr['middleware']; # Group
-            }
-            else
+            } else
             {
                 show_error('Route middleware must be a string or an array',500,'Route error: bad middleware format');
             }
@@ -257,8 +264,7 @@ 
         if(!$return)
         {
             self::$routes[] = (object) $route;
-        }
-        else
+        } else
         {
             return (object) $route;
         }
@@ -385,8 +391,9 @@ 
      */
     public static function matches($verbs, $url, $attr, $hideOriginal = FALSE)
     {
-        if(!is_array($verbs))
-            show_error('Route::matches() first argument must be an array of valid HTTP Verbs', 500, 'Route error: bad Route::matches() verb list');
+        if(!is_array($verbs)) {
+                    show_error('Route::matches() first argument must be an array of valid HTTP Verbs', 500, 'Route error: bad Route::matches() verb list');
+        }
 
         foreach($verbs as $verb)
         {
@@ -423,19 +430,23 @@ 
 
         $hideOriginal = FALSE;
 
-        if(isset($attr['namespace']))
-            $base_attr['namespace']  = $attr['namespace'];
+        if(isset($attr['namespace'])) {
+                    $base_attr['namespace']  = $attr['namespace'];
+        }
 
-        if(isset($attr['middleware']))
-            $base_attr['middleware'] = $attr['middleware'];
+        if(isset($attr['middleware'])) {
+                    $base_attr['middleware'] = $attr['middleware'];
+        }
 
-        if(isset($attr['hideOriginal']))
-            $hideOriginal = (bool) $attr['hideOriginal'];
+        if(isset($attr['hideOriginal'])) {
+                    $hideOriginal = (bool) $attr['hideOriginal'];
+        }
 
         $base_attr['prefix'] = strtolower($name);
 
-        if(isset($attr['prefix']))
-            $base_attr['prefix']  = $attr['prefix'];
+        if(isset($attr['prefix'])) {
+                    $base_attr['prefix']  = $attr['prefix'];
+        }
 
         $only = array();
 
@@ -446,8 +457,7 @@ 
             if(is_array($attr['only']))
             {
                 $only  = $attr['only'];
-            }
-            else
+            } else
             {
                 $only[] = $attr['only'];
             }
@@ -523,8 +533,9 @@ 
 
         $path = $route->path;
 
-        if(!is_null($prefix))
-            $path = $prefix.'/'.$path;
+        if(!is_null($prefix)) {
+                    $path = $prefix.'/'.$path;
+        }
 
         /*
         if(substr($path, 0, 1) == "/" && strlen($path) > 1)
@@ -533,8 +544,9 @@ 
 
         $controller = $route->controller.'/'.$route->method;
 
-        if(!is_null($namespace))
-            $controller = $namespace.'/'.$controller;
+        if(!is_null($namespace)) {
+                    $controller = $namespace.'/'.$controller;
+        }
 
         $path       = trim($path,'/');
         $controller = trim($controller,'/');
@@ -572,11 +584,11 @@ 
             {
                 $args['optional'][] = $arg;
                 $argConstraint = TRUE;
-            }
-            else
+            } else
             {
-                if($argConstraint)
-                    show_error('Optional route path argument not valid at this position', 500, 'Route error');
+                if($argConstraint) {
+                                    show_error('Optional route path argument not valid at this position', 500, 'Route error');
+                }
                 $args['required'][] = $arg;
             }
         }
@@ -625,12 +637,14 @@ 
             $path = key($route);
             $_404 = $route[$path];
 
-            if(!isset($routes[$path]))
-                $routes[$path] = $_404;
+            if(!isset($routes[$path])) {
+                            $routes[$path] = $_404;
+            }
         }
 
-        if(is_null(self::$defaultController))
-            show_error('You must specify a home route: Route::home() as default controller!', 500, 'Route error: missing default controller');
+        if(is_null(self::$defaultController)) {
+                    show_error('You must specify a home route: Route::home() as default controller!', 500, 'Route error: missing default controller');
+        }
 
         $defaultController = self::$defaultController->compiled;
         $defaultController = $defaultController[key($defaultController)];
@@ -640,8 +654,7 @@ 
         if(is_null(self::$_404page))
         {
             $routes['404_override'] = '';
-        }
-        else
+        } else
         {
             $routes['404_override'] = self::$_404page->controller;
         }
@@ -664,11 +677,13 @@ 
      */
     public static function group($attr, $routes)
     {
-        if(!is_array($attr))
-            show_error('Group attribute must be a valid array');
+        if(!is_array($attr)) {
+                    show_error('Group attribute must be a valid array');
+        }
 
-        if(!isset($attr['prefix']))
-            show_error('You must specify an prefix!');
+        if(!isset($attr['prefix'])) {
+                    show_error('You must specify an prefix!');
+        }
 
         self::$prefix[] = $attr['prefix'];
 
@@ -680,8 +695,7 @@ 
         if(isset($attr['hideOriginals']) && $attr['hideOriginals'] === TRUE)
         {
             self::$hideOriginals[] = TRUE;
-        }
-        else
+        } else
         {
             self::$hideOriginals[] = FALSE;
         }
@@ -692,15 +706,14 @@ 
             {
                 if(is_array($attr['middleware']) && !empty($attr['middleware']))
                 {
-                    foreach($attr['middleware'] as $middleware)
-                        self::$groupMiddleware[] = [ $attr['prefix'] => $middleware ];
-                }
-                else
+                    foreach($attr['middleware'] as $middleware) {
+                                            self::$groupMiddleware[] = [ $attr['prefix'] => $middleware ];
+                    }
+                } else
                 {
                     self::$groupMiddleware[] = [ $attr['prefix'] => $attr['middleware'] ];
                 }
-            }
-            else
+            } else
             {
                 show_error('Group middleware not valid');
             }
@@ -734,14 +747,17 @@ 
                 'as'   => $as
             ];
 
-        if(!is_null($attr) && !is_array($attr))
-            show_error('Default controller attributes must be an array',500,'Route error: bad attribute type');
+        if(!is_null($attr) && !is_array($attr)) {
+                    show_error('Default controller attributes must be an array',500,'Route error: bad attribute type');
+        }
 
-        if(!is_null($attr))
-            $routeAttr = array_merge($routeAttr,$attr);
+        if(!is_null($attr)) {
+                    $routeAttr = array_merge($routeAttr,$attr);
+        }
 
-        if(isset($attr['prefix']))
-            show_error('Default controller may not have a prefix!',500,'Route error: prefix not allowed');
+        if(isset($attr['prefix'])) {
+                    show_error('Default controller may not have a prefix!',500,'Route error: prefix not allowed');
+        }
 
         self::$defaultController = self::$routes[] = self::add('GET', '/', ['uses' => $controller, 'as' => $as],TRUE, TRUE);
     }
@@ -759,14 +775,14 @@ 
         if(is_null($verb))
         {
             return self::$routes;
-        }
-        else
+        } else
         {
             $routes = [];
             foreach(self::$routes as $route)
             {
-                if($route->verb == $verb)
-                    $routes[] = $route;
+                if($route->verb == $verb) {
+                                    $routes[] = $route;
+                }
             }
             return $routes;
         }
@@ -875,21 +891,24 @@ 
      */
     public static function getRouteByPath($path, $requestMethod = NULL)
     {
-        if(is_null($requestMethod))
-            $requestMethod = $_SERVER['REQUEST_METHOD'];
+        if(is_null($requestMethod)) {
+                    $requestMethod = $_SERVER['REQUEST_METHOD'];
+        }
 
         $routes = self::getRoutes($requestMethod);
 
-        if(empty($routes))
-            return FALSE;
+        if(empty($routes)) {
+                    return FALSE;
+        }
 
         $founded = FALSE;
         $matches = array();
 
         $path = trim($path);
 
-        if($path == '')
-            return self::$defaultController;
+        if($path == '') {
+                    return self::$defaultController;
+        }
 
         $wildcards =
             [
@@ -916,10 +935,10 @@ 
 
                     if($mode == 'exact')
                     {
-                        if($findPath == $compiledPath)
-                            return $route;
-                    }
-                    else
+                        if($findPath == $compiledPath) {
+                                                    return $route;
+                        }
+                    } else
                     {
                         $e_findPath     = explode('/', $findPath);
                         $e_compiledPath = explode('/', $compiledPath);
@@ -933,8 +952,9 @@ 
 
                                 $valid = (bool) preg_match('#^'.$reg.'$#', $e_findPath[$i]);
                             }
-                            if($valid)
-                                return $route;
+                            if($valid) {
+                                                            return $route;
+                            }
                         }
                     }
                 }