temp fixed duplicate user middleware problem, need attentions this commit does not fix the source of the problem

huangzhhui · huangzhhui · commit a2b779c5ac96 · 2018-02-26T02:29:04.000+08:00
diff --git a/src/Bean/Collector/MiddlewareCollector.php b/src/Bean/Collector/MiddlewareCollector.php
@@ -69,10 +69,10 @@ private static function collectMiddlewares(
 
         if (! empty($methodName)) {
             $scanMiddlewares = self::$middlewares[$className]['middlewares']['actions'][$methodName] ?? [];
-            self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_merge($classMiddlewares,$scanMiddlewares);
+            self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_unique(array_merge($classMiddlewares,$scanMiddlewares));
         } else {
             $scanMiddlewares = self::$middlewares[$className]['middlewares']['group'] ?? [];
-            self::$middlewares[$className]['middlewares']['group'] = array_merge($classMiddlewares, $scanMiddlewares);
+            self::$middlewares[$className]['middlewares']['group'] = array_unique(array_merge($classMiddlewares, $scanMiddlewares));
         }
     }
 
@@ -91,10 +91,10 @@ private static function collectMiddleware(string $className, string $methodName,
 
         if (! empty($methodName)) {
             $scanMiddlewares = self::$middlewares[$className]['middlewares']['actions'][$methodName] ?? [];
-            self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_merge($middlewares, $scanMiddlewares);
+            self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_unique(array_merge($middlewares, $scanMiddlewares));
         } else {
             $scanMiddlewares = self::$middlewares[$className]['middlewares']['group'] ?? [];
-            self::$middlewares[$className]['middlewares']['group'] = array_merge($middlewares, $scanMiddlewares);
+            self::$middlewares[$className]['middlewares']['group'] = array_unique(array_merge($middlewares, $scanMiddlewares));
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ private static function collectMiddlewares(`
`69`	`69`
`70`	`70`	`if (! empty($methodName)) {`
`71`	`71`	`$scanMiddlewares = self::$middlewares[$className]['middlewares']['actions'][$methodName] ?? [];`
`72`		`- self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_merge($classMiddlewares,$scanMiddlewares);`
	`72`	`+ self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_unique(array_merge($classMiddlewares,$scanMiddlewares));`
`73`	`73`	`} else {`
`74`	`74`	`$scanMiddlewares = self::$middlewares[$className]['middlewares']['group'] ?? [];`
`75`		`- self::$middlewares[$className]['middlewares']['group'] = array_merge($classMiddlewares, $scanMiddlewares);`
	`75`	`+ self::$middlewares[$className]['middlewares']['group'] = array_unique(array_merge($classMiddlewares, $scanMiddlewares));`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
`@@ -91,10 +91,10 @@ private static function collectMiddleware(string $className, string $methodName,`
`91`	`91`
`92`	`92`	`if (! empty($methodName)) {`
`93`	`93`	`$scanMiddlewares = self::$middlewares[$className]['middlewares']['actions'][$methodName] ?? [];`
`94`		`- self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_merge($middlewares, $scanMiddlewares);`
	`94`	`+ self::$middlewares[$className]['middlewares']['actions'][$methodName] = array_unique(array_merge($middlewares, $scanMiddlewares));`
`95`	`95`	`} else {`
`96`	`96`	`$scanMiddlewares = self::$middlewares[$className]['middlewares']['group'] ?? [];`
`97`		`- self::$middlewares[$className]['middlewares']['group'] = array_merge($middlewares, $scanMiddlewares);`
	`97`	`+ self::$middlewares[$className]['middlewares']['group'] = array_unique(array_merge($middlewares, $scanMiddlewares));`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`