feat(state): review validation for required parameters

api-platform · Jun 29, 2024 · 264b4bf · 264b4bf
1 parent 89e284a
commit 264b4bf
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php b/src/Metadata/Resource/Factory/ParameterResourceMetadataCollectionFactory.php
@@ -156,10 +156,14 @@ private function addSchemaValidation(Parameter $parameter, ?array $schema = null
  {
  $assertions = [];
 
- if ($required) {
+ if ($required && false !== ($allowEmptyValue = $openApi?->getAllowEmptyValue())) {
  $assertions[] = new NotNull(message: sprintf('The parameter "%s" is required.', $parameter->getKey()));
  }
 
+ if (false === $allowEmptyValue) {
+ $assertions[] = new NotBlank(allowNull: !$required);
+ }
+
  if (isset($schema['exclusiveMinimum'])) {
  $assertions[] = new GreaterThan(value: $schema['exclusiveMinimum']);
  }
@@ -200,10 +204,6 @@ private function addSchemaValidation(Parameter $parameter, ?array $schema = null
  $assertions[] = new Choice(choices: $schema['enum']);
  }
 
- if (false === $openApi?->getAllowEmptyValue()) {
- $assertions[] = new NotBlank(allowNull: !$required);
- }
-
  if (!$assertions) {
  return $parameter;
  }