ingeniasoftware / luthier

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();
+        }
 
     }
 }

src/Core/Route.php

Spacing +6 added lines, -6 removed lines

@@ -570,12 +570,12 @@ 
 
             foreach ($replaces as $regex => $replace)
             {
-                if($customRegex)
+                if ($customRegex)
                     continue;
 
                 $matches = [];
 
-                if(preg_match('/^\{(.*)\}$/', $segment))
+                if (preg_match('/^\{(.*)\}$/', $segment))
                 {
                     $foundedArgs[$key] = $segment;
                 }
@@ -583,7 +583,7 @@ 
                 $c = 0;
                 $segment = preg_replace('/'.$regex.'/', $replace, $segment, 1, $c);
 
-                if( $regex == array_keys($replaces)[0] && $c > 0)
+                if ($regex == array_keys($replaces)[0] && $c > 0)
                     $customRegex = TRUE;
             }
         }
@@ -809,11 +809,11 @@ 
         array_pop(self::$prefix);
         array_pop(self::$hideOriginals);
 
-        if( isset($attr['namespace']) )
+        if (isset($attr['namespace']))
             array_pop(self::$namespace);
 
         // Flushing nested middleware:
-        for($i = 0; $i < $mcount; $i++)
+        for ($i = 0; $i < $mcount; $i++)
             array_pop(self::$middleware);
     }
 
@@ -1033,7 +1033,7 @@ 
                             {
                                 for ($i = 0; $i < $c_e_findPath; $i++)
                                 {
-                                    if(in_array($i, $skip_seg))
+                                    if (in_array($i, $skip_seg))
                                         continue;
 
                                     if ($valid)

Braces +126 added lines, -94 removed lines

@@ -146,11 +146,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);
 
@@ -186,30 +188,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'] = [];
@@ -219,14 +227,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');
             }
@@ -398,8 +406,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)
         {
@@ -427,19 +436,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 = [];
 
@@ -450,8 +463,7 @@ 
             if (is_array($attr['only']))
             {
                 $only = $attr['only'];
-            }
-            else
+            } else
             {
                 $only[] = $attr['only'];
             }
@@ -528,13 +540,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, '/');
@@ -570,8 +584,9 @@ 
 
             foreach ($replaces as $regex => $replace)
             {
-                if($customRegex)
-                    continue;
+                if($customRegex) {
+                                    continue;
+                }
 
                 $matches = [];
 
@@ -583,8 +598,9 @@ 
                 $c = 0;
                 $segment = preg_replace('/'.$regex.'/', $replace, $segment, 1, $c);
 
-                if( $regex == array_keys($replaces)[0] && $c > 0)
-                    $customRegex = TRUE;
+                if( $regex == array_keys($replaces)[0] && $c > 0) {
+                                    $customRegex = TRUE;
+                }
             }
         }
 
@@ -602,11 +618,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;
             }
         }
@@ -721,12 +737,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)];
@@ -760,11 +778,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'];
 
@@ -789,16 +809,15 @@ 
                 if (is_array($attr['middleware']) && !empty($attr['middleware']))
                 {
                     $mcount = count($attr['middleware']);
-                    foreach ($attr['middleware'] as $middleware)
-                        self::$middleware[] = $middleware;
-                }
-                else
+                    foreach ($attr['middleware'] as $middleware) {
+                                            self::$middleware[] = $middleware;
+                    }
+                } else
                 {
                     self::$middleware[] = $attr['middleware'];
                     $mcount = 1;
                 }
-            }
-            else
+            } else
             {
                 show_error('Group middleware must be an array o a string', 500, 'Route error');
             }
@@ -809,12 +828,14 @@ 
         array_pop(self::$prefix);
         array_pop(self::$hideOriginals);
 
-        if( isset($attr['namespace']) )
-            array_pop(self::$namespace);
+        if( isset($attr['namespace']) ) {
+                    array_pop(self::$namespace);
+        }
 
         // Flushing nested middleware:
-        for($i = 0; $i < $mcount; $i++)
-            array_pop(self::$middleware);
+        for($i = 0; $i < $mcount; $i++) {
+                    array_pop(self::$middleware);
+        }
     }
 
 
