Passed
Push — master ( f29cb9...fb1aeb )
by Henri
01:21
created
examples/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
examples/Controllers/User.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
examples/Filters/User.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -4,15 +4,15 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
examples/Routes/default.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -3,21 +3,21 @@
 block discarded – undo
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
 });
Please login to merge, or discard this patch.
src/ControllerTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,28 +4,28 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
src/FilterTrait.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,13 +4,13 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Controller.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Helper.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace HnrAzevedo\Router;
4 4
 
5
-trait Helper{
5
+trait Helper {
6 6
     use CheckTrait, ControllerTrait;
7 7
     
8 8
     private $currentRoute = null;
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     protected function getProtocol(): string
26 26
     {
27 27
         $protocol = ((isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest')) ? 'ajax' : 'get';
28
-        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD',$_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
28
+        $protocol = (array_key_existS('HTTP_REQUESTED_METHOD', $_SERVER)) ? strtolower($_SERVER['HTTP_REQUESTED_METHOD']) : $protocol;
29 29
             
30 30
         return $protocol;
31 31
     }
@@ -43,18 +43,18 @@  discard block
 block discarded – undo
43 43
     protected function import(string $path)
44 44
     {
45 45
         foreach (scandir($path) as $routeFile) {
46
-            if(pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php'){
47
-                require_once($path. DIRECTORY_SEPARATOR .$routeFile);
46
+            if (pathinfo($path.DIRECTORY_SEPARATOR.$routeFile, PATHINFO_EXTENSION) === 'php') {
47
+                require_once($path.DIRECTORY_SEPARATOR.$routeFile);
48 48
             }
49 49
         }
50 50
     }
51 51
 
52
-    protected function ControllerForm($controller, string $method, array $values){
52
+    protected function ControllerForm($controller, string $method, array $values) {
53 53
 		$this->checkRole();
54 54
         $method = ($method !== 'method') ? $method : $this->getData()['POST']['role'];
55
-        $data = (array_key_exists('data',$values)) ? json_decode($values['data'], true) : null;
55
+        $data = (array_key_exists('data', $values)) ? json_decode($values['data'], true) : null;
56 56
 
57
-        call_user_func_array([$controller,$method],  $data);
57
+        call_user_func_array([$controller, $method], $data);
58 58
     }
59 59
 
60 60
     protected function Controller(string $controll): void
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
         $data = $this->getData();
63 63
 
64 64
         foreach ($data['GET'] as $name => $value) {
65
-            $controll = str_replace('{'.$name.'}',$value,$controll);
65
+            $controll = str_replace('{'.$name.'}', $value, $controll);
66 66
         }
67 67
 
68 68
         $this->checkControllsettable($controll);
@@ -71,32 +71,32 @@  discard block
 block discarded – undo
71 71
 
72 72
         $this->checkControllmethod($controll);
73 73
 
74
-        $controller = ROUTER_CONFIG['controller.namespace'].'\\'. ucfirst(explode(':',$controll)[0]);
74
+        $controller = ROUTER_CONFIG['controller.namespace'].'\\'.ucfirst(explode(':', $controll)[0]);
75 75
         $controller = new $controller();
76
-        $method = explode(':',$controll)[1];
76
+        $method = explode(':', $controll)[1];
77 77
 
78
-        if( ($this->getProtocol() == 'form') ){
78
+        if (($this->getProtocol() == 'form')) {
79 79
             $this->ControllerForm($controller, $method, $data['POST']);
80 80
         }else {
81
-            $data = (array_key_exists('data',$data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
82
-            call_user_func_array([$controller,$method],  $data);
81
+            $data = (array_key_exists('data', $data['POST'])) ? json_decode($data['POST']['data'], true) : $data['GET'];
82
+            call_user_func_array([$controller, $method], $data);
83 83
         }
84 84
        
85 85
     }    
86 86
 
87 87
     protected function explodeRoute(bool $bar, string $url): array
88 88
     {   
89
-        return explode( '/', $bar ? substr($url, 0, -1) : $url );
89
+        return explode('/', $bar ? substr($url, 0, -1) : $url);
90 90
     }
91 91
 
92 92
     protected function toHiking($walking)
93 93
     {
94
-        if(is_string($walking)){
94
+        if (is_string($walking)) {
95 95
             $this->Controller($walking);
96 96
             return true;
97 97
         }
98 98
 
99
-        call_user_func_array($walking,$this->getData()['GET']);
99
+        call_user_func_array($walking, $this->getData()['GET']);
100 100
     }
101 101
 
102 102
 }
Please login to merge, or discard this patch.
src/CheckWhere.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -4,25 +4,25 @@  discard block
 block discarded – undo
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 checkExistParam($param, $data)
17 17
     {
18
-        if(!array_key_exists($param,$data)){
18
+        if (!array_key_exists($param, $data)) {
19 19
             throw new Exception('Test parameter not available on the route in question.');
20 20
         }
21 21
     }
22 22
 
23 23
     protected function checkWhereParams($params)
24 24
     {
25
-        if(count($params) === 0){
25
+        if (count($params) === 0) {
26 26
             throw new Exception('The route in question has no parameters to be tested.');
27 27
         }
28 28
     }
@@ -31,18 +31,18 @@  discard block
 block discarded – undo
31 31
     {
32 32
         $pass = true;
33 33
 
34
-        if(!is_array($route['where'])){
34
+        if (!is_array($route['where'])) {
35 35
             return $pass;
36 36
         }
37 37
 
38
-        $routeURI = explode('/',$route['url']);
38
+        $routeURI = explode('/', $route['url']);
39 39
         $params = [];
40
-        foreach($routeURI as $p => $part){
41
-            if(substr($part,0,1) === '{' && substr($part,-1) === '}'){
42
-                $param = substr($part,1,-1);
40
+        foreach ($routeURI as $p => $part) {
41
+            if (substr($part, 0, 1) === '{' && substr($part, -1) === '}') {
42
+                $param = substr($part, 1, -1);
43 43
                 $params[$param] = $route['where'][$param];
44 44
 
45
-                if(!preg_match("/^{$params[$param]}$/",$request[$p])){
45
+                if (!preg_match("/^{$params[$param]}$/", $request[$p])) {
46 46
                     $pass = false;
47 47
                 }
48 48
             }
@@ -58,13 +58,13 @@  discard block
 block discarded – undo
58 58
         $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0];
59 59
         
60 60
         $route = end($this->routers);
61
-        $routeURI = explode('/',$route['url']);
61
+        $routeURI = explode('/', $route['url']);
62 62
         $params = [];
63
-        foreach($routeURI as $part){
64
-            if(substr($part,0,1) === '{' && substr($part,-1) === '}'){
65
-                $param = substr($part,1,-1);
63
+        foreach ($routeURI as $part) {
64
+            if (substr($part, 0, 1) === '{' && substr($part, -1) === '}') {
65
+                $param = substr($part, 1, -1);
66 66
 
67
-                $this->checkExistParam($param,$data);
67
+                $this->checkExistParam($param, $data);
68 68
 
69 69
                 $params[$param] = $data[$param];
70 70
             }
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
         $this->checkWhereParams($params);
74 74
 
75
-        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params;
75
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params;
76 76
 
77 77
         $this->routers[count($this->routers)-1] = $route;
78 78
     }
Please login to merge, or discard this patch.