HakimCh / Router

Router.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 		$this->setRoutes($routes);
 		$this->setBasePath($basePath);
         $this->parser = $parser;
-		if(!$server) {
+		if (!$server) {
 			$this->server = $_SERVER;
 		}
     }
@@ -87,11 +87,11 @@ 
 
 		foreach ($this->routes as $handler) {
 
-			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
+			if (!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
 
 			return array(
                 'target' => $handler[2],
-                'params' => array_filter($this->parser->getParams(), function ($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
+                'params' => array_filter($this->parser->getParams(), function($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
                 'name'   => $handler[3]
             );
 		}
@@ -106,8 +106,8 @@ 
      */
     public function __call($method, $arguments)
 	{
-		if(!in_array($method, array('get', 'post', 'delete', 'put', 'patch', 'update', 'all'))) {
-			throw new RouterException($method . ' not exist in the '. __CLASS__);
+		if (!in_array($method, array('get', 'post', 'delete', 'put', 'patch', 'update', 'all'))) {
+			throw new RouterException($method . ' not exist in the ' . __CLASS__);
 		}
 
 		$methods = $method == 'all' ? implode('|', $this->all) : $method;
@@ -143,7 +143,7 @@ 
         if (!is_array($routes) && !$routes instanceof Traversable) {
             throw new RouterException('Routes should be an array or an instance of Traversable');
         }
-        if(!empty($routes)) {
+        if (!empty($routes)) {
             foreach ($routes as $route) {
                 call_user_func_array(array($this, 'map'), $route);
             }

Braces +3 added lines, -1 removed lines

@@ -87,7 +87,9 @@
 
 		foreach ($this->routes as $handler) {
 
-			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
+			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) {
+				continue;
+			}
 
 			return array(
                 'target' => $handler[2],

RouterParser.php

Spacing +5 added lines, -5 removed lines

@@ -78,11 +78,11 @@ 
         $requestMethod = strtolower($requestMethod);
         $methods = explode('|', $method);
 
-        if(in_array($requestMethod, $methods)) {
-            if($routeString == '*') {
+        if (in_array($requestMethod, $methods)) {
+            if ($routeString == '*') {
                 return true;
             }
-            elseif(isset($routeString[0]) && $routeString[0] == '@') {
+            elseif (isset($routeString[0]) && $routeString[0] == '@') {
                 return preg_match('`' . substr($routeString[0], 1) . '`u', $requestUrl, $this->params);
             }
             elseif (($position = strpos($routeString, '[')) === false) {
@@ -156,7 +156,7 @@ 
                 break;
             }
             if ($regex === false) {
-                if(!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
+                if (!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
                     continue;
                 }
                 $jPointer++;
@@ -171,7 +171,7 @@ 
     {
         $cPointer = $nPointer;
         $regex = in_array($cPointer, array('[', '(', '.'));
-        if (!$regex && isset($routeString[$iPointer+1])) {
+        if (!$regex && isset($routeString[$iPointer + 1])) {
             $nPointer = $routeString[$iPointer + 1];
             $regex = in_array($nPointer, array('?', '+', '*', '{'));
         }

Braces +3 added lines, -6 removed lines

@@ -81,14 +81,11 @@
         if(in_array($requestMethod, $methods)) {
             if($routeString == '*') {
                 return true;
-            }
-            elseif(isset($routeString[0]) && $routeString[0] == '@') {
+            } elseif(isset($routeString[0]) && $routeString[0] == '@') {
                 return preg_match('`' . substr($routeString[0], 1) . '`u', $requestUrl, $this->params);
-            }
-            elseif (($position = strpos($routeString, '[')) === false) {
+            } elseif (($position = strpos($routeString, '[')) === false) {
                 return strcmp($requestUrl, $routeString) === 0;
-            }
-            else {
+            } else {
                 if (strncmp($requestUrl, $routeString, $position) !== 0) {
                     return false;
                 }

example/index.php

Spacing +8 added lines, -8 removed lines

@@ -6,10 +6,10 @@ 
 $parser = new \HakimCh\Http\RouterParser();
 $router = new \HakimCh\Http\Router($parser);
 $router->setBasePath('/AltoRouter/examples/basic');
-$router->map('GET|POST','/', 'home#index', 'home');
-$router->map('GET','/users/', array('c' => 'UserController', 'a' => 'ListAction'));
-$router->map('GET','/users/[i:id]', 'users#show', 'users_show');
-$router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
+$router->map('GET|POST', '/', 'home#index', 'home');
+$router->map('GET', '/users/', array('c' => 'UserController', 'a' => 'ListAction'));
+$router->map('GET', '/users/[i:id]', 'users#show', 'users_show');
+$router->map('POST', '/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
 
 // match current request
 $match = $router->match();
@@ -19,12 +19,12 @@ 
 <h3>Current request: </h3>
 <pre>
      <?php
-     foreach($match as $key => $value) {
+     foreach ($match as $key => $value) {
          echo '<p>' . $key . ': ';
-         if(is_array($value)) {
+         if (is_array($value)) {
              echo '<ul>';
-             foreach($value as $k => $v) {
-                 echo '<li>'.$k.': '.$v.'</li>';
+             foreach ($value as $k => $v) {
+                 echo '<li>' . $k . ': ' . $v . '</li>';
              }
              echo '</ul>';
          }

Braces +1 added lines, -2 removed lines

@@ -27,8 +27,7 @@
                  echo '<li>'.$k.': '.$v.'</li>';
              }
              echo '</ul>';
-         }
-         else {
+         } else {
              echo $value;
          }
          echo '</p>';