@@ -835,14 +856,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);
     }
@@ -861,14 +885,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;
         }
@@ -965,18 +989,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 =
             [
@@ -1002,10 +1029,10 @@ 
 
                     if ($mode == 'exact')
                     {
-                        if ($findPath == $compiledPath)
-                            return $route;
-                    }
-                    else
+                        if ($findPath == $compiledPath) {
+                                                    return $route;
+                        }
+                    } else
                     {
                         $e_findPath     = explode('/', $findPath);
                         $e_compiledPath = explode('/', $compiledPath);
@@ -1025,24 +1052,28 @@ 
 
                                 $valid = (bool) preg_match('#^'.$reg.'$#', $e_findPath[$i]);
 
-                                if ($valid && $count > 0)
-                                    $skip_seg[] = $i;
+                                if ($valid && $count > 0) {
+                                                                    $skip_seg[] = $i;
+                                }
                             }
 
                             if ($valid)
                             {
                                 for ($i = 0; $i < $c_e_findPath; $i++)
                                 {
-                                    if(in_array($i, $skip_seg))
-                                        continue;
+                                    if(in_array($i, $skip_seg)) {
+                                                                            continue;
+                                    }
 
-                                    if ($valid)
-                                        $valid = $e_findPath[$i] == $e_compiledPath[$i];
+                                    if ($valid) {
+                                                                            $valid = $e_findPath[$i] == $e_compiledPath[$i];
+                                    }
                                 }
                             }
 
-                            if ($valid)
-                                return $route;
+                            if ($valid) {
+                                                            return $route;
+                            }
                         }
                     }
                 }
@@ -1076,8 +1107,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/Middleware/Request.php

Spacing +5 added lines, -5 removed lines

@@ -95,7 +95,7 @@ 
             if (ENVIRONMENT != 'production')
                 show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
 
-            if(is_null(Route::get404()))
+            if (is_null(Route::get404()))
                 show_404();
 
             if (Route::get404()->controller != get_class($this->CI))
@@ -110,16 +110,16 @@ 
 
                 // Redirect to 404 if not enough parameters provided
 
-                if(count($path_args) < count($route_args['required']))
+                if (count($path_args) < count($route_args['required']))
                     redirect(Route::get404()->path);
 
-                if(count($path_args) == 0)
+                if (count($path_args) == 0)
                 {
                     $this->CI->{$this->route->method}();
                 }
                 else
                 {
-                    call_user_func_array( [$this->CI, $this->route->method], array_values($path_args) );
+                    call_user_func_array([$this->CI, $this->route->method], array_values($path_args));
                 }
 
                 // TODO: Add support to hooks in this execution thread
@@ -132,7 +132,7 @@ 
                 if (ENVIRONMENT != 'production')
                     show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
 
-                if(is_null(Route::get404()))
+                if (is_null(Route::get404()))
                     show_404();
 
                 if (Route::get404()->controller != get_class($this->CI))

Braces +34 added lines, -28 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';
+            }
         }
     }
 
@@ -92,16 +94,18 @@ 
     {
         if (!$this->route)
         {
-            if (ENVIRONMENT != 'production')
-                show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
+            if (ENVIRONMENT != 'production') {
+                            show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
+            }
 
-            if(is_null(Route::get404()))
-                show_404();
+            if(is_null(Route::get404())) {
+                            show_404();
+            }
 
-            if (Route::get404()->controller != get_class($this->CI))
-                Route::trigger404();
-        }
-        else
+            if (Route::get404()->controller != get_class($this->CI)) {
+                            Route::trigger404();
+            }
+        } else
         {
             if (method_exists($this->CI, $this->route->method))
             {
@@ -110,14 +114,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) );
                 }
@@ -126,17 +130,19 @@ 
 
                 $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');
+                if (ENVIRONMENT != 'production') {
+                                    show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
+                }
 
-                if(is_null(Route::get404()))
-                    show_404();
+                if(is_null(Route::get404())) {
+                                    show_404();
+                }
 
-                if (Route::get404()->controller != get_class($this->CI))
-                    Route::trigger404();
+                if (Route::get404()->controller != get_class($this->CI)) {
+                                    Route::trigger404();
+                }
             }
         }
     }