Merge pull request #8167 from kenjis/fix-spark-routes-useSupportedLoc…

…alesOnly fix: `spark routes` outputs <unknown> only when {locale} with `useSupportedLocalesOnly(true)`
codeigniter4 · Nov 8, 2023 · 4057489 · 4057489
2 parents 99ef79b + fe5db18
commit 4057489
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/system/Commands/Utilities/Routes/SampleURIGenerator.php b/system/Commands/Utilities/Routes/SampleURIGenerator.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
+use Config\App;
 
 /**
  * Generate a sample URI path from route key regex.
@@ -51,6 +52,14 @@ public function get(string $routeKey): string
     {
         $sampleUri = $routeKey;
 
+        if (strpos($routeKey, '{locale}') !== false) {
+            $sampleUri = str_replace(
+                '{locale}',
+                config(App::class)->defaultLocale,
+                $routeKey
+            );
+        }
+
         foreach ($this->routes->getPlaceholders() as $placeholder => $regex) {
             $sample = $this->samples[$placeholder] ?? '::unknown::';
 

diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
@@ -40,6 +40,8 @@ public static function provideGet(): iterable
             'placeholder num'     => ['shop/product/([0-9]+)', 'shop/product/123'],
             'placeholder segment' => ['shop/product/([^/]+)', 'shop/product/abc_123'],
             'placeholder any'     => ['shop/product/(.*)', 'shop/product/123/abc'],
+            'locale'              => ['{locale}/home', 'en/home'],
+            'locale segment'      => ['{locale}/product/([^/]+)', 'en/product/abc_123'],
             'auto route'          => ['home/index[/...]', 'home/index/1/2/3/4/5'],
         ];
     }