Merge branch 'master' into 3.1

limingxinleo · limingxinleo · commit 5a6672528b88 · 2023-10-05T16:56:32.000+08:00
# Conflicts:
#	.github/workflows/test.yml
diff --git a/src/Client.php b/src/Client.php
@@ -210,6 +210,8 @@ protected function execute(ServerRequestInterface $psr7Request): ResponseInterfa
             $middlewares = array_merge($middlewares, $registeredMiddlewares);
         }
 
+        $middlewares = MiddlewareManager::sortMiddlewares($middlewares);
+
         try {
             $psr7Response = $this->dispatcher->dispatch($psr7Request, $middlewares, $this->coreMiddleware);
         } catch (Throwable $throwable) {

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,8 @@ protected function execute(ServerRequestInterface $psr7Request): ResponseInterfa`
`210`	`210`	`$middlewares = array_merge($middlewares, $registeredMiddlewares);`
`211`	`211`	`}`
`212`	`212`
	`213`	`+ $middlewares = MiddlewareManager::sortMiddlewares($middlewares);`
	`214`	`+`
`213`	`215`	`try {`
`214`	`216`	`$psr7Response = $this->dispatcher->dispatch($psr7Request, $middlewares, $this->coreMiddleware);`
`215`	`217`	`} catch (Throwable $throwable) {`