fix: Possible empty part of Route when path_param is not mandatory (#992)

* Fix the possible empty part of Route when path_param is not mandatory

* Add test for #915

Author: s-shiryaev

src/Extracting/Shared/UrlParamsNormalizer.php

@@ -62,7 +62,12 @@ public static function normalizeParameterNamesInRouteUri(Route $route, Reflectio
                 if (!$alreadyFoundResourceParam) {
                     // This is the first resource param (from the end).
                     // We set it to `params/{id}` (or whatever field it's bound to)
-                    $replaceWith = ["$pluralResource/{{$binding}}", "$pluralResource/{{$binding}?}"];
+                    $replaceWith = [
+                        "$pluralResource/{{$binding}}",
+                        "$pluralResource/{{$binding}}",
+                        "$pluralResource/{{$binding}?}",
+                        "$pluralResource/{{$binding}?}",
+                    ];
                     $alreadyFoundResourceParam = true;
                 } else {
                     // Other resource parameters will be `params/{<param>_id}`

tests/Strategies/UrlParameters/GetFromLaravelAPITest.php

@@ -141,6 +141,22 @@ public function can_infer_from_model_even_if_not_bound()
         $property->setValue($this->app, $oldNamespace);
     }
 
+    /** @test */
+    public function can_infer_correct_uri_from_route_with_optional_parameter_and_named_resource_routename()
+    {
+        $endpoint = $this->endpoint(function (ExtractedEndpointData $e) {
+            $e->method = new \ReflectionMethod(TestController::class, 'dummy');
+            $e->route = app(Router::class)
+                ->addRoute(['GET'], "/users/{user?}/show", ['uses' => [TestController::class, 'dummy']])
+                ->name('users.show')
+            ;
+            $e->uri = UrlParamsNormalizer::normalizeParameterNamesInRouteUri($e->route, $e->method);
+
+        });
+
+        $this->assertEquals('users/{id?}/show', $endpoint->uri);
+    }
+
     protected function endpointForRoute($path, $controller, $method): ExtractedEndpointData
     {
         return $this->endpoint(function (ExtractedEndpointData $e) use ($path, $method, $controller) {