check if overwritten builtin sample still matches its regex

Author: paulbalandan

system/Commands/Utilities/Routes/SampleURIGenerator.php

@@ -97,8 +97,8 @@ private function resolveSample(string $placeholder, string $regex): string
             return $this->resolvedCache[$placeholder];
         }
 
-        $sample = $this->configuredSample($placeholder, $regex)
-            ?? $this->samples[$placeholder]
+        $sample = $this->matchingSample($this->config->placeholderSamples[$placeholder] ?? null, $regex)
+            ?? $this->matchingSample($this->samples[$placeholder] ?? null, $regex)
             ?? $this->sampleGenerator->generate($regex)
             ?? self::UNKNOWN_SAMPLE;
 
@@ -108,14 +108,14 @@ private function resolveSample(string $placeholder, string $regex): string
     }
 
     /**
-     * Returns the configured sample for the placeholder when one is set and it
-     * matches the placeholder regex, otherwise ``null`` so resolution falls
-     * through to the built-in, auto-generated, or unknown sample.
+     * Returns the given sample when it is set and matches the placeholder
+     * regex, otherwise ``null`` so resolution falls through to the next source.
+     * Guards both the configured and built-in samples, since a built-in
+     * placeholder name may be redefined with a different regex via
+     * ``RouteCollection::addPlaceholder()``.
      */
-    private function configuredSample(string $placeholder, string $regex): ?string
+    private function matchingSample(?string $sample, string $regex): ?string
     {
-        $sample = $this->config->placeholderSamples[$placeholder] ?? null;
-
         if ($sample === null) {
             return null;
         }

tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php

@@ -190,4 +190,18 @@ public function testEmptyConfiguredSampleIsIgnored(): void
 
         $this->assertSame('test/AAA0', $uri);
     }
+
+    public function testOverriddenBuiltInPlaceholderIgnoresStaleSample(): void
+    {
+        $routes = service('routes');
+        // Redefining a built-in name with a new regex must not reuse the stale
+        // built-in sample (123), which no longer matches.
+        $routes->addPlaceholder('num', '[A-Z]+');
+
+        $generator = new SampleURIGenerator();
+
+        $uri = $generator->get('shop/product/([A-Z]+)');
+
+        $this->assertSame('shop/product/A', $uri);
+    }
 }