refatalsakka / framework

Core/System/Route.php

Indentation +76 added lines, -76 removed lines

@@ -6,73 +6,73 @@ 
 
 class Route
 {
-  const NEXT = '_NEXT_';
+    const NEXT = '_NEXT_';
 
-  private $app;
+    private $app;
 
-  private $routes = [];
+    private $routes = [];
 
-  public $current = [];
+    public $current = [];
 
-  private $prefix;
+    private $prefix;
 
-  private $basController;
+    private $basController;
 
-  private $middlewareFrom;
+    private $middlewareFrom;
 
-  private $groupMiddleware = [];
+    private $groupMiddleware = [];
 
-  public function __construct(Application $app)
-  {
+    public function __construct(Application $app)
+    {
     $this->app = $app;
-  }
+    }
 
-  public function add($url, $action, $requestMethos = 'GET', $middleware = [])
-  {
+    public function add($url, $action, $requestMethos = 'GET', $middleware = [])
+    {
 
     if ($this->prefix) {
 
-      if ($this->prefix !== '/') {
+        if ($this->prefix !== '/') {
 
         $url = $this->prefix . $url;
 
         $url = rtrim($url, '/');
-      }
+        }
     }
 
     if ($this->basController) {
-      $action = $this->basController . '/' . $action
+        $action = $this->basController . '/' . $action
     }
 
     if ($this->groupMiddleware) {
 
-      if (is_array($middleware)) {
+        if (is_array($middleware)) {
 
         $middleware = array_merge($this->groupMiddleware[0], $middleware);
 
-      } else {
+        } else {
 
         array_push($this->groupMiddleware[0], $middleware);
 
         $middleware = $this->groupMiddleware[0];
-      }
+        }
     }
 
     $routes = [
-      'url'       => $url,
-      'pattern'   => $this->generatePattern($url),
-      'action'    => $this->getAction($action),
-      'method'    => $requestMethos,
-      'middleware' => $middleware
+        'url'       => $url,
+        'pattern'   => $this->generatePattern($url),
+        'action'    => $this->getAction($action),
+        'method'    => $requestMethos,
+        'middleware' => $middleware
     ];
 
     $this->routes[] = $routes;
 
     return $this;
-  }
+    }
 
-  public function group($groupOptions, callable $callback)
-  {
+    public function group($groupOptions, callable $callback)
+    {
     $prefix = $groupOptions['prefix'];
     $controller = $groupOptions['controller'];
     $middlewareFrom = array_shift($groupOptions['middleware']);
@@ -82,7 +82,7 @@ 
     $check = '/' . explode('/', $url)[0];
 
     if ($check !== $prefix) {
-      return $this;
+        return $this;
     }
 
     $this->prefix = $prefix;
@@ -93,10 +93,10 @@ 
     $callback($this);
 
     return $this;
-  }
+    }
 
-  public function package($url, $controller)
-  {
+    public function package($url, $controller)
+    {
     $this->add("$url", "$controller");
     $this->add("$url/add", "$controller@add", "POST");
     $this->add("$url/submit", "$controller@submit", "POST");
@@ -105,19 +105,19 @@ 
     $this->add("$url/delete/:id", "$controller@delete", "POST");
 
     return $this;
-  }
+    }
 
-  public function generatePattern($url)
-  {
+    public function generatePattern($url)
+    {
     $pattern = '#^';
     $pattern .= str_replace([':text', ':id'], ['([a-zA-Z0-9-]+)', '(\d+)'], $url);
     $pattern .= '$#';
 
     return $pattern;
-  }
+    }
 
-  public function getAction($action)
-  {
+    public function getAction($action)
+    {
     $action = str_replace('/', '\\', $action);
 
     $action = (strpos($action, '@') != 0) ? $action : $action . '@index';
@@ -125,13 +125,13 @@ 
     $action = explode('@', $action);
 
     return $action;
-  }
+    }
 
-  public function getProperRoute()
-  {
+    public function getProperRoute()
+    {
     foreach ($this->routes as $route) {
 
-      if ($this->isMatching($route['pattern']) && $this->isMatchingRequestMethod($route['method'])) {
+        if ($this->isMatching($route['pattern']) && $this->isMatchingRequestMethod($route['method'])) {
 
         $this->current = $route;
 
@@ -139,85 +139,85 @@ 
 
         if ($route['middleware']) {
 
-          if (is_array($route['middleware'])) {
+            if (is_array($route['middleware'])) {
 
             foreach ($route['middleware'] as $middleware) {
 
-              $output = $this->middleware($middleware);
+                $output = $this->middleware($middleware);
 
-              if ($output != '') {
+                if ($output != '') {
                 break;
-              }
+                }
             }
 
-          } else {
+            } else {
 
             $output = $this->middleware($route['middleware']);
 
             if ($output != '') break;
-          }
+            }
         }
 
         if ($output == '') {
 
-          list($controller, $method) = $route['action'];
+            list($controller, $method) = $route['action'];
 
-          $arguments = $this->getArgumentsFor($route['pattern']);
+            $arguments = $this->getArgumentsFor($route['pattern']);
 
-          $output = (string) $this->app->load->action($controller, $method, $arguments);
+            $output = (string) $this->app->load->action($controller, $method, $arguments);
 
-          return $output;
+            return $output;
 
         }
         break;
-      }
+        }
     }
 
     $output = (string) $this->app->load->action('notFound', 'index', []);
 
     return $output;
-  }
+    }
 
-  public function isMatching($pattern)
-  {
+    public function isMatching($pattern)
+    {
     $url = $this->app->request->url();
 
     $url = strtolower($url);
 
     return preg_match($pattern, $url);
-  }
+    }
 
-  private function isMatchingRequestMethod($method)
-  {
+    private function isMatchingRequestMethod($method)
+    {
     $methods = ['GET', 'POST'];
 
     if (($method == 'both') && in_array($this->app->request->method(), $methods)) {
-      return true;
+        return true;
     }
 
     if (is_array($method)) {
 
-      if (count($method) == 1) {
+        if (count($method) == 1) {
 
         $method = $method[0];
 
-      } else if (count($method) == 2) {
+        } else if (count($method) == 2) {
 
         if (in_array($method[0], $methods) && in_array($method[1], $methods)) {
-          return true;
+            return true;
         }
 
-      } else {
+        } else {
 
         return false;
-      }
+        }
     }
 
     return $this->app->request->method() == $method;
-  }
+    }
 
-  public function getArgumentsFor($pattern)
-  {
+    public function getArgumentsFor($pattern)
+    {
     $url = $this->app->request->url();
 
     preg_match($pattern, $url, $matches);
@@ -225,15 +225,15 @@ 
     array_shift($matches);
 
     return $matches;
-  }
+    }
 
-  public function getCurrent($key)
-  {
+    public function getCurrent($key)
+    {
     return $this->current[$key];
-  }
+    }
 
-  private function middleware($middleware, $from = 'admin')
-  {
+    private function middleware($middleware, $from = 'admin')
+    {
     $middlewareInterface = 'App\\Middleware\\MiddlewaresInterface';
 
     $middlewares = $this->app->alias['middlewares'][$from];
@@ -241,7 +241,7 @@ 
     $middlewareClass = $middlewares[$middleware];
 
     if (!in_array($middlewareInterface, class_implements($middlewareClass))) {
-      throw new Exception("$middlewareClass not Implement");
+        throw new Exception("$middlewareClass not Implement");
     }
 
     $middlewareObject = new $middlewareClass;
@@ -249,9 +249,9 @@ 
     $output = $middlewareObject->handle($this->app, static::NEXT);
 
     if ($output && $output === static::NEXT) {
-      $output = '';
+        $output = '';
     }
 
     return $output;
-  }
+    }
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -154,7 +154,9 @@
 
             $output = $this->middleware($route['middleware']);
 
-            if ($output != '') break;
+            if ($output != '') {
+                break;
+            }
           }
         }