@@ -29,9 +29,10 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function globalMiddleware() |
31 | 31 | { |
32 | - if (isset($this->router->collection->middleware['global_middleware'])) |
|
33 | - foreach ($this->router->collection->middleware['global_middleware'] as $class) |
|
34 | - if (class_exists($class)) return $this->callHandler($class); |
|
32 | + if (isset($this->router->collection->middleware['global_middleware'])) { |
|
33 | + foreach ($this->router->collection->middleware['global_middleware'] as $class) |
|
34 | + if (class_exists($class)) return $this->callHandler($class); |
|
35 | + } |
|
35 | 36 | return null; |
36 | 37 | } |
37 | 38 | |
@@ -40,16 +41,18 @@ discard block |
||
40 | 41 | */ |
41 | 42 | public function blockMiddleware() |
42 | 43 | { |
43 | - if (isset($this->router->collection->middleware['block_middleware'])) |
|
44 | - if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) { |
|
45 | - $blocks = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]; |
|
44 | + if (isset($this->router->collection->middleware['block_middleware'])) { |
|
45 | + if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')])) { |
|
46 | + $blocks = $this->router->collection->middleware['block_middleware'][$this->router->route->getTarget('block')]; |
|
47 | + } |
|
46 | 48 | if (is_array($blocks)) { |
47 | - foreach ($blocks as $block) |
|
48 | - if (class_exists($block)) |
|
49 | - if($this->callHandler($block) == false) return false; |
|
50 | - } |
|
51 | - elseif (is_string($blocks) && class_exists($blocks)) |
|
52 | - return $this->callHandler($blocks); |
|
49 | + foreach ($blocks as $block) { |
|
50 | + if (class_exists($block)) |
|
51 | + if($this->callHandler($block) == false) return false; |
|
52 | + } |
|
53 | + } elseif (is_string($blocks) && class_exists($blocks)) { |
|
54 | + return $this->callHandler($blocks); |
|
55 | + } |
|
53 | 56 | } |
54 | 57 | return null; |
55 | 58 | } |
@@ -64,10 +67,12 @@ discard block |
||
64 | 67 | if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) { |
65 | 68 | $classes = $this->router->collection->middleware['class_middleware'][$ctrl]; |
66 | 69 | if(is_array($classes)){ |
67 | - foreach ($classes as $class) |
|
68 | - if($this->callHandler($class) == false)return false; |
|
69 | - }elseif(is_string($classes)) |
|
70 | - return $this->callHandler($classes); |
|
70 | + foreach ($classes as $class) { |
|
71 | + if($this->callHandler($class) == false)return false; |
|
72 | + } |
|
73 | + } elseif(is_string($classes)) { |
|
74 | + return $this->callHandler($classes); |
|
75 | + } |
|
71 | 76 | } |
72 | 77 | } |
73 | 78 | return null; |
@@ -78,14 +83,17 @@ discard block |
||
78 | 83 | */ |
79 | 84 | public function routeMiddleware() |
80 | 85 | { |
81 | - if (isset($this->router->collection->middleware['route_middleware'])) |
|
82 | - if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) { |
|
83 | - $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']]; |
|
86 | + if (isset($this->router->collection->middleware['route_middleware'])) { |
|
87 | + if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) { |
|
88 | + $classes = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']]; |
|
89 | + } |
|
84 | 90 | if(is_array($classes)){ |
85 | - foreach ($classes as $class) |
|
86 | - if($this->callHandler($class) == false)return false; |
|
87 | - }elseif(is_string($classes)) |
|
88 | - return $this->callHandler($classes); |
|
91 | + foreach ($classes as $class) { |
|
92 | + if($this->callHandler($class) == false)return false; |
|
93 | + } |
|
94 | + } elseif(is_string($classes)) { |
|
95 | + return $this->callHandler($classes); |
|
96 | + } |
|
89 | 97 | } |
90 | 98 | return null; |
91 | 99 | } |
@@ -99,9 +107,10 @@ discard block |
||
99 | 107 | if (method_exists($instance, 'handle')) { |
100 | 108 | $reflectionMethod = new ReflectionMethod($instance, 'handle'); |
101 | 109 | $dependencies = []; |
102 | - foreach ($reflectionMethod->getParameters() as $arg) |
|
103 | - if (!is_null($arg->getClass())) |
|
104 | - $dependencies[] = $this->getClass($arg->getClass()->name); |
|
110 | + foreach ($reflectionMethod->getParameters() as $arg) { |
|
111 | + if (!is_null($arg->getClass())) |
|
112 | + $dependencies[] = $this->getClass($arg->getClass()->name); |
|
113 | + } |
|
105 | 114 | $dependencies = array_merge($dependencies, [$this->router->route]); |
106 | 115 | return $reflectionMethod->invokeArgs($instance, $dependencies); |
107 | 116 | } |