Merge pull request #5627 from kenjis/fix-router-filter

refactor: small changes in Filters and Router
codeigniter4 · Jan 29, 2022 · bafd425 · bafd425
2 parents 367b805 + 0c99664
commit bafd425
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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]));
  }
 
  /**

diff --git 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])) {