From d4eb6d45b8cc61d3f9b461aca3efb4328edd3506 Mon Sep 17 00:00:00 2001 From: Vincent Amstoutz Date: Sat, 19 Jul 2025 14:38:11 +0200 Subject: [PATCH] fix(test): replace `Collection|iterable` with `Collection` and add appropriate PHPDoc tags Fixes several phpstan errors ignored in the config --- phpstan.neon.dist | 1 - .../Fixtures/TestBundle/Entity/Dummy.php | 10 ++++-- .../TestBundle/Entity/RelatedDummy.php | 9 ++++-- .../Odm/Tests/Fixtures/Document/Dummy.php | 5 ++- .../Tests/Fixtures/Document/RelatedDummy.php | 9 ++++-- .../Orm/Tests/Fixtures/Entity/Dummy.php | 10 ++++-- .../Tests/Fixtures/Entity/RelatedDummy.php | 9 ++++-- src/OpenApi/Tests/Fixtures/Dummy.php | 5 --- .../Tests/Fixtures/ApiResource/Dummy.php | 4 +-- tests/Fixtures/TestBundle/Document/Answer.php | 10 ++++-- .../TestBundle/Document/CircularReference.php | 6 +++- .../Fixtures/TestBundle/Document/Customer.php | 6 +++- tests/Fixtures/TestBundle/Document/Dummy.php | 6 +++- .../Document/DummyAggregateOffer.php | 16 ++++++++-- .../TestBundle/Document/DummyProduct.php | 32 +++++++++++++++---- .../Document/OptionalRequiredDummy.php | 9 ++++-- tests/Fixtures/TestBundle/Document/Person.php | 10 ++++-- .../TestBundle/Document/RelatedDummy.php | 10 ++++-- .../TestBundle/Document/SecuredDummy.php | 30 +++++++++++++---- .../TestBundle/Entity/CircularReference.php | 6 +++- tests/Fixtures/TestBundle/Entity/Customer.php | 6 +++- tests/Fixtures/TestBundle/Entity/Dummy.php | 10 ++++-- .../TestBundle/Entity/DummyProblem.php | 10 ++++-- .../Entity/OptionalRequiredDummy.php | 11 +++++-- tests/Fixtures/TestBundle/Entity/Person.php | 10 ++++-- .../TestBundle/Entity/RelatedDummy.php | 9 ++++-- .../TestBundle/Entity/SecuredDummy.php | 27 ++++++++++++---- 27 files changed, 221 insertions(+), 65 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index f5defe04968..a075d738932 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -47,7 +47,6 @@ parameters: message: '#but database expects#' paths: - tests/Fixtures/TestBundle/Entity/ - - '#Cannot call method add\(\) on iterable.#' - message: '#is never read, only written.#' paths: diff --git a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php index ffc3edf77c3..2b6666973f9 100644 --- a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php +++ b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php @@ -103,8 +103,11 @@ class Dummy #[ORM\ManyToOne(targetEntity: RelatedDummy::class)] public ?RelatedDummy $relatedDummy = null; + /** + * @var Collection + */ #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -302,7 +305,10 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php index 019d66c6234..a0e3bcab407 100644 --- a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php +++ b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php @@ -82,9 +82,12 @@ class RelatedDummy extends ParentDummy implements \Stringable #[Groups(['barcelona', 'chicago', 'friends'])] public ?ThirdLevel $thirdLevel = null; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; /** * @var bool|null A dummy bool @@ -168,8 +171,10 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php b/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php index 92eab69cfc5..711d4bd1a0a 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php @@ -76,8 +76,11 @@ class Dummy public $dummyPrice; #[ODM\ReferenceOne(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] public ?RelatedDummy $relatedDummy = null; + /** + * @return Collection + */ #[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; #[ODM\Field(type: 'hash', nullable: true)] public array $jsonData = []; #[ODM\Field(type: 'collection', nullable: true)] diff --git a/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php b/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php index ecb3cfa75a6..4d1a5f969de 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php @@ -42,8 +42,11 @@ class RelatedDummy extends ParentDummy implements \Stringable public $dummyDate; #[ODM\ReferenceOne(targetDocument: ThirdLevel::class, cascade: ['persist'], nullable: true, storeAs: 'id', inversedBy: 'relatedDummies')] public ?ThirdLevel $thirdLevel = null; + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy', storeAs: 'id')] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; #[ODM\Field(type: 'bool')] public ?bool $dummyBoolean = null; #[ODM\EmbedOne(targetDocument: EmbeddableDummy::class)] @@ -120,8 +123,10 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php index f5a29cc0d03..827f768a26f 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php @@ -106,8 +106,11 @@ class Dummy #[ORM\ManyToOne(targetEntity: RelatedDummy::class)] public ?RelatedDummy $relatedDummy = null; + /** + * @var Collection + */ #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -305,7 +308,10 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php index 4cf6f92c78d..b34be6e4e89 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php @@ -90,9 +90,12 @@ class RelatedDummy extends ParentDummy implements \Stringable #[Groups(['barcelona', 'chicago', 'friends'])] public ?ThirdLevel $thirdLevel = null; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; #[ORM\Column(enumType: DummyBackedEnum::class, nullable: true)] public DummyBackedEnum $dummyBackedEnum; @@ -179,8 +182,10 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/src/OpenApi/Tests/Fixtures/Dummy.php b/src/OpenApi/Tests/Fixtures/Dummy.php index f6d73d7556d..688663c00b9 100644 --- a/src/OpenApi/Tests/Fixtures/Dummy.php +++ b/src/OpenApi/Tests/Fixtures/Dummy.php @@ -213,11 +213,6 @@ public function setRelatedDummy(RelatedDummy $relatedDummy): void $this->relatedDummy = $relatedDummy; } - public function addRelatedDummy(RelatedDummy $relatedDummy): void - { - $this->relatedDummies->add($relatedDummy); - } - public function isDummyBoolean(): ?bool { return $this->dummyBoolean; diff --git a/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php b/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php index 549421ce47a..481be629de8 100644 --- a/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php +++ b/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php @@ -83,7 +83,7 @@ class Dummy #[ApiProperty(push: true)] public ?RelatedDummy $relatedDummy = null; - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var Collection @@ -249,7 +249,7 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/tests/Fixtures/TestBundle/Document/Answer.php b/tests/Fixtures/TestBundle/Document/Answer.php index 28d91bc7e71..fd18111786d 100644 --- a/tests/Fixtures/TestBundle/Document/Answer.php +++ b/tests/Fixtures/TestBundle/Document/Answer.php @@ -43,9 +43,13 @@ class Answer #[Serializer\Groups(['foobar'])] #[ODM\ReferenceOne(targetDocument: Question::class, mappedBy: 'answer')] private ?Question $question = null; + + /** + * @var Collection + */ #[Serializer\Groups(['foobar'])] #[ODM\ReferenceMany(targetDocument: Question::class, mappedBy: 'answer')] - private Collection|iterable $relatedQuestions; + private Collection $relatedQuestions; public function __construct() { @@ -98,8 +102,10 @@ public function getQuestion(): ?Question /** * Get related question. + * + * @return Collection */ - public function getRelatedQuestions(): Collection|iterable + public function getRelatedQuestions(): Collection { return $this->relatedQuestions; } diff --git a/tests/Fixtures/TestBundle/Document/CircularReference.php b/tests/Fixtures/TestBundle/Document/CircularReference.php index a40f65d2e71..2e47b40afe0 100644 --- a/tests/Fixtures/TestBundle/Document/CircularReference.php +++ b/tests/Fixtures/TestBundle/Document/CircularReference.php @@ -33,9 +33,13 @@ class CircularReference #[Groups(['circular'])] #[ODM\ReferenceOne(targetDocument: self::class, inversedBy: 'children')] public $parent; + + /** + * @var Collection + */ #[Groups(['circular'])] #[ODM\ReferenceMany(targetDocument: self::class, mappedBy: 'parent')] - public Collection|iterable $children; + public Collection $children; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/Customer.php b/tests/Fixtures/TestBundle/Document/Customer.php index 9aac6f4f6d4..4689eaa9411 100644 --- a/tests/Fixtures/TestBundle/Document/Customer.php +++ b/tests/Fixtures/TestBundle/Document/Customer.php @@ -29,9 +29,13 @@ class Customer #[Groups(['order_read'])] #[ODM\Field(type: 'string')] public $name; + + /** + * @var Collection + */ #[Groups(['order_read'])] #[ODM\ReferenceMany(targetDocument: Address::class)] - public Collection|iterable $addresses; + public Collection $addresses; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/Dummy.php b/tests/Fixtures/TestBundle/Document/Dummy.php index c47a817705f..30422712d41 100644 --- a/tests/Fixtures/TestBundle/Document/Dummy.php +++ b/tests/Fixtures/TestBundle/Document/Dummy.php @@ -96,8 +96,12 @@ class Dummy public $dummyPrice; #[ODM\ReferenceOne(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] public ?RelatedDummy $relatedDummy = null; + + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; #[ODM\Field(type: 'hash', nullable: true)] public array $jsonData = []; #[ODM\Field(type: 'collection', nullable: true)] diff --git a/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php b/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php index 8ccf3657399..8313a420144 100644 --- a/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php +++ b/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php @@ -38,8 +38,12 @@ class DummyAggregateOffer */ #[ODM\Id(strategy: 'INCREMENT', type: 'int')] private ?int $id = null; + + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: DummyOffer::class, mappedBy: 'aggregate', cascade: ['persist'])] - private Collection|iterable $offers; + private Collection $offers; /** * @var DummyProduct The dummy product */ @@ -56,12 +60,18 @@ public function __construct() $this->offers = new ArrayCollection(); } - public function getOffers(): Collection|iterable + /** + * @return Collection + */ + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + /** + * @param Collection $offers + */ + public function setOffers(Collection $offers): void { $this->offers = $offers; } diff --git a/tests/Fixtures/TestBundle/Document/DummyProduct.php b/tests/Fixtures/TestBundle/Document/DummyProduct.php index cdd001ca68f..99151caae48 100644 --- a/tests/Fixtures/TestBundle/Document/DummyProduct.php +++ b/tests/Fixtures/TestBundle/Document/DummyProduct.php @@ -37,15 +37,23 @@ class DummyProduct */ #[ODM\Id(strategy: 'None', type: 'int')] private ?int $id = null; + + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: DummyAggregateOffer::class, mappedBy: 'product', cascade: ['persist'])] - private Collection|iterable $offers; + private Collection $offers; /** * @var string The tour name */ #[ODM\Field] private string $name; + + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: self::class, mappedBy: 'parent')] - private Collection|iterable $relatedProducts; + private Collection $relatedProducts; #[ODM\ReferenceOne(targetDocument: self::class, inversedBy: 'relatedProducts')] private $parent; @@ -55,12 +63,18 @@ public function __construct() $this->relatedProducts = new ArrayCollection(); } - public function getOffers(): Collection|iterable + /** + * @return Collection + */ + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + /** + * @param Collection $offers + */ + public function setOffers(Collection $offers): void { $this->offers = $offers; } @@ -91,12 +105,18 @@ public function setName(string $name): void $this->name = $name; } - public function getRelatedProducts(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedProducts(): Collection { return $this->relatedProducts; } - public function setRelatedProducts(Collection|iterable $relatedProducts): void + /** + * @param Collection $relatedProducts + */ + public function setRelatedProducts(Collection $relatedProducts): void { $this->relatedProducts = $relatedProducts; } diff --git a/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php b/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php index 878bcdbb870..1a5477f2aad 100644 --- a/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php +++ b/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php @@ -48,9 +48,12 @@ class OptionalRequiredDummy #[Groups(['barcelona', 'chicago', 'friends'])] public ThirdLevel $thirdLevelRequired; + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: RelatedToDummyFriend::class, mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; public function __construct() { @@ -89,8 +92,10 @@ public function setThirdLevelRequired(ThirdLevel $thirdLevelRequired): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Document/Person.php b/tests/Fixtures/TestBundle/Document/Person.php index 14a243c4a39..bae28faa873 100644 --- a/tests/Fixtures/TestBundle/Document/Person.php +++ b/tests/Fixtures/TestBundle/Document/Person.php @@ -46,12 +46,18 @@ class Person #[Groups(['people.pets'])] public array $academicGrades = []; + /** + * @var Collection + */ #[Groups(['people.pets'])] #[ODM\ReferenceMany(targetDocument: PersonToPet::class, mappedBy: 'person')] - public Collection|iterable $pets; + public Collection $pets; + /** + * @var Collection + */ #[ODM\ReferenceMany(targetDocument: Greeting::class, mappedBy: 'sender')] - public Collection|iterable|null $sentGreetings = null; + public Collection $sentGreetings; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/RelatedDummy.php b/tests/Fixtures/TestBundle/Document/RelatedDummy.php index 6a3678b6484..a1e90a1212c 100644 --- a/tests/Fixtures/TestBundle/Document/RelatedDummy.php +++ b/tests/Fixtures/TestBundle/Document/RelatedDummy.php @@ -74,9 +74,13 @@ class RelatedDummy extends ParentDummy implements \Stringable #[Groups(['barcelona', 'chicago', 'friends'])] #[ODM\ReferenceOne(targetDocument: ThirdLevel::class, cascade: ['persist'], nullable: true, storeAs: 'id', inversedBy: 'relatedDummies')] public ?ThirdLevel $thirdLevel = null; + + /** + * @var Collection + */ #[Groups(['fakemanytomany', 'friends'])] #[ODM\ReferenceMany(targetDocument: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy', storeAs: 'id')] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; #[Groups(['friends'])] #[ODM\Field(type: 'bool')] public ?bool $dummyBoolean = null; @@ -155,8 +159,10 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Document/SecuredDummy.php b/tests/Fixtures/TestBundle/Document/SecuredDummy.php index daab913c07e..366749774d4 100644 --- a/tests/Fixtures/TestBundle/Document/SecuredDummy.php +++ b/tests/Fixtures/TestBundle/Document/SecuredDummy.php @@ -90,9 +90,12 @@ class SecuredDummy #[ODM\Field] private ?string $owner = null; + /** + * @var Collection + */ #[ApiProperty(security: "is_granted('ROLE_ADMIN')")] #[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var RelatedDummy @@ -102,11 +105,13 @@ class SecuredDummy protected $relatedDummy; /** - * A collection of dummies that only users can access. The security on RelatedSecuredDummy shouldn't be run. + * A collection of dummies that only users can access. The security on RelatedSecuredDummy shouldn't be run. + * + * @var Collection */ #[ApiProperty(security: "is_granted('ROLE_USER')")] #[ODM\ReferenceMany(targetDocument: RelatedSecuredDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $relatedSecuredDummies; + public Collection $relatedSecuredDummies; /** * A dummy that only users can access. The security on RelatedSecuredDummy shouldn't be run. @@ -118,9 +123,11 @@ class SecuredDummy protected $relatedSecuredDummy; /** * Collection of dummies that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. + * + * @var Collection */ #[ODM\ReferenceMany(targetDocument: RelatedSecuredDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $publicRelatedSecuredDummies; + public Collection $publicRelatedSecuredDummies; /** * A dummy that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. * @@ -206,7 +213,10 @@ public function addRelatedDummy(RelatedDummy $relatedDummy): void $this->relatedDummies->add($relatedDummy); } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } @@ -226,7 +236,10 @@ public function addRelatedSecuredDummy(RelatedSecuredDummy $relatedSecuredDummy) $this->relatedSecuredDummies->add($relatedSecuredDummy); } - public function getRelatedSecuredDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedSecuredDummies(): Collection { return $this->relatedSecuredDummies; } @@ -246,7 +259,10 @@ public function addPublicRelatedSecuredDummy(RelatedSecuredDummy $publicRelatedS $this->publicRelatedSecuredDummies->add($publicRelatedSecuredDummy); } - public function getPublicRelatedSecuredDummies(): Collection|iterable + /** + * @return Collection + */ + public function getPublicRelatedSecuredDummies(): Collection { return $this->publicRelatedSecuredDummies; } diff --git a/tests/Fixtures/TestBundle/Entity/CircularReference.php b/tests/Fixtures/TestBundle/Entity/CircularReference.php index 1c7bdf06844..6a48cd34c8c 100644 --- a/tests/Fixtures/TestBundle/Entity/CircularReference.php +++ b/tests/Fixtures/TestBundle/Entity/CircularReference.php @@ -35,9 +35,13 @@ class CircularReference #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'children')] #[Groups(['circular'])] public $parent; + + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')] #[Groups(['circular'])] - public Collection|iterable $children; + public Collection $children; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/Customer.php b/tests/Fixtures/TestBundle/Entity/Customer.php index 1d3f6d42a13..6d7c9742ece 100644 --- a/tests/Fixtures/TestBundle/Entity/Customer.php +++ b/tests/Fixtures/TestBundle/Entity/Customer.php @@ -31,10 +31,14 @@ class Customer #[ORM\Column(type: 'string')] #[Groups(['order_read'])] public $name; + + /** + * @var Collection + */ #[ORM\ManyToMany(targetEntity: Address::class)] #[ORM\JoinColumn(nullable: false)] #[Groups(['order_read'])] - public Collection|iterable $addresses; + public Collection $addresses; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/Dummy.php b/tests/Fixtures/TestBundle/Entity/Dummy.php index c3cfde6c23f..9fc080df410 100644 --- a/tests/Fixtures/TestBundle/Entity/Dummy.php +++ b/tests/Fixtures/TestBundle/Entity/Dummy.php @@ -113,8 +113,11 @@ class Dummy #[ORM\ManyToOne(targetEntity: RelatedDummy::class)] public ?RelatedDummy $relatedDummy = null; + /** + * @var Collection + */ #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -318,7 +321,10 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/tests/Fixtures/TestBundle/Entity/DummyProblem.php b/tests/Fixtures/TestBundle/Entity/DummyProblem.php index a6bf31b5dc9..5359c35d7cc 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyProblem.php +++ b/tests/Fixtures/TestBundle/Entity/DummyProblem.php @@ -100,8 +100,11 @@ class DummyProblem #[ORM\ManyToOne(targetEntity: RelatedDummy::class)] public ?RelatedDummy $relatedDummy = null; + /** + * @var Collection + */ #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -296,7 +299,10 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php b/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php index 4ac60db1e85..4758576de7a 100644 --- a/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php +++ b/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php @@ -51,9 +51,12 @@ class OptionalRequiredDummy #[Groups(['barcelona', 'chicago', 'friends'])] public ThirdLevel $thirdLevelRequired; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; public function __construct() { @@ -91,9 +94,11 @@ public function setThirdLevelRequired(ThirdLevel $thirdLevelRequired): void } /** - * Get relatedToDummyFriend. + * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Entity/Person.php b/tests/Fixtures/TestBundle/Entity/Person.php index d17c774ca75..c2564560e3b 100644 --- a/tests/Fixtures/TestBundle/Entity/Person.php +++ b/tests/Fixtures/TestBundle/Entity/Person.php @@ -48,12 +48,18 @@ class Person #[Groups(['people.pets'])] public array $academicGrades = []; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: PersonToPet::class, mappedBy: 'person')] #[Groups(['people.pets'])] - public Collection|iterable $pets; + public Collection $pets; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: Greeting::class, mappedBy: 'sender')] - public Collection|iterable|null $sentGreetings = null; + public Collection $sentGreetings; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/RelatedDummy.php b/tests/Fixtures/TestBundle/Entity/RelatedDummy.php index f51c467159a..91d9dc1d4e9 100644 --- a/tests/Fixtures/TestBundle/Entity/RelatedDummy.php +++ b/tests/Fixtures/TestBundle/Entity/RelatedDummy.php @@ -90,9 +90,12 @@ class RelatedDummy extends ParentDummy implements \Stringable #[Groups(['barcelona', 'chicago', 'friends'])] public ?ThirdLevel $thirdLevel = null; + /** + * @var Collection + */ #[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; /** * @var bool|null A dummy bool @@ -176,8 +179,10 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. + * + * @return Collection */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Entity/SecuredDummy.php b/tests/Fixtures/TestBundle/Entity/SecuredDummy.php index 3ea5c943ced..95051bec093 100644 --- a/tests/Fixtures/TestBundle/Entity/SecuredDummy.php +++ b/tests/Fixtures/TestBundle/Entity/SecuredDummy.php @@ -108,11 +108,13 @@ class SecuredDummy /** * A collection of dummies that only admins can access. + * + * @var Collection */ #[ApiProperty(security: "is_granted('ROLE_ADMIN')")] #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] #[ORM\JoinTable(name: 'secured_dummy_related_dummy')] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * A dummy that only admins can access. @@ -126,11 +128,13 @@ class SecuredDummy /** * A collection of dummies that only users can access. The security on RelatedSecuredDummy shouldn't be run. + * + * @var Collection */ #[ApiProperty(security: "is_granted('ROLE_USER')")] #[ORM\ManyToMany(targetEntity: RelatedSecuredDummy::class)] #[ORM\JoinTable(name: 'secured_dummy_related_secured_dummy')] - public Collection|iterable $relatedSecuredDummies; + public Collection $relatedSecuredDummies; /** * A dummy that only users can access. The security on RelatedSecuredDummy shouldn't be run. @@ -144,10 +148,12 @@ class SecuredDummy /** * Collection of dummies that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. + * + * @var Collection */ #[ORM\ManyToMany(targetEntity: RelatedSecuredDummy::class)] #[ORM\JoinTable(name: 'secured_dummy_public_related_secured_dummy')] - public Collection|iterable $publicRelatedSecuredDummies; + public Collection $publicRelatedSecuredDummies; /** * A dummy that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. @@ -235,7 +241,10 @@ public function addRelatedDummy(RelatedDummy $relatedDummy): void $this->relatedDummies->add($relatedDummy); } - public function getRelatedDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedDummies(): Collection { return $this->relatedDummies; } @@ -255,7 +264,10 @@ public function addRelatedSecuredDummy(RelatedSecuredDummy $relatedSecuredDummy) $this->relatedSecuredDummies->add($relatedSecuredDummy); } - public function getRelatedSecuredDummies(): Collection|iterable + /** + * @return Collection + */ + public function getRelatedSecuredDummies(): Collection { return $this->relatedSecuredDummies; } @@ -275,7 +287,10 @@ public function addPublicRelatedSecuredDummy(RelatedSecuredDummy $publicRelatedS $this->publicRelatedSecuredDummies->add($publicRelatedSecuredDummy); } - public function getPublicRelatedSecuredDummies(): Collection|iterable + /** + * @return Collection + */ + public function getPublicRelatedSecuredDummies(): Collection { return $this->publicRelatedSecuredDummies; }