111

2021-09-26 00:26:58 +08:00
parent 477de51126
commit b8b3221d51
3 changed files with 17 additions and 19 deletions
@@ -38,28 +38,33 @@ class MiddlewareManager extends BaseObject
 		if (is_string($middlewares)) {
 			$middlewares = [$middlewares];
 		}
-		$source = static::$_middlewares[$class][$method];
+		$source = &static::$_middlewares[$class][$method];
 		foreach ($middlewares as $middleware) {
-			if (isset($source[$middleware])) {
+            $middleware = di($middleware);
+			if (!in_array($middleware, $source)) {
 				continue;
 			}
-			$source[$middleware] = di($middleware);
+			$source[] = $middleware;
 		}
 		return true;
 	}


+    /**
+     * @param $class
+     * @param $method
+     * @return array
+     */
 	private static function setDefault($class, $method): array
 	{
 		if (is_object($class)) {
 			$class = $class::class;
 		}
-
 		if (!isset(static::$_middlewares[$class])) {
 			static::$_middlewares[$class] = [];
 		}
 		if (!isset(static::$_middlewares[$class][$method])) {
-			static::$_middlewares[$class][$method] = new Iterator();
+			static::$_middlewares[$class][$method] = [];
 		}
 		return [$class, $method];
 	}
@@ -69,12 +74,12 @@ class MiddlewareManager extends BaseObject
 	 * @param $handler
 	 * @return Iterator|null
 	 */
-	public static function get($handler): ?Iterator
+	public static function get($handler): ?array
 	{
 		if (!($handler instanceof Closure)) {
 			return static::$_middlewares[$handler[0]][$handler[1]] ?? null;
 		}
-		return di(Iterator::class);
+		return null;
 	}