From 13c4e7eca4ccbaef6a50d4341506abd64e110ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 24 Sep 2021 17:59:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http-handler/Abstracts/MiddlewareManager.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/http-handler/Abstracts/MiddlewareManager.php b/http-handler/Abstracts/MiddlewareManager.php index d5849a71..6601ef8a 100644 --- a/http-handler/Abstracts/MiddlewareManager.php +++ b/http-handler/Abstracts/MiddlewareManager.php @@ -35,17 +35,14 @@ class MiddlewareManager extends BaseObject if (!isset(static::$_middlewares[$class][$method])) { static::$_middlewares[$class][$method] = []; } - - $source = &static::$_middlewares[$class][$method]; - if (is_string($middlewares) && !in_array($middlewares, $source)) { - $source[$middlewares] = di($middlewares); - } else { - foreach ($middlewares as $middleware) { - if (isset($source[$middleware])) { - continue; - } - $source[$middleware] = di($middleware); + if (is_string($middlewares)) { + $middlewares = [$middlewares]; + } + foreach ($middlewares as $middleware) { + if (isset(static::$_middlewares[$class][$method][$middleware])) { + continue; } + static::$_middlewares[$class][$method][$middleware] = di($middleware); } return true; } @@ -60,7 +57,7 @@ class MiddlewareManager extends BaseObject if ($handler instanceof Closure || !isset(static::$_middlewares[$handler[0]])) { return null; } - return static::$_middlewares[$handler[0]][$handler[1]] ?? null; + return static::$_middlewares[$handler[0]][$handler[1]] ?? null; }