|
@@ -32,7 +32,7 @@ discard block |
|
|
block discarded – undo |
|
32
|
32
|
if (isset($this->router->collection->middleware['global_middleware'])) |
|
33
|
33
|
foreach ($this->router->collection->middleware['global_middleware'] as $mid) { |
|
34
|
34
|
if (class_exists($mid)) { |
|
35
|
|
- $mid_global = call_user_func($this->router->getConfig()['di'],$mid); |
|
|
35
|
+ $mid_global = call_user_func($this->router->getConfig()['di'], $mid); |
|
36
|
36
|
if (method_exists($mid_global, 'handle')) $this->callHandler($mid_global); |
|
37
|
37
|
} |
|
38
|
38
|
} |
|
@@ -46,7 +46,7 @@ discard block |
|
|
block discarded – undo |
|
46
|
46
|
if (isset($this->router->collection->middleware['block_middleware'])) |
|
47
|
47
|
if (isset($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]) && class_exists($this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()])) { |
|
48
|
48
|
$class = $this->router->collection->middleware['block_middleware'][$this->router->route->getBlock()]; |
|
49
|
|
- $mid_block = call_user_func($this->router->getConfig()['di'],$class); |
|
|
49
|
+ $mid_block = call_user_func($this->router->getConfig()['di'], $class); |
|
50
|
50
|
if (method_exists($mid_block, 'handle')) $this->callHandler($mid_block); |
|
51
|
51
|
} |
|
52
|
52
|
} |
|
@@ -60,7 +60,7 @@ discard block |
|
|
block discarded – undo |
|
60
|
60
|
$ctrl = str_replace('\\', '/', $this->router->route->getTarget('controller')); |
|
61
|
61
|
if (isset($this->router->collection->middleware['class_middleware'][$ctrl]) && class_exists($this->router->route->getTarget('controller'))) { |
|
62
|
62
|
$class = $this->router->collection->middleware['class_middleware'][$ctrl]; |
|
63
|
|
- $mid_class = call_user_func($this->router->getConfig()['di'],$class); |
|
|
63
|
+ $mid_class = call_user_func($this->router->getConfig()['di'], $class); |
|
64
|
64
|
if (method_exists($mid_class, 'handle')) $this->callHandler($mid_class); |
|
65
|
65
|
} |
|
66
|
66
|
} |
|
@@ -74,7 +74,7 @@ discard block |
|
|
block discarded – undo |
|
74
|
74
|
if (isset($this->router->collection->middleware['route_middleware'])) |
|
75
|
75
|
if (isset($this->router->route->getPath()['middleware']) && class_exists($this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']])) { |
|
76
|
76
|
$class = $this->router->collection->middleware['route_middleware'][$this->router->route->getPath()['middleware']]; |
|
77
|
|
- $mid_route = call_user_func($this->router->getConfig()['di'],$class); |
|
|
77
|
+ $mid_route = call_user_func($this->router->getConfig()['di'], $class); |
|
78
|
78
|
if (method_exists($mid_route, 'handle')) $this->callHandler($mid_route); |
|
79
|
79
|
} |
|
80
|
80
|
} |
|
@@ -83,13 +83,13 @@ discard block |
|
|
block discarded – undo |
|
83
|
83
|
* @param $instance |
|
84
|
84
|
* @return mixed |
|
85
|
85
|
*/ |
|
86
|
|
- private function callHandler($instance){ |
|
|
86
|
+ private function callHandler($instance) { |
|
87
|
87
|
$reflectionMethod = new ReflectionMethod($instance, 'handle'); |
|
88
|
88
|
$dependencies = [$this->router->route]; |
|
89
|
89
|
foreach ($reflectionMethod->getParameters() as $arg) { |
|
90
|
90
|
if (!is_null($arg->getClass())) { |
|
91
|
91
|
$class = $arg->getClass()->name; |
|
92
|
|
- array_unshift($dependencies,call_user_func_array($this->router->getConfig()['di'],[$class])); |
|
|
92
|
+ array_unshift($dependencies, call_user_func_array($this->router->getConfig()['di'], [$class])); |
|
93
|
93
|
} |
|
94
|
94
|
} |
|
95
|
95
|
return $reflectionMethod->invokeArgs($instance, $dependencies); |