Fix tests

camel/Extraction/ExtractedEndpointData.php

@@ -150,7 +150,12 @@ class ExtractedEndpointData extends BaseDTO
                 $singularResource = Str::singular($pluralResource);
                 $singularResourceParam = str_replace('-', '_', $singularResource);
 
-                $search = ["{$pluralResource}/{{$singularResourceParam}}", "{$pluralResource}/{{$singularResource}?}"];
+                $search = [
+                    "{$pluralResource}/{{$singularResourceParam}}",
+                    "{$pluralResource}/{{$singularResource}}",
+                    "{$pluralResource}/{{$singularResourceParam}?}",
+                    "{$pluralResource}/{{$singularResource}?}"
+                ];
 
                 // We'll replace with {id} by default, but if the user is using a different key,
                 // like /users/{user:uuid}, use that instead
@@ -162,7 +167,12 @@ class ExtractedEndpointData extends BaseDTO
                     $foundResourceParam = true;
                 } else {
                     // Earlier ones should be {<param>_id}
-                    $replace = ["{$pluralResource}/{{$singularResource}_{$binding}}", "{$pluralResource}/{{$singularResourceParam}_{$binding}?}"];
+                    $replace = [
+                        "{$pluralResource}/{{$singularResource}_{$binding}}",
+                        "{$pluralResource}/{{$singularResourceParam}_{$binding}}",
+                        "{$pluralResource}/{{$singularResource}_{$binding}?}",
+                        "{$pluralResource}/{{$singularResourceParam}_{$binding}?}"
+                    ];
                 }
                 $uri = str_replace($search, $replace, $uri);
             }

tests/Unit/ExtractedEndpointDataTest.php

@@ -44,7 +44,7 @@ class ExtractedEndpointDataTest extends BaseLaravelTest
                 'uri' => $route->uri,
                 'httpMethods' => $route->methods,
             ]);
-            $this->assertEquals('things/{id}/otherthings/{otherthing_id}', $endpoint->uri);
+            $this->assertEquals('things/{thing_id}/otherthings/{id}', $endpoint->uri);
         }
     }