Skip to content

Commit db9ca39

Browse files
committed
Bug fixed.
1 parent 7dc0ea5 commit db9ca39

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/Router/RouterCommand.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public function runRoute($command, $params = [])
192192
}
193193

194194
if (property_exists($controller, 'middlewareBefore') && is_array($controller->middlewareBefore)) {
195-
foreach ($controller->middleware as $middleware) {
195+
foreach ($controller->middlewareBefore as $middleware) {
196196
$this->beforeAfter($middleware);
197197
}
198198
}
@@ -264,11 +264,12 @@ protected function resolveCallbackParameters(Reflector $reflection, array $uriPa
264264
{
265265
$parameters = [];
266266
foreach ($reflection->getParameters() as $key => $param) {
267-
if (!is_null($param->getClass()) && $param->getClass()->getName() instanceof Request) {
267+
$class = $param->getClass();
268+
if (!is_null($class) && $class->isInstance($this->request)) {
268269
$parameters[] = $this->request;
269-
} elseif (!is_null($param->getClass()) && $param->getClass()->getName() instanceof Response) {
270+
} elseif (!is_null($class) && $class->isInstance($this->response)) {
270271
$parameters[] = $this->response;
271-
} elseif (!is_null($param->getClass())) {
272+
} elseif (!is_null($class)) {
272273
$parameters[] = null;
273274
} else {
274275
if (empty($uriParams)) {

0 commit comments

Comments
 (0)