ingeniasoftware / luthier

src/Core/Route.php

Doc Comments +11 added lines, -16 removed lines

@@ -118,7 +118,6 @@ 
      * Generic method to add a improved route
      *
      * @param  mixed $verb String or array of string of valid HTTP Verbs that will be accepted in this route
-     * @param  mixed $url String or array of strings that will trigger this route
      * @param  array $attr Associative array of route attributes
      * @param  bool $hideOriginal (Optional) map the original $url as a route with a show_404() callback inside
      *
@@ -277,7 +276,7 @@ 
     /**
      * Adds a GET route, alias of Route::add('GET',$url,$attr,$hideOriginal)
      *
-     * @param  mixed $url String or array of strings that will trigger this route
+     * @param  string $url String or array of strings that will trigger this route
      * @param  array $attr Associative array of route attributes
      * @param  bool $hideOriginal (Optional) map the original $url as a route with a show_404() callback inside
      *
@@ -295,7 +294,7 @@ 
     /**
      * Adds a POST route, alias of Route::add('POST',$url,$attr,$hideOriginal)
      *
-     * @param  mixed $url String or array of strings that will trigger this route
+     * @param  string $url String or array of strings that will trigger this route
      * @param  array $attr Associative array of route attributes
      * @param  bool $hideOriginal (Optional) map the original $url as a route with a show_404() callback inside
      *
@@ -349,7 +348,7 @@ 
     /**
      * Adds a DELETE route, alias of Route::add('DELETE',$url,$attr,$hideOriginal)
      *
-     * @param  mixed $url String or array of strings that will trigger this route
+     * @param  string $url String or array of strings that will trigger this route
      * @param  array $attr Associative array of route attributes
      * @param  bool $hideOriginal (Optional) map the original $url as a route with a show_404() callback inside
      *
@@ -389,8 +388,8 @@ 
     /**
      * Adds a list of routes with the verbs contained in $verbs, alias of Route::add($verbs,$url,$attr,$hideOriginal)
      *
-     * @param  mixed $verb String or array of string of valid HTTP Verbs that will be accepted in this route
-     * @param  mixed $url String or array of strings that will trigger this route
+     * @param  string[] $verbs String or array of string of valid HTTP Verbs that will be accepted in this route
+     * @param  string $url String or array of strings that will trigger this route
      * @param  array $attr Associative array of route attributes
      * @param  bool $hideOriginal (Optional) map the original $url as a route with a show_404() callback inside
      *
@@ -800,10 +799,6 @@ 
     /**
      * Creates the 'default_controller' key in CodeIgniter's route array
      *
-     * @param  string $route controller/method name
-     * @param  string $alias (Optional) alias of the default controller
-     *
-     * Due a CodeIgniter limitations, this route MAY NOT be a directory.
      *
      * @return void
      *
@@ -861,7 +856,7 @@ 
     /**
      * Get all hidden routes
      *
-     * @return array
+     * @return Route
      *
      * @access public
      * @static
@@ -941,8 +936,9 @@ 
      *  This is the 'reverse' process of the improved routing, it'll take the current
      *  uri string and attempts to find a CodeIgniter route that matches with his pattern
      *
-     * @param  string $search
      *
+     * @param Middleware $path
+     * @param string $requestMethod
      * @return mixed
      */
     public static function getRouteByPath($path, $requestMethod = NULL)
