RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-15 14:03:15 +03:00
Code Issues Projects Releases Wiki Activity

Add support for allowNull for Assert\NotBlank

Browse Source
This commit is contained in:
Alex Kalineskou 2020-08-31 23:22:42 +03:00 committed by Guilhem Niot
parent c1903db109
commit 0da1909cb9
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php
View File

@ -48,6 +48,11 @@ class SymfonyConstraintAnnotationReader
foreach ($annotations as $annotation) { foreach ($annotations as $annotation) {
if ($annotation instanceof Assert\NotBlank || $annotation instanceof Assert\NotNull) { if ($annotation instanceof Assert\NotBlank || $annotation instanceof Assert\NotNull) {
if ($annotation instanceof Assert\NotBlank && $annotation->allowNull) {
// The field is optional
continue;
}
// The field is required // The field is required
if (null === $this->schema) { if (null === $this->schema) {
continue; continue;

28
Tests/ModelDescriber/Annotations/SymfonyConstraintAnnotationReaderTest.php
View File

@ -47,6 +47,34 @@ class SymfonyConstraintAnnotationReaderTest extends TestCase
$this->assertEquals($schema->getRequired(), ['property1', 'property2']); $this->assertEquals($schema->getRequired(), ['property1', 'property2']);
} }
public function testOptionalProperty()
{
$entity = new class() {
/**
* @Assert\NotBlank(allowNull = true)
* @Assert\Length(min = 1)
*/
private $property1;
/**
* @Assert\NotBlank()
*/
private $property2;
};
$schema = new OA\Schema([]);
$schema->merge([new OA\Property(['property' => 'property1'])]);
$schema->merge([new OA\Property(['property' => 'property2'])]);
$symfonyConstraintAnnotationReader = new SymfonyConstraintAnnotationReader(new AnnotationReader());
$symfonyConstraintAnnotationReader->setSchema($schema);
$symfonyConstraintAnnotationReader->updateProperty(new \ReflectionProperty($entity, 'property1'), $schema->properties[0]);
$symfonyConstraintAnnotationReader->updateProperty(new \ReflectionProperty($entity, 'property2'), $schema->properties[1]);
// expect required to be numeric array with sequential keys (not [0 => ..., 2 => ...])
$this->assertEquals($schema->required, ['property2']);
}
public function testAssertChoiceResultsInNumericArray() public function testAssertChoiceResultsInNumericArray()
{ {
define('TEST_ASSERT_CHOICE_STATUSES', [ define('TEST_ASSERT_CHOICE_STATUSES', [