Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/OpenApi/FieldCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use Symfony\Component\DependencyInjection\ServiceLocator;
use Symfony\Component\TypeInfo\Type;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\Count;
use Symfony\Component\Validator\Constraints\NotBlank;
use Symfony\Component\Validator\Constraints\NotNull;

Expand Down Expand Up @@ -249,6 +250,7 @@ private function isRequired(
$result = match (true) {
$constraint instanceof NotNull => true,
$constraint instanceof NotBlank => !$constraint->allowNull,
$constraint instanceof Count => null !== $constraint->min && $constraint->min >= 1,
default => null,
};

Expand Down
23 changes: 23 additions & 0 deletions tests/Feature/OpenApi/CollectionConstraintsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,27 @@ public function testCountAppliesToContainerAndAllUnwrapsToItems(): void
static::assertSame('integer', $virtual->items->type);
static::assertSame(0, $virtual->items->minimum);
}

public function testCountWithMinAtLeastOneMakesFieldRequired(): void
{
$collector = static::getService(FieldCollector::class);
$builder = static::getService(SchemaBuilder::class);

$described = $collector->collect(CollectionConstraintsDto::class, BagEnum::Request);
static::assertNotNull($described);

$params = $builder->buildParameters($described, '/whatever');
$byName = [];

foreach ($params as $p) {
$byName[(string)$p->name] = $p;
}

// Both array fields carry Count(min: 1, max: 500); both must be required.
static::assertArrayHasKey('directIds[]', $byName);
static::assertTrue($byName['directIds[]']->required, 'plain DTO array with Count(min>=1) must be required');

static::assertArrayHasKey('item_id[]', $byName);
static::assertTrue($byName['item_id[]']->required, 'virtual Field array with Count(min>=1) must be required');
}
}
Loading