From 35f83640d66e09c87bd6c57031fff03c00cf2fdd Mon Sep 17 00:00:00 2001 From: goyt Date: Mon, 3 Jul 2017 23:39:42 +0200 Subject: [PATCH 1/3] Required for PathVarriables is no longer overwritten, if already set. Type is no longer overwritten if already set --- RouteDescriber/RouteMetadataDescriber.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RouteDescriber/RouteMetadataDescriber.php b/RouteDescriber/RouteMetadataDescriber.php index 511c20d..ce34d91 100644 --- a/RouteDescriber/RouteMetadataDescriber.php +++ b/RouteDescriber/RouteMetadataDescriber.php @@ -33,8 +33,12 @@ final class RouteMetadataDescriber implements RouteDescriberInterface } $parameter = $operation->getParameters()->get($pathVariable, 'path'); - $parameter->setRequired(true); - $parameter->setType('string'); + if (null === $parameter->getRequired()) { + $parameter->setRequired(true); + } + if(null === $parameter->getType()) { + $parameter->setType('string'); + } if (isset($requirements[$pathVariable])) { $parameter->setFormat($requirements[$pathVariable]); From fce21e78b060e8798fd12b02f4d22ce6e87d6a91 Mon Sep 17 00:00:00 2001 From: goyt Date: Mon, 3 Jul 2017 23:46:15 +0200 Subject: [PATCH 2/3] small typo-a --- RouteDescriber/RouteMetadataDescriber.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RouteDescriber/RouteMetadataDescriber.php b/RouteDescriber/RouteMetadataDescriber.php index ce34d91..18d3939 100644 --- a/RouteDescriber/RouteMetadataDescriber.php +++ b/RouteDescriber/RouteMetadataDescriber.php @@ -36,7 +36,7 @@ final class RouteMetadataDescriber implements RouteDescriberInterface if (null === $parameter->getRequired()) { $parameter->setRequired(true); } - if(null === $parameter->getType()) { + if (null === $parameter->getType()) { $parameter->setType('string'); } From 69169b04573b4da93a44c8254e2d0cd76e33ba1c Mon Sep 17 00:00:00 2001 From: goyt Date: Wed, 5 Jul 2017 23:41:25 +0200 Subject: [PATCH 3/3] since a path variable must be required, change back --- RouteDescriber/RouteMetadataDescriber.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/RouteDescriber/RouteMetadataDescriber.php b/RouteDescriber/RouteMetadataDescriber.php index 18d3939..68fe1e6 100644 --- a/RouteDescriber/RouteMetadataDescriber.php +++ b/RouteDescriber/RouteMetadataDescriber.php @@ -33,9 +33,8 @@ final class RouteMetadataDescriber implements RouteDescriberInterface } $parameter = $operation->getParameters()->get($pathVariable, 'path'); - if (null === $parameter->getRequired()) { - $parameter->setRequired(true); - } + $parameter->setRequired(true); + if (null === $parameter->getType()) { $parameter->setType('string'); }