feat(state): review validation for required parameters (#6441)

api-platform · Jun 30, 2024 · 9ac50d2 · 9ac50d2
1 parent c2d3aeb
commit 9ac50d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,6 @@
         "symfony/property-info": "^6.4 || ^7.0",
         "symfony/serializer": "^6.4 || ^7.0",
         "symfony/translation-contracts": "^3.3",
-        "symfony/type-info": "^7.1",
         "symfony/web-link": "^6.4 || ^7.0",
         "willdurand/negotiation": "^3.0"
     },

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 ?? $openApi?->getAllowEmptyValue())) {
+            $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;
         }

diff --git a/tests/Fixtures/app/AppKernel.php b/tests/Fixtures/app/AppKernel.php
@@ -20,8 +20,6 @@
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Bundle\MongoDBBundle\Command\TailCursorDoctrineODMCommand;
 use Doctrine\Bundle\MongoDBBundle\DoctrineMongoDBBundle;
-use Doctrine\Common\Inflector\Inflector;
-use Doctrine\Inflector\InflectorFactory;
 use FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;