Merge pull request #5780 from kenjis/fix-app-config-routes-loaded-twice

fix: app/Config/Routes.php is loaded twice on Windows
codeigniter4 · Mar 7, 2022 · 78d8487 · 78d8487
2 parents f969513 + 3e52f41
commit 78d8487
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
@@ -357,9 +357,14 @@ protected function discoverRoutes()
  if ($this->moduleConfig->shouldDiscover('routes')) {
  $files = $this->fileLocator->search('Config/Routes.php');
 
+ $excludes = [
+ APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php',
+ SYSTEMPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php',
+ ];
+
  foreach ($files as $file) {
  // Don't include our main file again...
- if ($file === APPPATH . 'Config/Routes.php') {
+ if (in_array($file, $excludes, true)) {
  continue;
  }