@@ -1067,7 +1063,7 @@ 
     /**
      * Returns an array with the valid HTTP Verbs used in routes
      *
-     * @return array
+     * @return Route
      *
      * @access public
      * @static
@@ -1082,7 +1078,6 @@ 
      * Set the 404 error controller ($route['404_override'])
      *
      * @param  string  $controller
-     * @param  string  $namespace (Optional)
      *
      * @return void
      *
@@ -1102,9 +1097,9 @@ 
     /**
      * Get the 404 route
      *
-     * @return array $_404page
+     * @return Route $_404page
      *
-     * @return object | null
+     * @return Route | null
      *
      * @access public
      * @static

Spacing +137 added lines, -137 removed lines

@@ -129,17 +129,17 @@ 
      */
     public static function add($verb, $path, $attr, $hideOriginal = TRUE, $return = FALSE)
     {
-        if(!is_array($attr))
+        if (!is_array($attr))
         {
-            show_error('You must specify the route attributes as an array',500,'Route error: bad attributes');
+            show_error('You must specify the route attributes as an array', 500, 'Route error: bad attributes');
         }
 
-        if(!isset($attr['uses']))
+        if (!isset($attr['uses']))
         {
             show_error('Route requires a \'controller@method\' to be pointed and it\'s not defined in the route attributes', 500, 'Route error: missing controller');
         }
 
-        if(!preg_match('/^([a-zA-Z1-9-_]+)@([a-zA-Z1-9-_]+)$/', $attr['uses'], $parsedController) !== FALSE)
+        if (!preg_match('/^([a-zA-Z1-9-_]+)@([a-zA-Z1-9-_]+)$/', $attr['uses'], $parsedController) !== FALSE)
         {
             show_error('Route controller must be in format controller@method', 500, 'Route error: bad controller format');
         }
@@ -147,34 +147,34 @@ 
         $controller = $parsedController[1];
         $method     = $parsedController[2];
 
-        if(!is_string($path))
+        if (!is_string($path))
             show_error('Route path must be a string ', 500, 'Route error: bad route path');
 
-        if(!is_string($verb))
+        if (!is_string($verb))
             show_error('Route HTTP Verb must be a string', 500, 'Route error: bad verb type');
 
         $verb = strtoupper($verb);
 
-        if(!in_array($verb, self::$http_verbs,TRUE))
+        if (!in_array($verb, self::$http_verbs, TRUE))
         {
             $errorMsg = 'Verb "'.$verb.'" is not a valid HTTP Verb, allowed verbs:<ul>';
-            foreach( self::$http_verbs as $validVerb )
+            foreach (self::$http_verbs as $validVerb)
             {
                 $errorMsg .= '<li>'.$validVerb.'</li>';
             }
             $errorMsg .= '</ul>';
-            show_error($errorMsg,500,'Route error: unknow method');
+            show_error($errorMsg, 500, 'Route error: unknow method');
         }
 
         $route['verb'] = $verb;
 
-        $path = trim($path,'/');
+        $path = trim($path, '/');
 
         $route['path']       = $path;
         $route['controller'] = $controller;
         $route['method']     = $method;
 
-        if(isset($attr['as']))
+        if (isset($attr['as']))
         {
             $route['name'] = $attr['as'];
         }
@@ -188,10 +188,10 @@ 
         $route['prefix'] = NULL;
         $group_prefix = implode('/', self::$prefix);
 
-        if($group_prefix)
+        if ($group_prefix)
             $route['prefix'] = $group_prefix.'/';
 
-        if(isset($attr['prefix']))
+        if (isset($attr['prefix']))
             $route['prefix'] .= $attr['prefix'];
 
         // Setting up the namespace
@@ -199,38 +199,38 @@ 
         $route['namespace'] = NULL;
         $group_namespace = implode('/', self::$namespace);
 
-        if(!is_null($group_namespace))
+        if (!is_null($group_namespace))
             $route['namespace'] = $group_namespace.'/';
-        if(isset($attr['namespace']))
+        if (isset($attr['namespace']))
             $route['namespace'] .= $attr['namespace'];
 
         $route['prefix']    = trim($route['prefix'], '/');
-        $route['namespace'] = trim($route['namespace'],'/');
+        $route['namespace'] = trim($route['namespace'], '/');
 
-        if(empty($route['prefix']))
+        if (empty($route['prefix']))
             $route['prefix'] = NULL;
 
-        if(empty($route['namespace']))
+        if (empty($route['namespace']))
             $route['namespace'] = NULL;
 
         // Route middleware
         $route['middleware'] = [];
         $route['middleware'] = array_merge($route['middleware'], self::$middleware);
 
-        if(isset($attr['middleware']))
+        if (isset($attr['middleware']))
         {
-            if(is_array($attr['middleware']))
+            if (is_array($attr['middleware']))
             {
-                foreach($attr['middleware'] as $middleware)
+                foreach ($attr['middleware'] as $middleware)
                     $route['middleware'][] = $middleware; # Group
             }
-            elseif( is_string($attr['middleware']))
+            elseif (is_string($attr['middleware']))
             {
                 $route['middleware'][] = $attr['middleware']; # Group
             }
             else
             {
-                show_error('Route middleware must be a string or an array',500,'Route error: bad middleware format');
+                show_error('Route middleware must be a string or an array', 500, 'Route error: bad middleware format');
             }
         }
 
@@ -243,27 +243,27 @@ 
 
         $groupHideOriginals = end(self::$hideOriginals);
 
-        if($hideOriginal || $groupHideOriginals || ($compiledRoute->path != '' && $compiledRoute->path != '/' ) )
+        if ($hideOriginal || $groupHideOriginals || ($compiledRoute->path != '' && $compiledRoute->path != '/'))
         {
             $hiddenRoutePath      = $controller.'/'.$method;
             $hiddenRouteNamespace = '';
 
-            if(!is_null($route['namespace']))
+            if (!is_null($route['namespace']))
             {
                 $hiddenRouteNamespace = $route['namespace'].'/';
             }
 
             $hiddenRoutePath = $hiddenRouteNamespace.$hiddenRoutePath;
 
-            if($method == 'index')
+            if ($method == 'index')
             {
-                self::$hiddenRoutes[] = [ $hiddenRouteNamespace.$controller  => function(){ self::trigger404(); }];
+                self::$hiddenRoutes[] = [$hiddenRouteNamespace.$controller  => function() { self::trigger404(); }];
             }
 
-            self::$hiddenRoutes[] = [$hiddenRoutePath => function(){ self::trigger404(); }];
+            self::$hiddenRoutes[] = [$hiddenRoutePath => function() { self::trigger404(); }];
         }
 
-        if(!$return)
+        if (!$return)
         {
             self::$routes[] = (object) $route;
         }
@@ -288,7 +288,7 @@ 
      */
     public static function get($url, $attr, $hideOriginal = TRUE)
     {
-        self::add('GET', $url,$attr, $hideOriginal);
+        self::add('GET', $url, $attr, $hideOriginal);
     }
 
 
@@ -306,7 +306,7 @@ 
      */
     public static function post($url, $attr, $hideOriginal = TRUE)
     {
-        self::add('POST', $url,$attr, $hideOriginal);
+        self::add('POST', $url, $attr, $hideOriginal);
     }
 
 
@@ -324,7 +324,7 @@ 
      */
     public static function put($url, $attr, $hideOriginal = TRUE)
     {
-        self::add('PUT', $url,$attr, $hideOriginal);
+        self::add('PUT', $url, $attr, $hideOriginal);
     }
 
 
@@ -342,7 +342,7 @@ 
      */
     public static function patch($url, $attr, $hideOriginal = TRUE)
     {
-        self::add('PATCH', $url,$attr, $hideOriginal);
+        self::add('PATCH', $url, $attr, $hideOriginal);
     }
 
 
@@ -360,7 +360,7 @@ 
      */
     public static function delete($url, $attr, $hideOriginal = TRUE)
     {
-        self::add('DELETE', $url,$attr, $hideOriginal);
+        self::add('DELETE', $url, $attr, $hideOriginal);
     }
 
 
@@ -378,7 +378,7 @@ 
      */
     public static function any($url, $attr, $hideOriginal = TRUE)
     {
-        foreach(self::$http_verbs as $verb)
+        foreach (self::$http_verbs as $verb)
         {
             $verb = strtolower($verb);
             self::add($verb, $url, $attr, $hideOriginal);
@@ -401,10 +401,10 @@ 
      */
     public static function matches($verbs, $url, $attr, $hideOriginal = FALSE)
     {
-        if(!is_array($verbs))
+        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)
+        foreach ($verbs as $verb)
         {
             self::add($verb, $url, $attr, $hideOriginal);
         }
@@ -430,29 +430,29 @@ 
 
         $hideOriginal = FALSE;
 
-        if(isset($attr['namespace']))
+        if (isset($attr['namespace']))
             $base_attr['namespace']  = $attr['namespace'];
 
-        if(isset($attr['middleware']))
+        if (isset($attr['middleware']))
             $base_attr['middleware'] = $attr['middleware'];
 
-        if(isset($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 = [];
 
         $controller = strtolower($controller);
 
-        if(isset($attr['only']) && (is_array($attr['only']) || is_string($attr['only'])))
+        if (isset($attr['only']) && (is_array($attr['only']) || is_string($attr['only'])))
         {
-            if(is_array($attr['only']))
+            if (is_array($attr['only']))
             {
-                $only  = $attr['only'];
+                $only = $attr['only'];
             }
             else
             {
@@ -460,43 +460,43 @@ 
             }
         }
 
-        if(empty($only) || in_array('index', $only))
+        if (empty($only) || in_array('index', $only))
         {
-            $route_attr = array_merge($base_attr, ['uses' => $controller.'@index',   'as' => $name.'.index']);
+            $route_attr = array_merge($base_attr, ['uses' => $controller.'@index', 'as' => $name.'.index']);
             self::get('/', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('create', $only))
+        if (empty($only) || in_array('create', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@create', 'as' => $name.'.create']);
             self::get('create', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('store', $only))
+        if (empty($only) || in_array('store', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@store', 'as' => $name.'.store']);
             self::post('/', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('show', $only))
+        if (empty($only) || in_array('show', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@show', 'as' => $name.'.show']);
             self::get('{slug}', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('edit', $only))
+        if (empty($only) || in_array('edit', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@edit', 'as' => $name.'.edit']);
             self::get('{slug}/edit', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('update', $only))
+        if (empty($only) || in_array('update', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@update', 'as' => $name.'.update']);
             self::matches(['PUT', 'PATCH'], '{slug}/update', $route_attr, $hideOriginal);
         }
 
-        if(empty($only) || in_array('destroy', $only))
+        if (empty($only) || in_array('destroy', $only))
         {
             $route_attr = array_merge($base_attr, ['uses' => $controller.'@destroy', 'as' => $name.'.destroy']);
             self::delete('{slug}', $route_attr, $hideOriginal);
@@ -519,33 +519,33 @@ 
         $prefix    = NULL;
         $namespace = NULL;
 
-        if(!is_null($route->prefix))
+        if (!is_null($route->prefix))
         {
             $prefix = $route->prefix;
         }
 
-        if(!is_null($route->namespace))
+        if (!is_null($route->namespace))
         {
             $namespace = $route->namespace;
         }
 
         $path = $route->path;
 
-        if(!is_null($prefix))
+        if (!is_null($prefix))
             $path = $prefix.'/'.$path;
 
         $controller = $route->controller.'/'.$route->method;
 
-        if(!is_null($namespace))
+        if (!is_null($namespace))
             $controller = $namespace.'/'.$controller;
 
-        $path       = trim($path,'/');
-        $controller = trim($controller,'/');
+        $path       = trim($path, '/');
+        $controller = trim($controller, '/');
         $baseController = $controller;
 
         $replaces =
             [
-                '{\((.*)\):[a-zA-Z0-9-_]*(\?}|})' => '($1)',   # Custom regular expression
+                '{\((.*)\):[a-zA-Z0-9-_]*(\?}|})' => '($1)', # Custom regular expression
                 '{num:[a-zA-Z0-9-_]*(\?}|})'      => '(:num)', # (:num) route
                 '{any:[a-zA-Z0-9-_]*(\?}|})'      => '(:any)', # (:any) route
                 '{[a-zA-Z0-9-_]*(\?}|})'          => '(:any)', # Everything else
@@ -555,22 +555,22 @@ 
         $basePath    = '';
 
 
-        foreach(explode('/', $path) as $path_segment)
+        foreach (explode('/', $path) as $path_segment)
         {
-            if(!preg_match('/^\{(.*)\}$/', $path_segment))
+            if (!preg_match('/^\{(.*)\}$/', $path_segment))
             {
-                $basePath .= $path_segment . '/' ;
+                $basePath .= $path_segment.'/';
             }
         }
 
-        $basePath = trim($basePath,'/');
+        $basePath = trim($basePath, '/');
 
-        foreach($replaces as $regex => $replace)
+        foreach ($replaces as $regex => $replace)
         {
             $matches = [];
 
             //if(preg_match_all('/'.$regex.'/', $path, $matches ))
-            if(preg_match_all('/\{(.*)\}/', $path, $matches ))
+            if (preg_match_all('/\{(.*)\}/', $path, $matches))
             {
                 //$foundedArgs = $matches[0];
                 $foundedArgs = explode('/', $matches[0][0]);
@@ -586,24 +586,24 @@ 
         $args['required'] = [];
         $args['optional'] = [];
 
-        foreach($foundedArgs as $arg)
+        foreach ($foundedArgs as $arg)
         {
-            if(substr($arg,-2) == '?}')
+            if (substr($arg, -2) == '?}')
             {
                 $args['optional'][] = $arg;
                 $argConstraint = TRUE;
             }
             else
             {
-                if($argConstraint)
+                if ($argConstraint)
                     show_error('Optional route path argument not valid at this position', 500, 'Route error');
                 $args['required'][] = $arg;
             }
         }
 
-        if(count($foundedArgs) > 0)
+        if (count($foundedArgs) > 0)
         {
-            for($i = 0; $i < count($foundedArgs); $i++)
+            for ($i = 0; $i < count($foundedArgs); $i++)
             {
                 $controller .= '/$'.($i + 1);
             }
@@ -631,14 +631,14 @@ 
     {
         $routes = array();
 
-        foreach(self::$routes as $index => $route)
+        foreach (self::$routes as $index => $route)
         {
             $compiled = self::compileRoute($route);
 
             $backtrackingPath  = '';
             $backtrackingRoute = '';
 
-            if( count($compiled->args['optional']) > 0 )
+            if (count($compiled->args['optional']) > 0)
             {
                 $e_path  = explode('/', $compiled->path);
                 $e_route = explode('/', $compiled->route);
@@ -646,54 +646,54 @@ 
                 $basePath = $compiled->basePath;
                 $baseRoute = $compiled->baseRoute;
 
-                $a = count(explode('/',$basePath));
+                $a = count(explode('/', $basePath));
 
-                for($r = 0; $r < count($compiled->args['required']); $r++)
+                for ($r = 0; $r < count($compiled->args['required']); $r++)
                 {
-                    $basePath .= '/' . $e_path[ $a + $r ];
-                    $baseRoute .= '/' . '$' . ($r + 1);
+                    $basePath .= '/'.$e_path[$a + $r];
+                    $baseRoute .= '/'.'$'.($r + 1);
                 }
 
-                $a = count(explode('/',$basePath));
+                $a = count(explode('/', $basePath));
                 $b = ($r + 1);
 
                 $backtracking = [];
 
-                for($o = 0; $o <= count($compiled->args['optional']); $o++)
+                for ($o = 0; $o <= count($compiled->args['optional']); $o++)
                 {
                     $backtrackingPath  = $basePath;
                     $backtrackingRoute = $baseRoute;
 
-                    for($c = 0; $c < $o  ; $c++)
+                    for ($c = 0; $c < $o; $c++)
                     {
-                        $backtrackingPath .= '/' . $e_path[$a + $c - 1];
-                        $backtrackingRoute .= '/' . '$' . ($b + $c);
+                        $backtrackingPath .= '/'.$e_path[$a + $c - 1];
+                        $backtrackingRoute .= '/'.'$'.($b + $c);
                     }
 
-                    $backtracking[$o] = [ 'path' => $backtrackingPath, 'route' => $backtrackingRoute ];
+                    $backtracking[$o] = ['path' => $backtrackingPath, 'route' => $backtrackingRoute];
                 }
 
-                foreach($backtracking as $b_route)
+                foreach ($backtracking as $b_route)
                 {
                     $b_compiled   = self::compileRoute($route);
                     $b_args       = array_merge($b_compiled->args['required'], $b_compiled->args['optional']);
                     $b_route_path = $b_route['path'];
 
-                    foreach($b_args as $arg)
+                    foreach ($b_args as $arg)
                     {
                         $b_route_path = preg_replace('/\((.*?)\)/', $arg, $b_route_path, 1);
                     }
 
                     self::add($route->verb, $b_route_path, ['uses' => $route->controller.'@'.$route->method]);
 
-                    if( !isset($routes[$b_route['path']]) || $route->verb == 'GET' )
+                    if (!isset($routes[$b_route['path']]) || $route->verb == 'GET')
                     {
                         $routes[$b_route['path']] = $b_route['route'];
                     }
                 }
             }
 
-            if( !isset($routes[$compiled->path]) || $route->verb == 'GET' )
+            if (!isset($routes[$compiled->path]) || $route->verb == 'GET')
             {
                 $routes[$compiled->path] = $compiled->route;
             }
@@ -701,16 +701,16 @@ 
             self::$routes[$index] = (object) $route;
         }
 
-        foreach(self::$hiddenRoutes as $route)
+        foreach (self::$hiddenRoutes as $route)
         {
             $path = key($route);
             $_404 = $route[$path];
 
-            if(!isset($routes[$path]))
+            if (!isset($routes[$path]))
                 $routes[$path] = $_404;
         }
 
-        if(is_null(self::$defaultController))
+        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;
@@ -718,7 +718,7 @@ 
 
         $routes['default_controller'] = $defaultController;
 
-        if(is_null(self::$_404page))
+        if (is_null(self::$_404page))
         {
             $routes['404_override'] = '';
         }
@@ -746,20 +746,20 @@ 
      */
     public static function group($attr, $routes)
     {
-        if(!is_array($attr))
+        if (!is_array($attr))
             show_error('Group attribute must be a valid array');
 
-        if(!isset($attr['prefix']))
+        if (!isset($attr['prefix']))
             show_error('You must specify an prefix!');
 
         self::$prefix[] = $attr['prefix'];
 
-        if(isset($attr['namespace']))
+        if (isset($attr['namespace']))
         {
             self::$namespace[] = $attr['namespace'];
         }
 
-        if(isset($attr['hideOriginals']) && $attr['hideOriginals'] === TRUE)
+        if (isset($attr['hideOriginals']) && $attr['hideOriginals'] === TRUE)
         {
             self::$hideOriginals[] = TRUE;
         }
@@ -768,13 +768,13 @@ 
             self::$hideOriginals[] = FALSE;
         }
 
-        if(isset($attr['middleware']))
+        if (isset($attr['middleware']))
         {
-            if(is_array($attr['middleware']) || is_string($attr['middleware']))
+            if (is_array($attr['middleware']) || is_string($attr['middleware']))
             {
-                if(is_array($attr['middleware']) && !empty($attr['middleware']))
+                if (is_array($attr['middleware']) && !empty($attr['middleware']))
                 {
-                    foreach($attr['middleware'] as $middleware)
+                    foreach ($attr['middleware'] as $middleware)
                         self::$middleware[] = $middleware;
                 }
                 else
@@ -818,16 +818,16 @@ 
                 '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);
+        self::$defaultController = self::$routes[] = self::add('GET', '/', ['uses' => $controller, 'as' => $as], TRUE, TRUE);
     }
 
 
@@ -841,16 +841,16 @@ 
      */
     public static function getRoutes($verb = NULL)
     {
-        if(is_null($verb))
+        if (is_null($verb))
         {
             return self::$routes;
         }
         else
         {
             $routes = [];
-            foreach(self::$routes as $route)
+            foreach (self::$routes as $route)
             {
-                if($route->verb == $verb)
+                if ($route->verb == $verb)
                     $routes[] = $route;
             }
             return $routes;
@@ -890,45 +890,45 @@ 
         $args = func_get_args();
         unset($args[0]);
 
-        foreach(self::$routes as $route)
+        foreach (self::$routes as $route)
         {
-            if($route->name == $search)
+            if ($route->name == $search)
             {
                 $founded = $route;
             }
         }
 
-        if(!is_null($founded))
+        if (!is_null($founded))
         {
             $routeArgs        = self::compileRoute($founded)->args;
             $routeArgCount    = count($routeArgs['required']) + count($routeArgs['optional']);
             $routeReqArgCount = count($routeArgs['required']);
 
-            if(count($args) < $routeReqArgCount)
+            if (count($args) < $routeReqArgCount)
             {
                 $missingArgs = $routeReqArgCount - count($args);
                 throw new \Exception('Missing '.$missingArgs.' required argument'.($missingArgs != 1 ? 's' : '').' for route "'.$founded->name.'"');
             }
-            if(count($args) > $routeArgCount)
+            if (count($args) > $routeArgCount)
             {
                 throw new \Exception('The route "'.$founded->name.'" expects maximum '.$routeArgCount.' argument'.($routeArgCount != 1 ? 's' : '').', '.count($args).' provided');
             }
 
             $path = self::compileRoute($founded)->path;
 
-            foreach($args as $replacement)
+            foreach ($args as $replacement)
             {
                 $path = preg_replace('/\((.*?)\)/', $replacement, $path, 1);
             }
 
-            $argsLeft =  $routeArgCount - count($args);
+            $argsLeft = $routeArgCount - count($args);
 
-            for($i = $argsLeft; $i >= 0; $i--)
+            for ($i = $argsLeft; $i >= 0; $i--)
             {
                 $path = preg_replace('/\((.*?)\)/', '', $path, 1);
             }
 
-            return base_url(trim($path,'/'));
+            return base_url(trim($path, '/'));
         }
 
         throw new \Exception('The route "'.$search.'" is not defined');
@@ -947,17 +947,17 @@ 
      */
     public static function getRouteByPath($path, $requestMethod = NULL)
     {
-        if(is_null($requestMethod))
+        if (is_null($requestMethod))
             $requestMethod = $_SERVER['REQUEST_METHOD'];
 
         $routes = self::getRoutes($requestMethod);
 
-        if(empty($routes))
+        if (empty($routes))
             return FALSE;
 
         $path = trim($path);
 
-        if($path == '')
+        if ($path == '')
             return self::$defaultController;
 
         $wildcards =
@@ -974,17 +974,17 @@ 
                 '(.*)'
             ];
 
-        foreach( ['exact' , 'regex'] as $mode)
+        foreach (['exact', 'regex'] as $mode)
         {
-            foreach( [ $path, $path.'/index' ] as $findPath )
+            foreach ([$path, $path.'/index'] as $findPath)
             {
-                foreach($routes as $route)
+                foreach ($routes as $route)
                 {
                     $compiledPath = key($route->compiled);
 
-                    if($mode == 'exact')
+                    if ($mode == 'exact')
                     {
-                        if($findPath == $compiledPath)
+                        if ($findPath == $compiledPath)
                             return $route;
                     }
                     else
@@ -992,30 +992,30 @@ 
                         $e_findPath     = explode('/', $findPath);
                         $e_compiledPath = explode('/', $compiledPath);
 
-                        if( count($e_findPath) == count($e_compiledPath))
+                        if (count($e_findPath) == count($e_compiledPath))
                         {
                             //var_dump($findPath, $compiledPath);
 
                             $valid = TRUE;
                             $seachUntil = NULL;
 
-                            for($i = 0; $i < count($e_findPath); $i++)
+                            for ($i = 0; $i < count($e_findPath); $i++)
                             {
                                 $reg = preg_replace($wildcards, $replaces, $e_compiledPath[$i]);
 
                                 $valid = (bool) preg_match('#^'.$reg.'$#', $e_findPath[$i]);
 
-                                if($valid && is_null($seachUntil))
+                                if ($valid && is_null($seachUntil))
                                     $seachUntil = $i;
                             }
 
-                            if($valid)
+                            if ($valid)
                             {
-                                for($i = 0; $i < $seachUntil; $i++)
+                                for ($i = 0; $i < $seachUntil; $i++)
                                     $valid = $e_findPath[$i] == $e_compiledPath[$i];
                             }
 
-                            if($valid)
+                            if ($valid)
                                 return $route;
                         }
                     }
@@ -1048,12 +1048,12 @@ 
         $args   = [];
         $n_args = 1;
 
-        for($s = 0; $s < count($r_seg); $s++)
+        for ($s = 0; $s < count($r_seg); $s++)
         {
-            if(!isset($p_seg[$s]))
+            if (!isset($p_seg[$s]))
                 continue;
 
-            if($r_seg[$s] != $p_seg[$s])
+            if ($r_seg[$s] != $p_seg[$s])
             {
                 $args['$'.$n_args] = $p_seg[$s];
                 $n_args++;
@@ -1141,9 +1141,9 @@ 
      */
     public static function trigger404()
     {
-        if( !is_null(self::$_404page) )
+        if (!is_null(self::$_404page))
         {
-            header( 'Location: ' . config_item('base_url') . self::$_404page->path );
+            header('Location: '.config_item('base_url').self::$_404page->path);
             die;
         }
 

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/Middleware/Request.php

Indentation +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
                 // Redirect to 404 if not enough parameters provided
 
                 if(count($path_args) < count($route_args['required']))
-                   redirect(Route::get404()->path);
+                    redirect(Route::get404()->path);
 
                 if(count($path_args) == 0)
                 {

Spacing +12 added lines, -12 removed lines

@@ -64,19 +64,19 @@ 
 
         // FIXME: Solve ambiguity here! POST with _method="GET" makes no sense
 
-        if(isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods , TRUE))
+        if (isset($_POST['_method']) && in_array(strtoupper($_POST['_method']), $validMethods, TRUE))
             $formMethod = strtoupper($_POST['_method']);
 
-        if(is_null($formMethod))
+        if (is_null($formMethod))
         {
             $this->requestMethod = $requestMethod;
         }
         else
         {
-            if($requestMethod == 'POST')
+            if ($requestMethod == 'POST')
                 $this->requestMethod = $formMethod;
 
-            if(!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD')
+            if (!$this->CI->input->is_ajax_request() && $this->requestMethod == 'HEAD')
                 $this->requestMethod = 'POST';
         }
     }
@@ -90,14 +90,14 @@ 
      */
     public function run()
     {
-        if(!$this->route)
+        if (!$this->route)
         {
             //if(is_null(Route::get404()))
             //    show_404();
 
-            if(Route::get404()->controller != get_class($this->CI))
+            if (Route::get404()->controller != get_class($this->CI))
             {
-                if(ENVIRONMENT != 'production')
+                if (ENVIRONMENT != 'production')
                 {
                     show_error('The request method '.$this->requestMethod.' is not allowed to view the resource', 403, 'Forbidden method');
                 }
@@ -110,7 +110,7 @@ 
         }
         else
         {
-            if(method_exists($this->CI,$this->route->method))
+            if (method_exists($this->CI, $this->route->method))
             {
                 $path_args  = Route::getRouteArgs($this->route, self::$uri_string);
                 $route_args = Route::compileRoute($this->route)->args;
@@ -119,16 +119,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));
                 }
 
 
@@ -139,7 +139,7 @@ 
             }
             else
             {
-                if(ENVIRONMENT != 'production')
+                if (ENVIRONMENT != 'production')
                 {
                     show_error('The method '.$this->route->controller.'::'.$this->route->method.'() does not exists', 500, 'Method not found');
                 }

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/Middleware.php

Spacing +12 added lines, -12 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function __construct()
     {
-        $this->CI =& self::$instance;
+        $this->CI = & self::$instance;
     }
 
     /**
@@ -63,7 +63,7 @@ 
      */
     public static function init()
     {
-        self::$instance =& get_instance();
+        self::$instance = & get_instance();
         self::$uri_string = self::$instance->router->uri->uri_string();
 
         // Execute user defined middleware:
@@ -92,16 +92,16 @@ 
         $_run = array();
 
         // Current route middleware
-        if($currentRoute !== FALSE)
+        if ($currentRoute !== FALSE)
         {
-            foreach($currentRoute->middleware as $middleware)
+            foreach ($currentRoute->middleware as $middleware)
             {
-                if(!in_array($middleware,$_run))
+                if (!in_array($middleware, $_run))
                     $_run[] = $middleware;
             }
         }
 
-        foreach($_run as $middleware)
+        foreach ($_run as $middleware)
         {
             self::runMiddleware($middleware);
         }
@@ -125,30 +125,30 @@ 
 
         $middlewareName = ucfirst($middlewareName).'_middleware';
 
-        if(!file_exists($middlewareDir))
+        if (!file_exists($middlewareDir))
             show_error('Unable to find (or read) the middleware folder: "'.$middlewareDir.'"');
 
-        $runMiddleware =  $middlewareDir.$middlewareName.'.php';
+        $runMiddleware = $middlewareDir.$middlewareName.'.php';
 
-        if(!file_exists($runMiddleware))
+        if (!file_exists($runMiddleware))
             show_error('Unable to find (or read) the middleware "'.$runMiddleware.'"');
 
         require $runMiddleware;
 
-        if(!class_exists($middlewareName))
+        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'))
+        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'))
+        if (method_exists(self::$instance, '_afterMiddleware'))
             self::$instance->_afterMiddleware();
 
     }

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