From 14661fcf6f4e993133afee305882f45c8300cd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Wed, 1 May 2024 16:16:15 +0200 Subject: [PATCH 1/2] feat: apply rule TypedPropertyFromStrictConstructor from rector --- src/ApiDocGenerator.php | 9 +++------ .../SymfonyConstraintAnnotationReader.php | 10 ++-------- src/ModelDescriber/ObjectModelDescriber.php | 16 ++++++---------- tests/Functional/Entity/VirtualProperty80.php | 5 +---- tests/Functional/Entity/VirtualProperty81.php | 5 +---- .../Functional/ModelDescriber/NameConverter.php | 5 +---- 6 files changed, 14 insertions(+), 36 deletions(-) diff --git a/src/ApiDocGenerator.php b/src/ApiDocGenerator.php index 61d805cf3..6cd0cc56f 100644 --- a/src/ApiDocGenerator.php +++ b/src/ApiDocGenerator.php @@ -37,11 +37,9 @@ final class ApiDocGenerator /** @var iterable|ModelDescriberInterface[] */ private $modelDescribers; - /** @var CacheItemPoolInterface|null */ - private $cacheItemPool; + private ?\Psr\Cache\CacheItemPoolInterface $cacheItemPool; - /** @var string */ - private $cacheItemId; + private string $cacheItemId; /** @var string[] */ private $alternativeNames = []; @@ -53,8 +51,7 @@ final class ApiDocGenerator */ private $openApiVersion; - /** @var Generator */ - private $generator; + private \OpenApi\Generator $generator; /** * @param DescriberInterface[]|iterable $describers diff --git a/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php b/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php index 49a923cc3..c06fdca04 100644 --- a/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php +++ b/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php @@ -27,20 +27,14 @@ class SymfonyConstraintAnnotationReader { use SetsContextTrait; - /** - * @var Reader|null - */ - private $annotationsReader; + private ?\Doctrine\Common\Annotations\Reader $annotationsReader; /** * @var OA\Schema */ private $schema; - /** - * @var bool - */ - private $useValidationGroups; + private bool $useValidationGroups; public function __construct(?Reader $annotationsReader, bool $useValidationGroups = false) { diff --git a/src/ModelDescriber/ObjectModelDescriber.php b/src/ModelDescriber/ObjectModelDescriber.php index eac0370eb..1c861dea0 100644 --- a/src/ModelDescriber/ObjectModelDescriber.php +++ b/src/ModelDescriber/ObjectModelDescriber.php @@ -31,20 +31,16 @@ class ObjectModelDescriber implements ModelDescriberInterface, ModelRegistryAwar use ModelRegistryAwareTrait; use ApplyOpenApiDiscriminatorTrait; - /** @var PropertyInfoExtractorInterface */ - private $propertyInfo; - /** @var ClassMetadataFactoryInterface|null */ - private $classMetadataFactory; - /** @var Reader|null */ - private $doctrineReader; + private \Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface $propertyInfo; + private ?\Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface $classMetadataFactory; + private ?\Doctrine\Common\Annotations\Reader $doctrineReader; /** @var PropertyDescriberInterface|PropertyDescriberInterface[] */ private $propertyDescriber; /** @var string[] */ - private $mediaTypes; + private array $mediaTypes; /** @var (NameConverterInterface&AdvancedNameConverterInterface)|null */ - private $nameConverter; - /** @var bool */ - private $useValidationGroups; + private ?\Symfony\Component\Serializer\NameConverter\NameConverterInterface $nameConverter; + private bool $useValidationGroups; /** * @param PropertyDescriberInterface|PropertyDescriberInterface[] $propertyDescribers diff --git a/tests/Functional/Entity/VirtualProperty80.php b/tests/Functional/Entity/VirtualProperty80.php index 7616a1a08..e3bba00dd 100644 --- a/tests/Functional/Entity/VirtualProperty80.php +++ b/tests/Functional/Entity/VirtualProperty80.php @@ -35,10 +35,7 @@ class VirtualProperty80 */ private $id; - /** - * @var User - */ - private $user; + private \Nelmio\ApiDocBundle\Tests\Functional\Entity\User $user; /** * @Serializer\Accessor(getter="getFoo", setter="setFoo") diff --git a/tests/Functional/Entity/VirtualProperty81.php b/tests/Functional/Entity/VirtualProperty81.php index 7dbbf5649..20e4c3384 100644 --- a/tests/Functional/Entity/VirtualProperty81.php +++ b/tests/Functional/Entity/VirtualProperty81.php @@ -31,10 +31,7 @@ class VirtualProperty81 #[Serializer\Expose] private $id; - /** - * @var User - */ - private $user; + private \Nelmio\ApiDocBundle\Tests\Functional\Entity\User $user; #[Serializer\Accessor(getter: 'getFoo', setter: 'setFoo')] #[Serializer\Type('string')] diff --git a/tests/Functional/ModelDescriber/NameConverter.php b/tests/Functional/ModelDescriber/NameConverter.php index 55502c579..198b44809 100644 --- a/tests/Functional/ModelDescriber/NameConverter.php +++ b/tests/Functional/ModelDescriber/NameConverter.php @@ -18,10 +18,7 @@ class NameConverter implements AdvancedNameConverterInterface { - /** - * @var MetadataAwareNameConverter - */ - private $inner; + private \Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter $inner; public function __construct(MetadataAwareNameConverter $inner) { From 6049b41c223a3f62994511cf1b0484c03eae9cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Wed, 1 May 2024 18:53:18 +0200 Subject: [PATCH 2/2] fix: run php-cs-fixer after rector changes --- src/ApiDocGenerator.php | 4 ++-- .../Annotations/SymfonyConstraintAnnotationReader.php | 2 +- src/ModelDescriber/ObjectModelDescriber.php | 8 ++++---- tests/Functional/Entity/VirtualProperty80.php | 2 +- tests/Functional/Entity/VirtualProperty81.php | 2 +- tests/Functional/ModelDescriber/NameConverter.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ApiDocGenerator.php b/src/ApiDocGenerator.php index 6cd0cc56f..ee100affc 100644 --- a/src/ApiDocGenerator.php +++ b/src/ApiDocGenerator.php @@ -37,7 +37,7 @@ final class ApiDocGenerator /** @var iterable|ModelDescriberInterface[] */ private $modelDescribers; - private ?\Psr\Cache\CacheItemPoolInterface $cacheItemPool; + private ?CacheItemPoolInterface $cacheItemPool; private string $cacheItemId; @@ -51,7 +51,7 @@ final class ApiDocGenerator */ private $openApiVersion; - private \OpenApi\Generator $generator; + private Generator $generator; /** * @param DescriberInterface[]|iterable $describers diff --git a/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php b/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php index c06fdca04..39db78e5e 100644 --- a/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php +++ b/src/ModelDescriber/Annotations/SymfonyConstraintAnnotationReader.php @@ -27,7 +27,7 @@ class SymfonyConstraintAnnotationReader { use SetsContextTrait; - private ?\Doctrine\Common\Annotations\Reader $annotationsReader; + private ?Reader $annotationsReader; /** * @var OA\Schema diff --git a/src/ModelDescriber/ObjectModelDescriber.php b/src/ModelDescriber/ObjectModelDescriber.php index 1c861dea0..f119bdef0 100644 --- a/src/ModelDescriber/ObjectModelDescriber.php +++ b/src/ModelDescriber/ObjectModelDescriber.php @@ -31,15 +31,15 @@ class ObjectModelDescriber implements ModelDescriberInterface, ModelRegistryAwar use ModelRegistryAwareTrait; use ApplyOpenApiDiscriminatorTrait; - private \Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface $propertyInfo; - private ?\Symfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface $classMetadataFactory; - private ?\Doctrine\Common\Annotations\Reader $doctrineReader; + private PropertyInfoExtractorInterface $propertyInfo; + private ?ClassMetadataFactoryInterface $classMetadataFactory; + private ?Reader $doctrineReader; /** @var PropertyDescriberInterface|PropertyDescriberInterface[] */ private $propertyDescriber; /** @var string[] */ private array $mediaTypes; /** @var (NameConverterInterface&AdvancedNameConverterInterface)|null */ - private ?\Symfony\Component\Serializer\NameConverter\NameConverterInterface $nameConverter; + private ?NameConverterInterface $nameConverter; private bool $useValidationGroups; /** diff --git a/tests/Functional/Entity/VirtualProperty80.php b/tests/Functional/Entity/VirtualProperty80.php index e3bba00dd..fe54a6920 100644 --- a/tests/Functional/Entity/VirtualProperty80.php +++ b/tests/Functional/Entity/VirtualProperty80.php @@ -35,7 +35,7 @@ class VirtualProperty80 */ private $id; - private \Nelmio\ApiDocBundle\Tests\Functional\Entity\User $user; + private User $user; /** * @Serializer\Accessor(getter="getFoo", setter="setFoo") diff --git a/tests/Functional/Entity/VirtualProperty81.php b/tests/Functional/Entity/VirtualProperty81.php index 20e4c3384..3d51a2a31 100644 --- a/tests/Functional/Entity/VirtualProperty81.php +++ b/tests/Functional/Entity/VirtualProperty81.php @@ -31,7 +31,7 @@ class VirtualProperty81 #[Serializer\Expose] private $id; - private \Nelmio\ApiDocBundle\Tests\Functional\Entity\User $user; + private User $user; #[Serializer\Accessor(getter: 'getFoo', setter: 'setFoo')] #[Serializer\Type('string')] diff --git a/tests/Functional/ModelDescriber/NameConverter.php b/tests/Functional/ModelDescriber/NameConverter.php index 198b44809..cb42c59f3 100644 --- a/tests/Functional/ModelDescriber/NameConverter.php +++ b/tests/Functional/ModelDescriber/NameConverter.php @@ -18,7 +18,7 @@ class NameConverter implements AdvancedNameConverterInterface { - private \Symfony\Component\Serializer\NameConverter\MetadataAwareNameConverter $inner; + private MetadataAwareNameConverter $inner; public function __construct(MetadataAwareNameConverter $inner) {