ingeniasoftware / luthier

src/Middleware/Request.php

Braces +18 added lines, -20 removed lines

@@ -64,20 +64,22 @@ 
 
         // FIXME: Solve ambiguity here! POST with _method="GET" makes no sense
 
-        if(isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods , TRUE))
-            $formMethod = strtoupper($_POST['_method']);
+        if(isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods , TRUE)) {
+                    $formMethod = strtoupper($_POST['_method']);
+        }
 
         if(is_null($formMethod))
         {
             $this->requestMethod = $requestMethod;
-        }
-        else
+        } else
         {
-            if($requestMethod == 'POST')
-                $this->requestMethod = $formMethod;
+            if($requestMethod == 'POST') {
+                            $this->requestMethod = $formMethod;
+            }
 
-            if(!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD')
-                $this->requestMethod = 'POST';
+            if(!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD') {
+                            $this->requestMethod = 'POST';
+            }
         }
     }
 
@@ -100,15 +102,13 @@ 
                 if(ENVIRONMENT != 'production')
                 {
                     show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
-                }
-                else
+                } else
                 {
                     //redirect(Route::get404()->path);
                     Route::trigger404();
                 }
             }
-        }
-        else
+        } else
         {
             if(method_exists($this->CI,$this->route->method))
             {
@@ -119,14 +119,14 @@ 
 
                 // Redirect to 404 if not enough parameters provided
 
-                if(count($path_args) < count($route_args['required']))
-                   redirect(Route::get404()->path);
+                if(count($path_args) < count($route_args['required'])) {
+                                   redirect(Route::get404()->path);
+                }
 
                 if(count($path_args) == 0)
                 {
                     $this->CI->{$this->route->method}();
-                }
-                else
+                } else
                 {
                     call_user_func_array( [$this->CI, $this->route->method], array_values($path_args) );
                 }
@@ -136,14 +136,12 @@ 
 
                 $this->CI->output->_display();
                 exit(0);
-            }
-            else
+            } else
             {
                 if(ENVIRONMENT != 'production')
                 {
                     show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
-                }
-                else
+                } else
                 {
                     //redirect(Route::get404()->path);
                     Route::trigger404();

src/Core/Route.php

Braces +115 added lines, -92 removed lines

@@ -147,11 +147,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);
 
@@ -177,8 +179,7 @@ 
         if(isset($attr['as']))
         {
             $route['name'] = $attr['as'];
-        }
-        else
+        } else
         {
             $route['name'] = NULL;
         }
@@ -188,30 +189,36 @@ 
         $route['prefix'] = NULL;
         $group_prefix = implode('/', 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 = implode('/', 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
         $route['middleware'] = [];
@@ -221,14 +228,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');
             }
@@ -266,8 +273,7 @@ 
         if(!$return)
         {
             self::$routes[] = (object) $route;
-        }
-        else
+        } else
         {
             return (object) $route;
         }
@@ -401,8 +407,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)
         {
@@ -430,19 +437,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 = [];
 
@@ -453,8 +464,7 @@ 
             if(is_array($attr['only']))
             {
                 $only  = $attr['only'];
-            }
-            else
+            } else
             {
                 $only[] = $attr['only'];
             }
@@ -531,13 +541,15 @@ 
 
         $path = $route->path;
 
-        if(!is_null($prefix))
-            $path = $prefix.'/'.$path;
+        if(!is_null($prefix)) {
+                    $path = $prefix.'/'.$path;
+        }
 
         $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,'/');
@@ -592,11 +604,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;
             }
         }
@@ -706,12 +718,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)];
@@ -721,8 +735,7 @@ 
         if(is_null(self::$_404page))
         {
             $routes['404_override'] = '';
-        }
-        else
+        } else
         {
             $routes['404_override'] = self::$_404page->controller;
         }
@@ -746,11 +759,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'];
 
@@ -762,8 +777,7 @@ 
         if(isset($attr['hideOriginals']) && $attr['hideOriginals'] === TRUE)
         {
             self::$hideOriginals[] = TRUE;
-        }
-        else
+        } else
         {
             self::$hideOriginals[] = FALSE;
         }
@@ -774,15 +788,14 @@ 
             {
                 if(is_array($attr['middleware']) && !empty($attr['middleware']))
                 {
-                    foreach($attr['middleware'] as $middleware)
-                        self::$middleware[] = $middleware;
-                }
-                else
+                    foreach($attr['middleware'] as $middleware) {
+                                            self::$middleware[] = $middleware;
+                    }
+                } else
                 {
                     self::$middleware[] = $attr['middleware'];
                 }
