Passed
Push — master ( b30a41...91b62f )
by Henri
02:18
created
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.
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/ControllerTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,11 +4,11 @@  discard block
 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
         return $this;
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 
17 17
     protected function checkControllExist(string $controll)
18 18
     {
19
-        $controllname = ucfirst(explode(':',$controll)[0]);
20
-        if(!class_exists($controllname)){
19
+        $controllname = ucfirst(explode(':', $controll)[0]);
20
+        if (!class_exists($controllname)) {
21 21
             throw new Exception("No controller {$controllname} found.");
22 22
         }
23 23
         return $this;
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
 
26 26
     protected function checkControllMethod(string $controll)
27 27
     {
28
-        $controllname = ucfirst(explode(':',$controll)[0]);
29
-        $method = explode(':',$controll)[1];
30
-        if(!method_exists($controllname, $method)){
28
+        $controllname = ucfirst(explode(':', $controll)[0]);
29
+        $method = explode(':', $controll)[1];
30
+        if (!method_exists($controllname, $method)) {
31 31
             throw new Exception("No method {$method} found for {$controllname}.");
32 32
         }
33 33
         return $this;
Please login to merge, or discard this patch.
src/CheckWhere.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -4,12 +4,12 @@  discard block
 block discarded – undo
4 4
 
5 5
 use Exception;
6 6
 
7
-trait CheckWhere{
7
+trait CheckWhere {
8 8
     protected array $routers = [];
9 9
         
10 10
     protected function checkWhereParam($data)
11 11
     {
12
-        if(count($data) === 0){
12
+        if (count($data) === 0) {
13 13
             throw new Exception('It is necessary to define a condition to be tested.');
14 14
         }
15 15
         return $this;
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 
18 18
     protected function checkWhereParams($params)
19 19
     {
20
-        if(count($params) === 0){
20
+        if (count($params) === 0) {
21 21
             throw new Exception('The route in question has no parameters to be tested.');
22 22
         }
23 23
         return $this;
@@ -27,24 +27,24 @@  discard block
 block discarded – undo
27 27
     {
28 28
         $pass = true;
29 29
 
30
-        if(!is_array($route['where'])){
30
+        if (!is_array($route['where'])) {
31 31
             return $pass;
32 32
         }
33 33
 
34
-        $routeURI = explode('/',$route['url']);
34
+        $routeURI = explode('/', $route['url']);
35 35
         $params = [];
36
-        foreach($routeURI as $p => $part){
37
-            if(!$this->isWhered($part,$request[$p])){
36
+        foreach ($routeURI as $p => $part) {
37
+            if (!$this->isWhered($part, $request[$p])) {
38 38
                 continue;
39 39
             }
40 40
                 
41
-            $param = substr(str_replace('?','',$part),1,-1);
41
+            $param = substr(str_replace('?', '', $part), 1, -1);
42 42
 
43
-            if(array_key_exists($param,$route['where'])){
43
+            if (array_key_exists($param, $route['where'])) {
44 44
                     
45 45
                 $params[$param] = $route['where'][$param];
46 46
 
47
-                if(!preg_match("/^{$params[$param]}$/",$request[$p])){
47
+                if (!preg_match("/^{$params[$param]}$/", $request[$p])) {
48 48
                     $pass = false;
49 49
                 }
50 50
             }
@@ -55,17 +55,17 @@  discard block
 block discarded – undo
55 55
 
56 56
     private function isWhered(string $part, string $value): bool
57 57
     {
58
-        return $this->isParameter($part) && !$this->checkParameterOptional($part,$value);
58
+        return $this->isParameter($part) && !$this->checkParameterOptional($part, $value);
59 59
     }
60 60
 
61 61
     private function checkParameterOptional(string $part, string $value): bool
62 62
     {
63
-        return substr($part,0,2) === '{?' && empty($value);
63
+        return substr($part, 0, 2) === '{?' && empty($value);
64 64
     }
65 65
 
66 66
     protected function isParameter(string $part): bool
67 67
     {
68
-        return (substr($part,0,1) === '{' && substr($part,-1) === '}');
68
+        return (substr($part, 0, 1) === '{' && substr($part, -1) === '}');
69 69
     }
70 70
 
71 71
     protected function callWhereAdd($data)
@@ -75,16 +75,16 @@  discard block
 block discarded – undo
75 75
         $data = (count($data) > 1) ? [$data[0] => $data[1]] : $data[0];
76 76
         
77 77
         $route = end($this->routers);
78
-        $routeURI = explode('/',$route['url']);
78
+        $routeURI = explode('/', $route['url']);
79 79
         $params = [];
80
-        foreach($routeURI as $part){
81
-            if(!$this->isParameter($part)){
80
+        foreach ($routeURI as $part) {
81
+            if (!$this->isParameter($part)) {
82 82
                 continue;
83 83
             }
84 84
             
85
-            $param = substr(str_replace('?','',$part),1,-1);
85
+            $param = substr(str_replace('?', '', $part), 1, -1);
86 86
 
87
-            if(array_key_exists($param,$data)){
87
+            if (array_key_exists($param, $data)) {
88 88
                 $params[$param] = $data[$param];
89 89
             }
90 90
                 
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
         $this->checkWhereParams($params);
94 94
 
95
-        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'],$params) : $params;
95
+        $route['where'] = (is_array($route['where'])) ? array_merge($route['where'], $params) : $params;
96 96
 
97 97
         $this->routers[count($this->routers)-1] = $route;
98 98
 
Please login to merge, or discard this patch.
src/ExtraJobsTrait.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace HnrAzevedo\Router;
4 4
 
5
-trait ExtraJobsTrait{
5
+trait ExtraJobsTrait {
6 6
     protected array $routers = [];
7 7
 
8 8
     public function before($walking)
9 9
     {
10
-        return $this->setOnRoute($walking,'before');
10
+        return $this->setOnRoute($walking, 'before');
11 11
     }
12 12
 
13 13
     public static function beforeAll($walking, $except = null)
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
         $excepts = is_array($except) ? $except : [$except];
16 16
         self::getInstance()->beforeExcepts = $excepts;
17 17
         self::getInstance()->beforeAll = $walking;
18
-        return self::getInstance()->setOnRoutes($walking,'beforeAll',$excepts);
18
+        return self::getInstance()->setOnRoutes($walking, 'beforeAll', $excepts);
19 19
     }
20 20
 
21 21
     public function after($walking)
22 22
     {
23
-        return $this->setOnRoute($walking,'after');
23
+        return $this->setOnRoute($walking, 'after');
24 24
     }
25 25
 
26 26
     public static function afterAll($walking, $except = null)
@@ -28,17 +28,17 @@  discard block
 block discarded – undo
28 28
         $excepts = is_array($except) ? $except : [$except];
29 29
         self::getInstance()->afterExcepts = $excepts;
30 30
         self::getInstance()->afterAll = $walking;
31
-        return self::getInstance()->setOnRoutes($walking,'afterAll',$excepts);
31
+        return self::getInstance()->setOnRoutes($walking, 'afterAll', $excepts);
32 32
     }
33 33
 
34 34
     private function setOnRoute($walking, string $state)
35 35
     {
36
-        if($this->lastReturn !== null){
36
+        if ($this->lastReturn !== null) {
37 37
             $currentGroup = end($this->routers)['group'];
38 38
 
39 39
             foreach ($this->routers as $key => $value) {
40 40
 
41
-                if($value['group'] === $currentGroup){
41
+                if ($value['group'] === $currentGroup) {
42 42
                     $this->routers[$key][$state] = $walking;
43 43
                 }
44 44
 
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 
53 53
     private function setOnRoutes($walking, string $state, array $excepts)
54 54
     {
55
-        foreach($this->routers as $r => $route){
56
-            if(!in_array($this->routers,$excepts)){
55
+        foreach ($this->routers as $r => $route) {
56
+            if (!in_array($this->routers, $excepts)) {
57 57
                 $this->routers[$r][$state] = $walking;
58 58
             }
59 59
         }
Please login to merge, or discard this patch.
src/DefinitionsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@
 block discarded – undo
2 2
 
3 3
 namespace HnrAzevedo\Router;
4 4
 
5
-trait DefinitionsTrait{
5
+trait DefinitionsTrait {
6 6
     private static Router $instance;
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;
Please login to merge, or discard this patch.
src/CheckTrait.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 
5 5
 use Exception;
6 6
 
7
-trait CheckTrait{
7
+trait CheckTrait {
8 8
     use MiddlewareTrait, CheckWhere;
9 9
 
10 10
     protected function checkProtocol(string $expected, string $current): bool
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 
15 15
     protected function checkName(string $routeName)
16 16
     {
17
-        if(!array_key_exists($routeName,$this->routers)){
17
+        if (!array_key_exists($routeName, $this->routers)) {
18 18
             throw new Exception('Page not found.', 404);
19 19
         }
20 20
         return $this;
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
     protected function checkTypeRole($role)
24 24
     {
25
-        if(!is_string($role) && @get_class($role) !== 'Closure' ){
25
+        if (!is_string($role) && @get_class($role) !== 'Closure') {
26 26
             throw new Exception("Improperly defined route track.");
27 27
         }
28 28
         return $this;
@@ -35,12 +35,12 @@  discard block
 block discarded – undo
35 35
 
36 36
     protected function checkParameters(array $routeLoop, array $routeRequest): bool
37 37
     {
38
-        foreach($routeLoop as $rr => $param){
39
-            if( (substr($param,0,1) === '{') ){
40
-                $_GET[ substr($param,1,strlen($param)-2) ] = $routeRequest[$rr];    
38
+        foreach ($routeLoop as $rr => $param) {
39
+            if ((substr($param, 0, 1) === '{')) {
40
+                $_GET[substr($param, 1, strlen($param)-2)] = $routeRequest[$rr];    
41 41
             }
42 42
     
43
-            if($this->checkParameter($param, $routeRequest[$rr])){
43
+            if ($this->checkParameter($param, $routeRequest[$rr])) {
44 44
                 return false;
45 45
             }
46 46
         }
@@ -50,12 +50,12 @@  discard block
 block discarded – undo
50 50
 
51 51
     protected function checkParameter(string $routeLoop, string $routeRequest): bool
52 52
     {
53
-        return !( substr($routeLoop,0,1) === '{' ) and $routeLoop !== $routeRequest;
53
+        return !(substr($routeLoop, 0, 1) === '{') and $routeLoop !== $routeRequest;
54 54
     }
55 55
 
56 56
     protected function checkRole()
57 57
     {
58
-        if(!array_key_exists('role', $_POST)){
58
+        if (!array_key_exists('role', $_POST)) {
59 59
             throw new Exception('O servidor não conseguiu identificar a finalidade deste formulário.');
60 60
         }
61 61
         return $this;
@@ -63,10 +63,10 @@  discard block
 block discarded – undo
63 63
 
64 64
     protected function hasProtocol(array $route, string $currentProtocol)
65 65
     {
66
-        $protocols = ( is_array($route['protocol']) ) ? $route['protocol'] : [ $route['protocol'] ];
66
+        $protocols = (is_array($route['protocol'])) ? $route['protocol'] : [$route['protocol']];
67 67
 
68
-        foreach($protocols as $protocol){
69
-            if(strtoupper($protocol) !== strtoupper($currentProtocol)){
68
+        foreach ($protocols as $protocol) {
69
+            if (strtoupper($protocol) !== strtoupper($currentProtocol)) {
70 70
                 continue;
71 71
             }
72 72
         }
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 
77 77
     protected function checkToHiking($route, $routeRequest, $routeLoop): bool
78 78
     {
79
-        if($this->checkNumparams($routeLoop, $routeRequest) || 
79
+        if ($this->checkNumparams($routeLoop, $routeRequest) || 
80 80
             !$this->checkParameters($routeLoop, $routeRequest) ||
81
-            !$this->checkWhere($route, $routeRequest)){
81
+            !$this->checkWhere($route, $routeRequest)) {
82 82
                 return false;
83 83
         }
84 84
         return true;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
     protected function hasRouteName(string $name)
88 88
     {
89
-        if(array_key_exists($name, $this->routers)){
89
+        if (array_key_exists($name, $this->routers)) {
90 90
             throw new Exception("There is already a route with the name {$name} configured.");
91 91
         }
92 92
         return $this;
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 
95 95
     protected function checkExistence(string $url, string $protocol)
96 96
     {
97
-        foreach($this->routers as $key => $value){
98
-    		if( md5($this->prefix . $value['url'] . $value['protocol'] ) === md5( $url . $protocol ) ){
97
+        foreach ($this->routers as $key => $value) {
98
+    		if (md5($this->prefix.$value['url'].$value['protocol']) === md5($url.$protocol)) {
99 99
                 throw new Exception("There is already a route with the url {$url} and with the {$protocol} protocol configured.");
100 100
             }
101 101
         }
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 
105 105
     protected function checkInGroup()
106 106
     {
107
-        if($this->lastReturn){
107
+        if ($this->lastReturn) {
108 108
             throw new Exception("At the moment it is not allowed to assign names or tests of parameters in groups..");
109 109
         }
110 110
         return $this;
Please login to merge, or discard this patch.
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::defineMiddlewares([
15 15
         'Auth2'=> \Example\Middleware\Auth2::class
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     /* Return current action route */
27 27
     $action = Router::currentRouteAction();
28 28
 
29
-}catch(Exception $er){
29
+}catch (Exception $er) {
30 30
 
31 31
     die("Code Error: {$er->getCode()}, Line: {$er->getLine()}, File: {$er->getFile()}, Message: {$er->getMessage()}.");
32 32
 
Please login to merge, or discard this patch.
examples/Middleware/Middleware.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@
 block discarded – undo
7 7
 use Psr\Http\Server\MiddlewareInterface;
8 8
 use Psr\Http\Server\RequestHandlerInterface;
9 9
 
10
-class Middleware implements MiddlewareInterface{
10
+class Middleware implements MiddlewareInterface {
11 11
     protected static array $data = [];
12 12
 
13 13
     public function __get($key)
14 14
     {
15
-        return (array_key_exists($key,self::$data)) ? self::$data[$key] : null;
15
+        return (array_key_exists($key, self::$data)) ? self::$data[$key] : null;
16 16
     }
17 17
 
18
-    public function __set($key,$value)
18
+    public function __set($key, $value)
19 19
     {
20 20
         self::$data[$key] = $value;
21 21
     }
Please login to merge, or discard this patch.