From 6a72819471faba19c4af24fa02b6b295ca1196d7 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 28 Jan 2022 16:20:04 +0900 Subject: [PATCH 1/2] refactor: initialize $this->filtersInfo --- system/Router/Router.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/Router/Router.php b/system/Router/Router.php index 198d6ece5350..fad7d45ee5f6 100644 --- a/system/Router/Router.php +++ b/system/Router/Router.php @@ -149,7 +149,8 @@ public function handle(?string $uri = null) $uri = urldecode($uri); // Restart filterInfo - $this->filterInfo = null; + $this->filterInfo = null; + $this->filtersInfo = []; if ($this->checkRoutes($uri)) { if ($this->collection->isFiltered($this->matchedRoute[0])) { From 0c9966406cd4de506e14e03f6ae9e7ef8619dbf5 Mon Sep 17 00:00:00 2001 From: kenjis Date: Fri, 28 Jan 2022 16:20:50 +0900 Subject: [PATCH 2/2] refactor: renumber the array keys --- system/Filters/Filters.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php index 622d9153f016..786ff0862b12 100644 --- a/system/Filters/Filters.php +++ b/system/Filters/Filters.php @@ -503,7 +503,7 @@ protected function processAliasesToClass(string $position) // when using enableFilter() we already write the class name in ->filtersClass as well as the // alias in ->filters. This leads to duplicates when using route filters. // Since some filters like rate limiters rely on being executed once a request we filter em here. - $this->filtersClass[$position] = array_unique($this->filtersClass[$position]); + $this->filtersClass[$position] = array_values(array_unique($this->filtersClass[$position])); } /**