Add regex pattern match against the requested url path (#1)

* Add regex pattern match against the requested url path

* Update title of yaml

Author: paulund

src/Middleware.php

@@ -46,7 +46,7 @@ public function handle(Request $request, Closure $next): mixed
         try {
             /** @var \Illuminate\Routing\Route $route */
             $route = $request->route();
-            [$specPath, $pathItem] = $this->pathItem($route, $request->method());
+            [$specPath, $pathItem] = $this->pathItem($route, $request->method(), $request->path());
         } catch (InvalidPathException|MalformedSpecException|MissingSpecException|TypeErrorException|UnresolvableReferenceException $exception) {
             $this->spectator->captureRequestValidation($exception);
             $this->spectator->captureResponseValidation($exception);
@@ -117,7 +117,7 @@ protected function validate(Request $request, Closure $next, string $specPath, P
      * @throws IOException
      * @throws InvalidJsonPointerSyntaxException
      */
-    protected function pathItem(Route $route, string $requestMethod): array
+    protected function pathItem(Route $route, string $requestMethod, string $requestUrlPath): array
     {
         $requestPath = Str::start($route->uri(), '/');
 
@@ -142,7 +142,14 @@ protected function pathItem(Route $route, string $requestMethod): array
 
             if (Str::match($route->getCompiled()->getRegex(), $resolvedPath) !== '') {
                 $pathMatches = true;
-                if (in_array(strtolower($requestMethod), $methods, true)) {
+                $requestUrlPath = '/'.ltrim($requestUrlPath, '/');
+                $regExPattern = preg_replace('/\{[^}]+\}/', '.+', $resolvedPath);
+                $regExPattern = str_replace('/', '\/', $regExPattern);
+
+                $matchedMethod = in_array(strtolower($requestMethod), $methods, true);
+                $matchRequestUrl = preg_match('/^'.$regExPattern.'$/', $requestUrlPath) !== 0;
+
+                if ($matchedMethod && $matchRequestUrl) {
                     $partialMatch = [$resolvedPath, $pathItem];
                 }
             }

tests/Fixtures/Test.v3.yaml

@@ -0,0 +1,63 @@
+openapi: 3.0.0
+info:
+  title: Test.v3
+  version: '1.0'
+servers:
+  - url: 'http://localhost:3000'
+paths:
+  /cars/electric:
+    patch:
+      summary: Update car charging status
+      tags: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - charging
+              properties:
+                charging:
+                  type: boolean
+                  description: Update charging status
+                  example: true
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  name:
+                    type: string
+
+  /cars/ice:
+    patch:
+      summary: Update car refilling status
+      tags: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - refill
+              properties:
+                refill:
+                  type: boolean
+                  description: Update refill status
+                  example: true
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  name:
+                    type: string
+      
+components:
+  schemas: {}

tests/RequestValidatorTest.php

@@ -903,6 +903,23 @@ public function test_parameter_decoupling(): void
         $this->getJson('/users/1')
             ->assertValidRequest();
     }
+
+    public function test_static_url_parameter_decoupling(): void
+    {
+        Spectator::using('Test.v3.yaml');
+
+        Route::patch('/cars/{name}', function ($name) {
+            return [
+                'name' => $name,
+            ];
+        })->middleware([SubstituteBindings::class, Middleware::class]);
+
+        $this->patchJson('/cars/electric', ['charging' => true])
+            ->assertValidRequest();
+
+        $this->patchJson('/cars/ice', ['refill' => true])
+            ->assertValidRequest();
+    }
 }
 
 class TestUser extends Model