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

Merge pull request #1602 from katin-dev/master

Browse Source 
Fix generating example for Assert\Choice when choices are object not array
This commit is contained in:
Guilhem Niot 2020-03-31 12:05:08 +02:00 committed by GitHub
commit ab014fe032
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php
View File

@ -67,7 +67,8 @@ class SymfonyConstraintAnnotationReader
$property->setMinItems($annotation->min); $property->setMinItems($annotation->min);
$property->setMaxItems($annotation->max); $property->setMaxItems($annotation->max);
} elseif ($annotation instanceof Assert\Choice) { } elseif ($annotation instanceof Assert\Choice) {
$property->setEnum($annotation->callback ? call_user_func(is_array($annotation->callback) ? $annotation->callback : [$reflectionProperty->class, $annotation->callback]) : $annotation->choices); $values = $annotation->callback ? call_user_func(is_array($annotation->callback) ? $annotation->callback : [$reflectionProperty->class, $annotation->callback]) : $annotation->choices;
$property->setEnum(array_values($values));
} elseif ($annotation instanceof Assert\Expression) { } elseif ($annotation instanceof Assert\Expression) {
$this->appendPattern($property, $annotation->message); $this->appendPattern($property, $annotation->message);
} elseif ($annotation instanceof Assert\Range) { } elseif ($annotation instanceof Assert\Range) {

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

@ -46,4 +46,31 @@ class SymfonyConstraintAnnotationReaderTest extends TestCase
// expect required to be numeric array with sequential keys (not [0 => ..., 2 => ...]) // expect required to be numeric array with sequential keys (not [0 => ..., 2 => ...])
$this->assertEquals($schema->getRequired(), ['property1', 'property2']); $this->assertEquals($schema->getRequired(), ['property1', 'property2']);
} }
public function testAssertChoiceResultsInNumericArray()
{
define('TEST_ASSERT_CHOICE_STATUSES', [
1 => 'active',
2 => 'blocked',
]);
$entity = new class() {
/**
* @Assert\Length(min = 1)
* @Assert\Choice(choices=TEST_ASSERT_CHOICE_STATUSES)
*/
private $property1;
};
$schema = new Schema();
$schema->getProperties()->set('property1', new Schema());
$symfonyConstraintAnnotationReader = new SymfonyConstraintAnnotationReader(new AnnotationReader());
$symfonyConstraintAnnotationReader->setSchema($schema);
$symfonyConstraintAnnotationReader->updateProperty(new \ReflectionProperty($entity, 'property1'), $schema->getProperties()->get('property1'));
// expect enum to be numeric array with sequential keys (not [1 => "active", 2 => "active"])
$this->assertEquals($schema->getProperties()->get('property1')->getEnum(), ['active', 'blocked']);
}
} }