@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | /* NOTE: in case of error an exception is thrown */ |
| 11 | 11 | |
| 12 | -try{ |
|
| 12 | +try { |
|
| 13 | 13 | |
| 14 | 14 | Router::dispatch(); |
| 15 | 15 | |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | /* Return current action route */ |
| 21 | 21 | $action = Router::currentRouteAction(); |
| 22 | 22 | |
| 23 | -}catch(Exception $er){ |
|
| 23 | +}catch (Exception $er) { |
|
| 24 | 24 | |
| 25 | 25 | die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}."); |
| 26 | 26 | |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | use HnrAzevedo\Router\Controller; |
| 6 | 6 | |
| 7 | -class User extends Controller{ |
|
| 7 | +class User extends Controller { |
|
| 8 | 8 | |
| 9 | 9 | public function requereLogin($username, $password): void |
| 10 | 10 | { |
@@ -4,15 +4,15 @@ |
||
| 4 | 4 | |
| 5 | 5 | use HnrAzevedo\Filter\Filter as HnrFilter; |
| 6 | 6 | |
| 7 | -class User extends HnrFilter{ |
|
| 7 | +class User extends HnrFilter { |
|
| 8 | 8 | |
| 9 | 9 | public function user_in(): bool |
| 10 | 10 | { |
| 11 | - $this->addMessage('user_in','User required to be logged in.'); |
|
| 11 | + $this->addMessage('user_in', 'User required to be logged in.'); |
|
| 12 | 12 | |
| 13 | - $this->addTreat('user_in','report_notLogged'); |
|
| 13 | + $this->addTreat('user_in', 'report_notLogged'); |
|
| 14 | 14 | |
| 15 | - return (array_key_exists('user',$_SESSION)); |
|
| 15 | + return (array_key_exists('user', $_SESSION)); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function report_notLogged(): void |
@@ -3,21 +3,21 @@ |
||
| 3 | 3 | use HnrAzevedo\Router\Router; |
| 4 | 4 | |
| 5 | 5 | /* Returning parameters passed via URL in anonymous functions */ |
| 6 | -Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter){ |
|
| 6 | +Router::get('/{parameter}/{otherparameter}', function($parameter, $otherparameter) { |
|
| 7 | 7 | echo "Parameter 1:{$parameter}, Parameter 2:{$otherparameter}."; |
| 8 | 8 | }); |
| 9 | 9 | |
| 10 | 10 | /* Passing controller and/or method via parameter in URL */ |
| 11 | -Router::get('/{controller}/{method}','{controller}:{method}'); |
|
| 12 | -Router::get('/{controller}/{method}','{controller}:method'); |
|
| 11 | +Router::get('/{controller}/{method}', '{controller}:{method}'); |
|
| 12 | +Router::get('/{controller}/{method}', '{controller}:method'); |
|
| 13 | 13 | |
| 14 | 14 | /* Passing value via parameter */ |
| 15 | -Router::get('/my-account/{teste}','User:my_account'); |
|
| 15 | +Router::get('/my-account/{teste}', 'User:my_account'); |
|
| 16 | 16 | |
| 17 | 17 | /* Filter example */ |
| 18 | -Router::get('/my-account','User:my_account')->filter('User:user_in'); |
|
| 18 | +Router::get('/my-account', 'User:my_account')->filter('User:user_in'); |
|
| 19 | 19 | |
| 20 | 20 | /* Accessed by all protocols */ |
| 21 | -Router::any('/',function(){ |
|
| 21 | +Router::any('/', function() { |
|
| 22 | 22 | // |
| 23 | 23 | }); |
@@ -4,28 +4,28 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Exception; |
| 6 | 6 | |
| 7 | -trait ControllerTrait{ |
|
| 7 | +trait ControllerTrait { |
|
| 8 | 8 | |
| 9 | 9 | protected function checkControllsettable(string $controll) |
| 10 | 10 | { |
| 11 | - if(count(explode(':',$controll)) != 2){ |
|
| 11 | + if (count(explode(':', $controll)) != 2) { |
|
| 12 | 12 | throw new Exception("Controller {$controll} badly set."); |
| 13 | 13 | } |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | protected function checkControllexist(string $controll) |
| 17 | 17 | { |
| 18 | - $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]); |
|
| 19 | - if(!class_exists($controllname)){ |
|
| 18 | + $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
| 19 | + if (!class_exists($controllname)) { |
|
| 20 | 20 | throw new Exception("No controller {$controllname} found."); |
| 21 | 21 | } |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | protected function checkControllmethod(string $controll) |
| 25 | 25 | { |
| 26 | - $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':',$controll)[0]); |
|
| 27 | - $method = explode(':',$controll)[1]; |
|
| 28 | - if(!method_exists($controllname, $method)){ |
|
| 26 | + $controllname = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]); |
|
| 27 | + $method = explode(':', $controll)[1]; |
|
| 28 | + if (!method_exists($controllname, $method)) { |
|
| 29 | 29 | throw new Exception("No method {$method} found for {$controllname}."); |
| 30 | 30 | } |
| 31 | 31 | } |
@@ -4,13 +4,13 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Exception; |
| 6 | 6 | |
| 7 | -trait FilterTrait{ |
|
| 7 | +trait FilterTrait { |
|
| 8 | 8 | protected function checkFiltering(array $route) |
| 9 | 9 | { |
| 10 | - $filters = (is_array($route['filters'])) ? $route['filters'] : [ $route['filters'] ]; |
|
| 10 | + $filters = (is_array($route['filters'])) ? $route['filters'] : [$route['filters']]; |
|
| 11 | 11 | |
| 12 | - foreach($filters as $filter){ |
|
| 13 | - if(is_null($filter)){ |
|
| 12 | + foreach ($filters as $filter) { |
|
| 13 | + if (is_null($filter)) { |
|
| 14 | 14 | continue; |
| 15 | 15 | } |
| 16 | 16 | $this->checkFilter($filter); |
@@ -19,20 +19,20 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | protected function checkFilter(string $filtername) |
| 21 | 21 | { |
| 22 | - if(count(explode(':',$filtername)) != 2){ |
|
| 22 | + if (count(explode(':', $filtername)) != 2) { |
|
| 23 | 23 | throw new Exception("Wrongly configured filter: {$filtername}."); |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - $filter = $this->checkFilClassExist(explode(':',$filtername)[0]); |
|
| 26 | + $filter = $this->checkFilClassExist(explode(':', $filtername)[0]); |
|
| 27 | 27 | |
| 28 | - if(!$filter->check(explode(':',$filtername)[1])){ |
|
| 29 | - throw new Exception($filter->getMessage(explode(':',$filtername)[1]),403); |
|
| 28 | + if (!$filter->check(explode(':', $filtername)[1])) { |
|
| 29 | + throw new Exception($filter->getMessage(explode(':', $filtername)[1]), 403); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | protected function checkFilClassExist(string $class) |
| 34 | 34 | { |
| 35 | - if(class_exists(ROUTER_CONFIG['filter.namespace']."\\{$class}")){ |
|
| 35 | + if (class_exists(ROUTER_CONFIG['filter.namespace']."\\{$class}")) { |
|
| 36 | 36 | $filter = ROUTER_CONFIG['filter.namespace']."\\{$class}"; |
| 37 | 37 | return new $filter(); |
| 38 | 38 | } |
@@ -5,14 +5,14 @@ discard block |
||
| 5 | 5 | use HnrAzevedo\Validator\Validator; |
| 6 | 6 | use Exception; |
| 7 | 7 | |
| 8 | -class Controller{ |
|
| 8 | +class Controller { |
|
| 9 | 9 | use Helper; |
| 10 | 10 | |
| 11 | 11 | protected array $fail = []; |
| 12 | 12 | |
| 13 | 13 | private function checkMethod(string $method): void |
| 14 | 14 | { |
| 15 | - if(!method_exists($this,$method)){ |
|
| 15 | + if (!method_exists($this, $method)) { |
|
| 16 | 16 | throw new Exception("{$method} not found in ".get_class($this)."."); |
| 17 | 17 | } |
| 18 | 18 | } |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | { |
| 22 | 22 | $this->ValidateData(); |
| 23 | 23 | |
| 24 | - if($this->checkFailData()){ |
|
| 24 | + if ($this->checkFailData()) { |
|
| 25 | 25 | return false; |
| 26 | 26 | } |
| 27 | 27 | |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | $this->checkMethod($method); |
| 31 | 31 | |
| 32 | - call_user_func_array([$this,$method], func_get_args()); |
|
| 32 | + call_user_func_array([$this, $method], func_get_args()); |
|
| 33 | 33 | |
| 34 | 34 | return true; |
| 35 | 35 | } |
@@ -38,8 +38,8 @@ discard block |
||
| 38 | 38 | { |
| 39 | 39 | $valid = Validator::execute($this->getData()['POST']); |
| 40 | 40 | |
| 41 | - if(!$valid){ |
|
| 42 | - foreach(Validator::getErrors() as $err => $message){ |
|
| 41 | + if (!$valid) { |
|
| 42 | + foreach (Validator::getErrors() as $err => $message) { |
|
| 43 | 43 | $this->fail[] = [ |
| 44 | 44 | 'input' => array_keys($message)[0], |
| 45 | 45 | 'message' => $message[array_keys($message)[0]] |
@@ -50,12 +50,12 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | private function checkFailData(): bool |
| 52 | 52 | { |
| 53 | - if(count($this->fail) > 0 ){ |
|
| 53 | + if (count($this->fail) > 0) { |
|
| 54 | 54 | echo json_encode([ |
| 55 | 55 | 'error'=> $this->fail |
| 56 | 56 | ]); |
| 57 | 57 | } |
| 58 | - return (count($this->fail) > 0 ); |
|
| 58 | + return (count($this->fail) > 0); |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | } |
| 62 | 62 | \ No newline at end of file |
@@ -2,12 +2,12 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace HnrAzevedo\Router; |
| 4 | 4 | |
| 5 | -trait DefinitionsTrait{ |
|
| 5 | +trait DefinitionsTrait { |
|
| 6 | 6 | private static $instance = null; |
| 7 | 7 | |
| 8 | 8 | public static function match(string $protocols, string $uri, $walking): Router |
| 9 | 9 | { |
| 10 | - foreach(explode('|',$protocols) as $protocol){ |
|
| 10 | + foreach (explode('|', $protocols) as $protocol) { |
|
| 11 | 11 | self::getInstance()->add($uri, $walking, $protocol); |
| 12 | 12 | } |
| 13 | 13 | return self::$instance; |
@@ -4,18 +4,18 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Exception; |
| 6 | 6 | |
| 7 | -trait CheckWhere{ |
|
| 7 | +trait CheckWhere { |
|
| 8 | 8 | |
| 9 | 9 | protected function checkWhereParam($data) |
| 10 | 10 | { |
| 11 | - if(count($data) === 0){ |
|
| 11 | + if (count($data) === 0) { |
|
| 12 | 12 | throw new Exception('It is necessary to define a condition to be tested.'); |
| 13 | 13 | } |
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | protected function checkWhereParams($params) |
| 17 | 17 | { |
| 18 | - if(count($params) === 0){ |
|
| 18 | + if (count($params) === 0) { |
|
| 19 | 19 | throw new Exception('The route in question has no parameters to be tested.'); |
| 20 | 20 | } |
| 21 | 21 | } |
@@ -24,24 +24,24 @@ discard block |
||
| 24 | 24 | { |
| 25 | 25 | $pass = true; |
| 26 | 26 | |
| 27 | - if(!is_array($route['where'])){ |
|
| 27 | + if (!is_array($route['where'])) { |
|
| 28 | 28 | return $pass; |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - $routeURI = explode('/',$route['url']); |
|
| 31 | + $routeURI = explode('/', $route['url']); |
|
| 32 | 32 | $params = []; |
| 33 | - foreach($routeURI as $p => $part){ |
|
| 34 | - if(!$this->isParameter($part)){ |
|
| 33 | + foreach ($routeURI as $p => $part) { |
|
| 34 | + if (!$this->isParameter($part)) { |
|
| 35 | 35 | continue; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - $param = substr(str_replace('?','',$part),1,-1); |
|
| 38 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
| 39 | 39 | |
| 40 | - if(array_key_exists($param,$route['where'])){ |
|
| 40 | + if (array_key_exists($param, $route['where'])) { |
|
| 41 | 41 | |
| 42 | 42 | $params[$param] = $route['where'][$param]; |
| 43 | 43 | |
| 44 | - if(!preg_match("/^{$params[$param]}$/",$request[$p])){ |
|
| 44 | + if (!preg_match("/^{$params[$param]}$/", $request[$p])) { |
|
| 45 | 45 | $pass = false; |
| 46 | 46 | } |
| 47 | 47 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | protected function isParameter(string $part): bool |
| 54 | 54 | { |
| 55 | - return (substr($part,0,1) === '{' && substr($part,-1) === '}'); |
|
| 55 | + return (substr($part, 0, 1) === '{' && substr($part, -1) === '}'); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | protected function callWhereAdd($data) |
@@ -62,16 +62,16 @@ discard block |
||
| 62 | 62 | $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0]; |
| 63 | 63 | |
| 64 | 64 | $route = end($this->routers); |
| 65 | - $routeURI = explode('/',$route['url']); |
|
| 65 | + $routeURI = explode('/', $route['url']); |
|
| 66 | 66 | $params = []; |
| 67 | - foreach($routeURI as $part){ |
|
| 68 | - if(!$this->isParameter($part)){ |
|
| 67 | + foreach ($routeURI as $part) { |
|
| 68 | + if (!$this->isParameter($part)) { |
|
| 69 | 69 | continue; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $param = substr(str_replace('?','',$part),1,-1); |
|
| 72 | + $param = substr(str_replace('?', '', $part), 1, -1); |
|
| 73 | 73 | |
| 74 | - if(array_key_exists($param,$data)){ |
|
| 74 | + if (array_key_exists($param, $data)) { |
|
| 75 | 75 | $params[$param] = $data[$param]; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | $this->checkWhereParams($params); |
| 81 | 81 | |
| 82 | - $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params; |
|
| 82 | + $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params; |
|
| 83 | 83 | |
| 84 | 84 | $this->routers[count($this->routers)-1] = $route; |
| 85 | 85 | } |