From af833a3c4c67311a6c6b65107c2a5152eb7a3aca Mon Sep 17 00:00:00 2001 From: Mykhailo Sulyma Date: Wed, 19 Oct 2022 12:03:44 +0300 Subject: [PATCH] Fix type error in SymfonyConstraintAnnotationReader --- .../Annotations/SymfonyConstraintAnnotationReader.php | 2 +- .../Entity/SymfonyConstraintsWithValidationGroups.php | 9 +++++++++ Tests/Functional/ValidationGroupsFunctionalTest.php | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php b/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php index 171a31a..3fc52a2 100644 --- a/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php +++ b/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php @@ -225,7 +225,7 @@ class SymfonyConstraintAnnotationReader { return count(array_intersect( $validationGroups ?: [Constraint::DEFAULT_GROUP], - $annotation->groups + (array) $annotation->groups )) > 0; } } diff --git a/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php b/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php index 65c2896..8a986dd 100644 --- a/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php +++ b/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php @@ -11,6 +11,7 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Entity; +use OpenApi\Annotations as OA; use Symfony\Component\Serializer\Annotation\Groups; use Symfony\Component\Validator\Constraints as Assert; @@ -31,4 +32,12 @@ class SymfonyConstraintsWithValidationGroups * @Assert\Range(min=1, max=100) */ public $propertyInDefaultGroup; + + /** + * @var array + * + * @OA\Property(type="array", @OA\Items(type="string")) + * @Assert\Valid + */ + public $propertyArray; } diff --git a/Tests/Functional/ValidationGroupsFunctionalTest.php b/Tests/Functional/ValidationGroupsFunctionalTest.php index 70d018e..c8891ec 100644 --- a/Tests/Functional/ValidationGroupsFunctionalTest.php +++ b/Tests/Functional/ValidationGroupsFunctionalTest.php @@ -66,6 +66,12 @@ class ValidationGroupsFunctionalTest extends WebTestCase 'maximum' => 100, 'minimum' => 1, ], + 'propertyArray' => [ + 'type' => 'array', + 'items' => [ + 'type' => 'string', + ], + ], ], 'type' => 'object', 'schema' => 'SymfonyConstraintsDefaultGroup',