This commit is contained in:
2020-09-08 11:53:09 +08:00
parent 76ed7406b4
commit 215d5517c6
5 changed files with 81 additions and 31 deletions
+1 -28
View File
@@ -52,22 +52,11 @@ class Middleware
$last = function ($passable) use ($node) {
return Dispatch::create($node->handler, $passable)->dispatch();
};
$data = $this->reduce($last, $this->annotation($node));
$data = Reduce::reduce($last, $this->annotation($node));
return $node->callback = $data;
}
/**
* @param $last
* @param $middleWares
* @return mixed|null
*/
private function reduce($last, $middleWares)
{
return array_reduce(array_reverse($middleWares), $this->core(), $last);
}
/**
* @param Node $node
* @return array
@@ -103,20 +92,4 @@ class Middleware
}
/**
* @return Closure
*/
public function core()
{
return function ($stack, $pipe) {
return function ($passable) use ($stack, $pipe) {
if ($pipe instanceof \HttpServer\IInterface\Middleware) {
return $pipe->handler($passable, $stack);
} else {
return $pipe($passable, $stack);
}
};
};
}
}
+30 -1
View File
@@ -84,6 +84,27 @@ class Node extends Application
}
/**
* @return bool
*/
public function hasAfter()
{
return count($this->_after) > 0;
}
/**
* @param $response
* @return mixed|null
*/
public function afterDispatch($response)
{
return Reduce::reduce(function () use ($response) {
return $response;
}, $this->_after);
}
/**
* @return array
*/
@@ -102,7 +123,6 @@ class Node extends Application
}
/**
* @return array
*/
@@ -391,6 +411,15 @@ class Node extends Application
}
/**
* @return mixed
*/
public function dispatch()
{
return call_user_func($this->callback, \request());
}
/**
* @param $array
* @param $_temp
+40
View File
@@ -0,0 +1,40 @@
<?php
namespace HttpServer\Route;
use Closure;
class Reduce
{
/**
* @param $last
* @param $middleWares
* @return mixed|null
*/
public static function reduce($last, $middleWares)
{
return array_reduce(array_reverse($middleWares), static::core(), $last);
}
/**
* @return Closure
*/
private static function core()
{
return function ($stack, $pipe) {
return function ($passable) use ($stack, $pipe) {
if ($pipe instanceof \HttpServer\IInterface\Middleware) {
return $pipe->handler($passable, $stack);
} else {
return $pipe($passable, $stack);
}
};
};
}
}
+1 -1
View File
@@ -420,7 +420,7 @@ class Router extends Application implements RouterInterface
if (empty($node->callback)) {
return JSON::to(404, 'Page not found.');
}
return call_user_func($node->callback, $request);
return $node;
}