-            }
-            else
+            } else
             {
                 show_error('Group middleware must be an array o a string', 500, 'Route error');
             }
@@ -818,14 +831,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);
     }
@@ -844,14 +860,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;
         }
@@ -947,18 +963,21 @@ 
      */
     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;
+        }
 
         $path = trim($path);
 
-        if($path == '')
-            return self::$defaultController;
+        if($path == '') {
+                    return self::$defaultController;
+        }
 
         $wildcards =
             [
@@ -984,10 +1003,10 @@ 
 
                     if($mode == 'exact')
                     {
-                        if($findPath == $compiledPath)
-                            return $route;
-                    }
-                    else
+                        if($findPath == $compiledPath) {
+                                                    return $route;
+                        }
+                    } else
                     {
                         $e_findPath     = explode('/', $findPath);
                         $e_compiledPath = explode('/', $compiledPath);
@@ -1005,18 +1024,21 @@ 
 
                                 $valid = (bool) preg_match('#^'.$reg.'$#', $e_findPath[$i]);
 
-                                if($valid && is_null($seachUntil))
-                                    $seachUntil = $i;
+                                if($valid && is_null($seachUntil)) {
+                                                                    $seachUntil = $i;
+                                }
                             }
 
                             if($valid)
                             {
-                                for($i = 0; $i < $seachUntil; $i++)
-                                    $valid = $e_findPath[$i] == $e_compiledPath[$i];
+                                for($i = 0; $i < $seachUntil; $i++) {
+                                                                    $valid = $e_findPath[$i] == $e_compiledPath[$i];
+                                }
                             }
 
-                            if($valid)
-                                return $route;
+                            if($valid) {
+                                                            return $route;
+                            }
                         }
                     }
                 }
@@ -1050,8 +1072,9 @@ 
 
         for($s = 0; $s < count($r_seg); $s++)
         {
-            if(!isset($p_seg[$s]))
-                continue;
+            if(!isset($p_seg[$s])) {
+                            continue;
+            }
 
             if($r_seg[$s] != $p_seg[$s])
             {

src/Core/Middleware.php

Braces +18 added lines, -12 removed lines

@@ -96,8 +96,9 @@ 
         {
             foreach($currentRoute->middleware as $middleware)
             {
-                if(!in_array($middleware,$_run))
-                    $_run[] = $middleware;
+                if(!in_array($middleware,$_run)) {
+                                    $_run[] = $middleware;
+                }
             }
         }
 
@@ -125,31 +126,36 @@ 
 
         $middlewareName = ucfirst($middlewareName).'_middleware';
 
-        if(!file_exists($middlewareDir))
-            show_error('Unable to find (or read) the middleware folder: "'.$middlewareDir.'"');
+        if(!file_exists($middlewareDir)) {
+                    show_error('Unable to find (or read) the middleware folder: "'.$middlewareDir.'"');
+        }
 
         $runMiddleware =  $middlewareDir.$middlewareName.'.php';
 
-        if(!file_exists($runMiddleware))
-            show_error('Unable to find (or read) the middleware "'.$runMiddleware.'"');
+        if(!file_exists($runMiddleware)) {
+                    show_error('Unable to find (or read) the middleware "'.$runMiddleware.'"');
+        }
 
         require $runMiddleware;
 
-        if(!class_exists($middlewareName))
-            show_error('Class "'.$middlewareName.'" not found');
+        if(!class_exists($middlewareName)) {
+                    show_error('Class "'.$middlewareName.'" not found');
+        }
 
         $middleware = new $middlewareName();
 
         // Call the current controller __beforeMiddleware() method, if exists:
-        if(method_exists(self::$instance, '_beforeMiddleware'))
-            self::$instance->_beforeMiddleware();
+        if(method_exists(self::$instance, '_beforeMiddleware')) {
+                    self::$instance->_beforeMiddleware();
+        }
 
         // Run the middleware
         $middleware->run();
 
         // Call the current controller _afterMiddleware() method, if exists:
-        if(method_exists(self::$instance, '_afterMiddleware'))
-            self::$instance->_afterMiddleware();
+        if(method_exists(self::$instance, '_afterMiddleware')) {
+                    self::$instance->_afterMiddleware();
+        }
 
     }
 }