diff --git a/DependencyInjection/NelmioApiDocExtension.php b/DependencyInjection/NelmioApiDocExtension.php index 1b7f113..1a40a42 100644 --- a/DependencyInjection/NelmioApiDocExtension.php +++ b/DependencyInjection/NelmioApiDocExtension.php @@ -176,7 +176,7 @@ final class NelmioApiDocExtension extends Extension implements PrependExtensionI new Reference('annotations.reader'), $config['media_types'], $jmsNamingStrategy, - $container->getParameter('nelmio_api_doc.use_validation_groups') + $container->getParameter('nelmio_api_doc.use_validation_groups'), ]) ->addTag('nelmio_api_doc.model_describer', ['priority' => 50]); diff --git a/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php b/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php index e6cb574..aac6c1d 100644 --- a/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php +++ b/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php @@ -184,11 +184,11 @@ class SymfonyConstraintAnnotationReader private function getAnnotations($reflection, ?array $validationGroups): iterable { foreach ($this->locateAnnotations($reflection) as $annotation) { - if (! $annotation instanceof Constraint) { + if (!$annotation instanceof Constraint) { continue; } - if (! $this->useValidationGroups || $this->isConstraintInGroup($annotation, $validationGroups)) { + if (!$this->useValidationGroups || $this->isConstraintInGroup($annotation, $validationGroups)) { yield $annotation; } } @@ -220,7 +220,7 @@ class SymfonyConstraintAnnotationReader * default group. So even with a null $validationGroups passed here there still * has to be a check on the default group. */ - private function isConstraintInGroup(Constraint $annotation, ?array $validationGroups) : bool + private function isConstraintInGroup(Constraint $annotation, ?array $validationGroups): bool { return count(array_intersect( $validationGroups ?: [Constraint::DEFAULT_GROUP], diff --git a/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php b/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php index 01057b2..65c2896 100644 --- a/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php +++ b/Tests/Functional/Entity/SymfonyConstraintsWithValidationGroups.php @@ -11,10 +11,8 @@ namespace Nelmio\ApiDocBundle\Tests\Functional\Entity; -use Nelmio\ApiDocBundle\Tests\ModelDescriber\Annotations\Fixture as CustomAssert; -use Symfony\Component\Validator\Constraint; -use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Validator\Constraints as Assert; class SymfonyConstraintsWithValidationGroups { diff --git a/Tests/Functional/TestKernel.php b/Tests/Functional/TestKernel.php index fea681b..cd1890c 100644 --- a/Tests/Functional/TestKernel.php +++ b/Tests/Functional/TestKernel.php @@ -19,9 +19,9 @@ use JMS\SerializerBundle\JMSSerializerBundle; use Nelmio\ApiDocBundle\NelmioApiDocBundle; use Nelmio\ApiDocBundle\Tests\Functional\Entity\BazingaUser; use Nelmio\ApiDocBundle\Tests\Functional\Entity\JMSComplex; -use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraintsWithValidationGroups; use Nelmio\ApiDocBundle\Tests\Functional\Entity\NestedGroup\JMSPicture; use Nelmio\ApiDocBundle\Tests\Functional\Entity\PrivateProtectedExposure; +use Nelmio\ApiDocBundle\Tests\Functional\Entity\SymfonyConstraintsWithValidationGroups; use Nelmio\ApiDocBundle\Tests\Functional\ModelDescriber\VirtualTypeClassDoesNotExistsHandlerDefinedDescriber; use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle; use Symfony\Bundle\FrameworkBundle\FrameworkBundle; @@ -33,7 +33,6 @@ use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\HttpKernel\Kernel; use Symfony\Component\Routing\RouteCollectionBuilder; use Symfony\Component\Serializer\Annotation\SerializedName; -use Symfony\Component\Validator\Constraint; class TestKernel extends Kernel { diff --git a/Tests/ModelDescriber/Annotations/SymfonyConstraintAnnotationReaderTest.php b/Tests/ModelDescriber/Annotations/SymfonyConstraintAnnotationReaderTest.php index a864720..d9e84e4 100644 --- a/Tests/ModelDescriber/Annotations/SymfonyConstraintAnnotationReaderTest.php +++ b/Tests/ModelDescriber/Annotations/SymfonyConstraintAnnotationReaderTest.php @@ -12,12 +12,12 @@ namespace Nelmio\ApiDocBundle\Tests\ModelDescriber\Annotations; use Doctrine\Common\Annotations\AnnotationReader; -use Symfony\Component\Validator\Constraint; use Nelmio\ApiDocBundle\ModelDescriber\Annotations\SymfonyConstraintAnnotationReader; use Nelmio\ApiDocBundle\Tests\Helper; use Nelmio\ApiDocBundle\Tests\ModelDescriber\Annotations\Fixture as CustomAssert; use OpenApi\Annotations as OA; use PHPUnit\Framework\TestCase; +use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\Constraints as Assert; class SymfonyConstraintAnnotationReaderTest extends TestCase @@ -488,7 +488,7 @@ class SymfonyConstraintAnnotationReaderTest extends TestCase $reader->updateProperty( new \ReflectionProperty($entity, 'property1'), $schema->properties[0], - ["other"], + ['other'], ); $this->assertSame(OA\UNDEFINED, $schema->required, 'should not have read constraint in default group'); @@ -512,7 +512,7 @@ class SymfonyConstraintAnnotationReaderTest extends TestCase $reader->updateProperty( new \ReflectionProperty($entity, 'property1'), $schema->properties[0], - ["other", Constraint::DEFAULT_GROUP], + ['other', Constraint::DEFAULT_GROUP], ); $this->assertSame(['property1'], $schema->required, 'should have read constraint in default group'); @@ -532,13 +532,13 @@ class SymfonyConstraintAnnotationReaderTest extends TestCase if (\PHP_VERSION_ID >= 80000) { yield 'Attributes' => [new class() { #[Assert\NotBlank()] - #[Assert\Range(min: 1, group: ["other"])] + #[Assert\Range(min: 1, group: ['other'])] private $property1; }]; } } - private function createConstraintReaderWithValidationGroupsEnabled() : SymfonyConstraintAnnotationReader + private function createConstraintReaderWithValidationGroupsEnabled(): SymfonyConstraintAnnotationReader { return new SymfonyConstraintAnnotationReader( new AnnotationReader(),