diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8aa7268a1b9..98b1882de43 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -50,7 +50,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..dc2f7293720 100644 --- a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php +++ b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php @@ -104,7 +104,7 @@ class Dummy public ?RelatedDummy $relatedDummy = null; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -302,7 +302,7 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/FourthLevel.php b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/FourthLevel.php index 0a4b7288979..6620a29ffe7 100644 --- a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/FourthLevel.php +++ b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/FourthLevel.php @@ -46,7 +46,7 @@ class FourthLevel #[Groups(['barcelona', 'chicago'])] private int $level = 4; #[ORM\OneToMany(targetEntity: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel')] - public Collection|iterable|null $badThirdLevel = null; + public ?Collection $badThirdLevel = null; public function getId(): ?int { diff --git a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php index 019d66c6234..4d0891d0b4c 100644 --- a/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php +++ b/src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php @@ -84,7 +84,7 @@ class RelatedDummy extends ParentDummy implements \Stringable #[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 @@ -169,7 +169,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. */ - 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..ef5e3559b54 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php @@ -77,7 +77,7 @@ class Dummy #[ODM\ReferenceOne(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] public ?RelatedDummy $relatedDummy = null; #[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/FourthLevel.php b/src/Doctrine/Odm/Tests/Fixtures/Document/FourthLevel.php index 38dfc0488b1..c949f56c6a1 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/FourthLevel.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/FourthLevel.php @@ -32,7 +32,7 @@ class FourthLevel #[ODM\Field(type: 'int')] private ?int $level = 4; #[ODM\ReferenceMany(targetDocument: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel', storeAs: 'id')] - public Collection|iterable|null $badThirdLevel = null; + public ?Collection $badThirdLevel = null; public function getId(): ?int { diff --git a/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php b/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php index ecb3cfa75a6..858dd2fc2bf 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php @@ -43,7 +43,7 @@ class RelatedDummy extends ParentDummy implements \Stringable #[ODM\ReferenceOne(targetDocument: ThirdLevel::class, cascade: ['persist'], nullable: true, storeAs: 'id', inversedBy: 'relatedDummies')] public ?ThirdLevel $thirdLevel = null; #[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)] @@ -121,7 +121,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/src/Doctrine/Odm/Tests/Fixtures/Document/ThirdLevel.php b/src/Doctrine/Odm/Tests/Fixtures/Document/ThirdLevel.php index 469a0c86e50..6dbef98acd9 100644 --- a/src/Doctrine/Odm/Tests/Fixtures/Document/ThirdLevel.php +++ b/src/Doctrine/Odm/Tests/Fixtures/Document/ThirdLevel.php @@ -40,7 +40,7 @@ class ThirdLevel #[ODM\ReferenceOne(targetDocument: FourthLevel::class, cascade: ['persist'])] public $badFourthLevel; #[ODM\ReferenceMany(mappedBy: 'thirdLevel', targetDocument: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; public function __construct() { diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/CompositeItem.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/CompositeItem.php index bbcea4fbbae..4390826fd1e 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/CompositeItem.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/CompositeItem.php @@ -35,7 +35,7 @@ class CompositeItem implements \Stringable private ?string $field1 = null; #[ORM\OneToMany(targetEntity: CompositeRelation::class, mappedBy: 'compositeItem', fetch: 'EAGER')] #[Groups(['default'])] - private Collection|iterable $compositeValues; + private Collection $compositeValues; public function __construct() { @@ -71,7 +71,7 @@ public function setField1($field1 = null): void /** * Gets compositeValues. */ - public function getCompositeValues(): Collection|iterable + public function getCompositeValues(): Collection { return $this->compositeValues; } diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php index f5a29cc0d03..8b5f1f44930 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php @@ -107,7 +107,7 @@ class Dummy public ?RelatedDummy $relatedDummy = null; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -305,7 +305,7 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/DummyCar.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/DummyCar.php index ba9fd297690..94dc316a213 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/DummyCar.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/DummyCar.php @@ -41,19 +41,19 @@ class DummyCar private DummyCarIdentifier $id; #[ApiFilter(SearchFilter::class, properties: ['colors.prop' => 'ipartial', 'colors' => 'exact'])] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable $colors; + private Collection $colors; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable|null $secondColors = null; + private ?Collection $secondColors = null; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable|null $thirdColors = null; + private ?Collection $thirdColors = null; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\ManyToMany(targetEntity: UuidIdentifierDummy::class, indexBy: 'uuid')] #[ORM\JoinColumn(name: 'car_id', referencedColumnName: 'id_id')] #[ORM\InverseJoinColumn(name: 'uuid_uuid', referencedColumnName: 'uuid')] #[ORM\JoinTable(name: 'uuid_cars')] - private Collection|iterable|null $uuid = null; + private ?Collection $uuid = null; #[ApiFilter(SearchFilter::class, strategy: 'partial')] #[ORM\Column(type: 'string')] @@ -80,12 +80,12 @@ public function getId(): DummyCarIdentifier return $this->id; } - public function getColors(): Collection|iterable + public function getColors(): Collection { return $this->colors; } - public function setColors(Collection|iterable $colors): self + public function setColors(Collection $colors): self { $this->colors = $colors; diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/FourthLevel.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/FourthLevel.php index 0e193cdc354..e03aada3144 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/FourthLevel.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/FourthLevel.php @@ -46,7 +46,7 @@ class FourthLevel #[Groups(['barcelona', 'chicago'])] private int $level = 4; #[ORM\OneToMany(targetEntity: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel')] - public Collection|iterable|null $badThirdLevel = null; + public ?Collection $badThirdLevel = null; public function getId(): ?int { diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php index 4cf6f92c78d..ac031367347 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/RelatedDummy.php @@ -92,7 +92,7 @@ class RelatedDummy extends ParentDummy implements \Stringable #[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; @@ -180,7 +180,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/src/Doctrine/Orm/Tests/Fixtures/Entity/ThirdLevel.php b/src/Doctrine/Orm/Tests/Fixtures/Entity/ThirdLevel.php index e3105c71a45..a18f74ce01b 100644 --- a/src/Doctrine/Orm/Tests/Fixtures/Entity/ThirdLevel.php +++ b/src/Doctrine/Orm/Tests/Fixtures/Entity/ThirdLevel.php @@ -54,7 +54,7 @@ class ThirdLevel public $badFourthLevel; #[ORM\OneToMany(mappedBy: 'thirdLevel', targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; public function __construct() { diff --git a/src/OpenApi/Tests/Fixtures/Dummy.php b/src/OpenApi/Tests/Fixtures/Dummy.php index f6d73d7556d..a1c40b4dcba 100644 --- a/src/OpenApi/Tests/Fixtures/Dummy.php +++ b/src/OpenApi/Tests/Fixtures/Dummy.php @@ -15,6 +15,8 @@ use ApiPlatform\Metadata\ApiProperty; use ApiPlatform\Metadata\ApiResource; +use Doctrine\Common\Collections\ArrayCollection; +use Doctrine\Common\Collections\Collection; /** * Dummy. @@ -81,7 +83,7 @@ class Dummy #[ApiProperty(push: true)] public ?RelatedDummy $relatedDummy = null; - public iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -104,7 +106,7 @@ public static function staticMethod(): void public function __construct() { - $this->relatedDummies = []; + $this->relatedDummies = new ArrayCollection(); } public function getId() diff --git a/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php b/src/Serializer/Tests/Fixtures/ApiResource/Dummy.php index a85f785d10f..05a9b97b2eb 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; /** * @phpstan-ignore-next-line @@ -251,7 +251,7 @@ public function getDummy() return $this->dummy; } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } diff --git a/src/Serializer/Tests/Fixtures/ApiResource/DummyProperty.php b/src/Serializer/Tests/Fixtures/ApiResource/DummyProperty.php index 039377c021b..1af4f07baca 100644 --- a/src/Serializer/Tests/Fixtures/ApiResource/DummyProperty.php +++ b/src/Serializer/Tests/Fixtures/ApiResource/DummyProperty.php @@ -51,7 +51,7 @@ class DummyProperty #[Groups(['dummy_read', 'dummy_graphql_read', 'dummy_write'])] public $group; #[Groups(['dummy_read', 'dummy_graphql_read', 'dummy_write'])] - public Collection|iterable|null $groups = null; + public ?Collection $groups = null; /** * @var string|null */ diff --git a/src/Serializer/Tests/Fixtures/ApiResource/DummyTableInheritanceRelated.php b/src/Serializer/Tests/Fixtures/ApiResource/DummyTableInheritanceRelated.php index ae5e4176f03..6fc61c4a8b0 100644 --- a/src/Serializer/Tests/Fixtures/ApiResource/DummyTableInheritanceRelated.php +++ b/src/Serializer/Tests/Fixtures/ApiResource/DummyTableInheritanceRelated.php @@ -30,7 +30,7 @@ class DummyTableInheritanceRelated * @var Collection Related children */ #[Groups(['default'])] - private Collection|iterable $children; + private Collection $children; public function __construct() { @@ -42,12 +42,12 @@ public function getId(): ?int return $this->id; } - public function getChildren(): Collection|iterable + public function getChildren(): Collection { return $this->children; } - public function setChildren(Collection|iterable $children) + public function setChildren(Collection $children) { $this->children = $children; diff --git a/src/Serializer/Tests/Fixtures/ApiResource/SecuredDummy.php b/src/Serializer/Tests/Fixtures/ApiResource/SecuredDummy.php index 1b02f8a721f..b2b0c27fabf 100644 --- a/src/Serializer/Tests/Fixtures/ApiResource/SecuredDummy.php +++ b/src/Serializer/Tests/Fixtures/ApiResource/SecuredDummy.php @@ -22,6 +22,7 @@ use ApiPlatform\Metadata\GraphQl\QueryCollection; use ApiPlatform\Metadata\Post; use ApiPlatform\Metadata\Put; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Symfony\Component\Validator\Constraints as Assert; @@ -83,7 +84,7 @@ class SecuredDummy * A collection of dummies that only admins can access. */ #[ApiProperty(security: "is_granted('ROLE_ADMIN')")] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * A dummy that only admins can access. @@ -97,7 +98,7 @@ class SecuredDummy * A collection of dummies that only users can access. The security on RelatedSecuredDummy shouldn't be run. */ #[ApiProperty(security: "is_granted('ROLE_USER')")] - public Collection|iterable $relatedSecuredDummies; + public Collection $relatedSecuredDummies; /** * A dummy that only users can access. The security on RelatedSecuredDummy shouldn't be run. @@ -108,7 +109,7 @@ class SecuredDummy /** * Collection of dummies that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. */ - public 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. @@ -117,9 +118,9 @@ class SecuredDummy public function __construct() { - $this->relatedDummies = []; - $this->relatedSecuredDummies = []; - $this->publicRelatedSecuredDummies = []; + $this->relatedDummies = new ArrayCollection(); + $this->relatedSecuredDummies = new ArrayCollection(); + $this->publicRelatedSecuredDummies = new ArrayCollection(); } public function getId(): ?int diff --git a/tests/Fixtures/TestBundle/Document/AbsoluteUrlRelationDummy.php b/tests/Fixtures/TestBundle/Document/AbsoluteUrlRelationDummy.php index 1ca67b870ab..e93b9f3a4d7 100644 --- a/tests/Fixtures/TestBundle/Document/AbsoluteUrlRelationDummy.php +++ b/tests/Fixtures/TestBundle/Document/AbsoluteUrlRelationDummy.php @@ -26,7 +26,7 @@ class AbsoluteUrlRelationDummy #[ODM\Id(strategy: 'INCREMENT', type: 'int')] private $id; #[ODM\ReferenceMany(targetDocument: AbsoluteUrlDummy::class, mappedBy: 'absoluteUrlRelationDummy')] - public Collection|iterable $absoluteUrlDummies; + public Collection $absoluteUrlDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/Answer.php b/tests/Fixtures/TestBundle/Document/Answer.php index 28d91bc7e71..6eb0af53bff 100644 --- a/tests/Fixtures/TestBundle/Document/Answer.php +++ b/tests/Fixtures/TestBundle/Document/Answer.php @@ -45,7 +45,7 @@ class Answer private ?Question $question = null; #[Serializer\Groups(['foobar'])] #[ODM\ReferenceMany(targetDocument: Question::class, mappedBy: 'answer')] - private Collection|iterable $relatedQuestions; + private Collection $relatedQuestions; public function __construct() { @@ -99,7 +99,7 @@ public function getQuestion(): ?Question /** * Get related question. */ - 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..e602a5be3e5 100644 --- a/tests/Fixtures/TestBundle/Document/CircularReference.php +++ b/tests/Fixtures/TestBundle/Document/CircularReference.php @@ -35,7 +35,7 @@ class CircularReference public $parent; #[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/CompositeItem.php b/tests/Fixtures/TestBundle/Document/CompositeItem.php index cfe73fb374c..847d9fee409 100644 --- a/tests/Fixtures/TestBundle/Document/CompositeItem.php +++ b/tests/Fixtures/TestBundle/Document/CompositeItem.php @@ -33,7 +33,7 @@ class CompositeItem implements \Stringable private ?string $field1 = null; #[Groups(['default'])] #[ODM\ReferenceMany(targetDocument: CompositeRelation::class, mappedBy: 'compositeItem')] - private Collection|iterable $compositeValues; + private Collection $compositeValues; public function __construct() { @@ -67,7 +67,7 @@ public function setField1(?string $field1 = null): void /** * Gets compositeValues. */ - public function getCompositeValues(): Collection|iterable + public function getCompositeValues(): Collection { return $this->compositeValues; } diff --git a/tests/Fixtures/TestBundle/Document/Content.php b/tests/Fixtures/TestBundle/Document/Content.php index 7a8d1b242ef..719ec71de78 100644 --- a/tests/Fixtures/TestBundle/Document/Content.php +++ b/tests/Fixtures/TestBundle/Document/Content.php @@ -32,7 +32,7 @@ class Content implements \JsonSerializable * @var Collection */ #[ODM\ReferenceMany(targetDocument: Field::class, mappedBy: 'content', strategy: 'set', cascade: ['persist'])] - private Collection|iterable $fields; + private Collection $fields; #[ODM\Field(type: 'string')] private string $status = ContentStatus::DRAFT; diff --git a/tests/Fixtures/TestBundle/Document/Customer.php b/tests/Fixtures/TestBundle/Document/Customer.php index 9aac6f4f6d4..e0af9bed2c2 100644 --- a/tests/Fixtures/TestBundle/Document/Customer.php +++ b/tests/Fixtures/TestBundle/Document/Customer.php @@ -31,7 +31,7 @@ class Customer public $name; #[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..e64bd5fccbb 100644 --- a/tests/Fixtures/TestBundle/Document/Dummy.php +++ b/tests/Fixtures/TestBundle/Document/Dummy.php @@ -97,7 +97,7 @@ class Dummy #[ODM\ReferenceOne(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] public ?RelatedDummy $relatedDummy = null; #[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..021af84743d 100644 --- a/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php +++ b/tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php @@ -39,7 +39,7 @@ class DummyAggregateOffer #[ODM\Id(strategy: 'INCREMENT', type: 'int')] private ?int $id = null; #[ODM\ReferenceMany(targetDocument: DummyOffer::class, mappedBy: 'aggregate', cascade: ['persist'])] - private Collection|iterable $offers; + private Collection $offers; /** * @var DummyProduct The dummy product */ @@ -56,12 +56,12 @@ public function __construct() $this->offers = new ArrayCollection(); } - public function getOffers(): Collection|iterable + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + public function setOffers(Collection $offers): void { $this->offers = $offers; } diff --git a/tests/Fixtures/TestBundle/Document/DummyCar.php b/tests/Fixtures/TestBundle/Document/DummyCar.php index db3fe080125..abaa26c072e 100644 --- a/tests/Fixtures/TestBundle/Document/DummyCar.php +++ b/tests/Fixtures/TestBundle/Document/DummyCar.php @@ -45,19 +45,19 @@ class DummyCar #[ApiFilter(SearchFilter::class, properties: ['colors.prop' => 'ipartial', 'colors' => 'exact'])] #[Serializer\Groups(['colors'])] #[ODM\ReferenceMany(targetDocument: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable $colors; + private Collection $colors; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[Serializer\Groups(['colors'])] #[ODM\ReferenceMany(targetDocument: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable $secondColors; + private Collection $secondColors; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[Serializer\Groups(['colors'])] #[ODM\ReferenceMany(targetDocument: DummyCarColor::class, mappedBy: 'car')] - private Collection|iterable $thirdColors; + private Collection $thirdColors; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[Serializer\Groups(['colors'])] #[ODM\ReferenceMany(targetDocument: UuidIdentifierDummy::class)] - private Collection|iterable $uuid; + private Collection $uuid; #[ApiFilter(SearchFilter::class, strategy: 'partial')] #[ODM\Field(type: 'string')] private ?string $name = null; @@ -84,44 +84,44 @@ public function getId(): ?int return $this->id; } - public function getColors(): Collection|iterable + public function getColors(): Collection { return $this->colors; } - public function setColors(Collection|iterable $colors): self + public function setColors(Collection $colors): self { $this->colors = $colors; return $this; } - public function getSecondColors(): Collection|iterable + public function getSecondColors(): Collection { return $this->secondColors; } - public function setSecondColors(Collection|iterable $secondColors): void + public function setSecondColors(Collection $secondColors): void { $this->secondColors = $secondColors; } - public function getThirdColors(): Collection|iterable + public function getThirdColors(): Collection { return $this->thirdColors; } - public function setThirdColors(Collection|iterable $thirdColors): void + public function setThirdColors(Collection $thirdColors): void { $this->thirdColors = $thirdColors; } - public function getUuid(): Collection|iterable + public function getUuid(): Collection { return $this->uuid; } - public function setUuid(Collection|iterable $uuid): void + public function setUuid(Collection $uuid): void { $this->uuid = $uuid; } diff --git a/tests/Fixtures/TestBundle/Document/DummyDtoInputOutput.php b/tests/Fixtures/TestBundle/Document/DummyDtoInputOutput.php index 1696ab9c618..7718269f860 100644 --- a/tests/Fixtures/TestBundle/Document/DummyDtoInputOutput.php +++ b/tests/Fixtures/TestBundle/Document/DummyDtoInputOutput.php @@ -51,5 +51,5 @@ public function __construct() #[ODM\Field(type: 'float')] public $num; #[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable|null $relatedDummies = null; + public ?Collection $relatedDummies = null; } diff --git a/tests/Fixtures/TestBundle/Document/DummyProduct.php b/tests/Fixtures/TestBundle/Document/DummyProduct.php index cdd001ca68f..a1d4a60f20a 100644 --- a/tests/Fixtures/TestBundle/Document/DummyProduct.php +++ b/tests/Fixtures/TestBundle/Document/DummyProduct.php @@ -38,14 +38,14 @@ class DummyProduct #[ODM\Id(strategy: 'None', type: 'int')] private ?int $id = null; #[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; #[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 +55,12 @@ public function __construct() $this->relatedProducts = new ArrayCollection(); } - public function getOffers(): Collection|iterable + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + public function setOffers(Collection $offers): void { $this->offers = $offers; } @@ -91,12 +91,12 @@ public function setName(string $name): void $this->name = $name; } - public function getRelatedProducts(): Collection|iterable + public function getRelatedProducts(): Collection { return $this->relatedProducts; } - public function setRelatedProducts(Collection|iterable $relatedProducts): void + public function setRelatedProducts(Collection $relatedProducts): void { $this->relatedProducts = $relatedProducts; } diff --git a/tests/Fixtures/TestBundle/Document/DummyProperty.php b/tests/Fixtures/TestBundle/Document/DummyProperty.php index c61c2c01902..3af3f2f12ac 100644 --- a/tests/Fixtures/TestBundle/Document/DummyProperty.php +++ b/tests/Fixtures/TestBundle/Document/DummyProperty.php @@ -58,11 +58,11 @@ class DummyProperty #[ODM\ReferenceOne(targetDocument: DummyGroup::class, cascade: ['persist'], nullable: true)] public $group; /** - * @var DummyGroup[]|null + * @var Collection|null */ #[Groups(['dummy_read', 'dummy_graphql_read', 'dummy_write'])] #[ODM\ReferenceMany(targetDocument: DummyGroup::class, cascade: ['persist'])] - public Collection|iterable|null $groups = null; + public ?Collection $groups = null; /** * @var string|null */ diff --git a/tests/Fixtures/TestBundle/Document/DummyTableInheritanceRelated.php b/tests/Fixtures/TestBundle/Document/DummyTableInheritanceRelated.php index bc8c735310b..ddca06033a4 100644 --- a/tests/Fixtures/TestBundle/Document/DummyTableInheritanceRelated.php +++ b/tests/Fixtures/TestBundle/Document/DummyTableInheritanceRelated.php @@ -34,7 +34,7 @@ class DummyTableInheritanceRelated */ #[Groups(['default'])] #[ODM\ReferenceMany(targetDocument: DummyTableInheritance::class, mappedBy: 'parent')] - private Collection|iterable $children; + private Collection $children; public function __construct() { @@ -46,12 +46,12 @@ public function getId(): ?int return $this->id; } - public function getChildren(): Collection|iterable + public function getChildren(): Collection { return $this->children; } - public function setChildren(Collection|iterable $children) + public function setChildren(Collection $children) { $this->children = $children; diff --git a/tests/Fixtures/TestBundle/Document/DummyWithEmbedManyOmittingTargetDocument.php b/tests/Fixtures/TestBundle/Document/DummyWithEmbedManyOmittingTargetDocument.php index fd32c7ff2b6..5955041123f 100644 --- a/tests/Fixtures/TestBundle/Document/DummyWithEmbedManyOmittingTargetDocument.php +++ b/tests/Fixtures/TestBundle/Document/DummyWithEmbedManyOmittingTargetDocument.php @@ -44,7 +44,7 @@ public function getId(): ?int return $this->id; } - public function getEmbeddedDummies(): Collection|iterable + public function getEmbeddedDummies(): Collection { return $this->embeddedDummies; } diff --git a/tests/Fixtures/TestBundle/Document/FourthLevel.php b/tests/Fixtures/TestBundle/Document/FourthLevel.php index bf653bfbc37..616df33c80f 100644 --- a/tests/Fixtures/TestBundle/Document/FourthLevel.php +++ b/tests/Fixtures/TestBundle/Document/FourthLevel.php @@ -44,7 +44,7 @@ class FourthLevel #[ODM\Field(type: 'int')] private ?int $level = 4; #[ODM\ReferenceMany(targetDocument: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel', storeAs: 'id')] - public Collection|iterable|null $badThirdLevel = null; + public ?Collection $badThirdLevel = null; public function getId(): ?int { diff --git a/tests/Fixtures/TestBundle/Document/NetworkPathRelationDummy.php b/tests/Fixtures/TestBundle/Document/NetworkPathRelationDummy.php index 641ccd8dfa6..ace5f733594 100644 --- a/tests/Fixtures/TestBundle/Document/NetworkPathRelationDummy.php +++ b/tests/Fixtures/TestBundle/Document/NetworkPathRelationDummy.php @@ -26,7 +26,7 @@ class NetworkPathRelationDummy #[ODM\Id(strategy: 'INCREMENT', type: 'int')] private $id; #[ODM\ReferenceMany(targetDocument: NetworkPathDummy::class, mappedBy: 'networkPathRelationDummy')] - public Collection|iterable $networkPathDummies; + public Collection $networkPathDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php b/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php index 878bcdbb870..dac6a7b95bb 100644 --- a/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php +++ b/tests/Fixtures/TestBundle/Document/OptionalRequiredDummy.php @@ -50,7 +50,7 @@ class OptionalRequiredDummy #[ODM\ReferenceMany(targetDocument: RelatedToDummyFriend::class, mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; public function __construct() { @@ -90,7 +90,7 @@ public function setThirdLevelRequired(ThirdLevel $thirdLevelRequired): void /** * Get relatedToDummyFriend. */ - 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..c31b3def16e 100644 --- a/tests/Fixtures/TestBundle/Document/Person.php +++ b/tests/Fixtures/TestBundle/Document/Person.php @@ -48,10 +48,10 @@ class Person #[Groups(['people.pets'])] #[ODM\ReferenceMany(targetDocument: PersonToPet::class, mappedBy: 'person')] - public Collection|iterable $pets; + public Collection $pets; #[ODM\ReferenceMany(targetDocument: Greeting::class, mappedBy: 'sender')] - public Collection|iterable|null $sentGreetings = null; + public ?Collection $sentGreetings = null; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/Pet.php b/tests/Fixtures/TestBundle/Document/Pet.php index 653aab39553..77600b32d71 100644 --- a/tests/Fixtures/TestBundle/Document/Pet.php +++ b/tests/Fixtures/TestBundle/Document/Pet.php @@ -34,7 +34,7 @@ class Pet #[ODM\Field(type: 'string')] public $name; #[ODM\ReferenceMany(targetDocument: PersonToPet::class, mappedBy: 'pet')] - public Collection|iterable $people; + public Collection $people; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/RelatedDummy.php b/tests/Fixtures/TestBundle/Document/RelatedDummy.php index 6a3678b6484..0de06769aba 100644 --- a/tests/Fixtures/TestBundle/Document/RelatedDummy.php +++ b/tests/Fixtures/TestBundle/Document/RelatedDummy.php @@ -76,7 +76,7 @@ class RelatedDummy extends ParentDummy implements \Stringable public ?ThirdLevel $thirdLevel = null; #[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; @@ -156,7 +156,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Document/RelatedNormalizedDummy.php b/tests/Fixtures/TestBundle/Document/RelatedNormalizedDummy.php index fa434c0a655..d7659842553 100644 --- a/tests/Fixtures/TestBundle/Document/RelatedNormalizedDummy.php +++ b/tests/Fixtures/TestBundle/Document/RelatedNormalizedDummy.php @@ -47,7 +47,7 @@ class RelatedNormalizedDummy #[Groups(['related_output', 'related_input'])] #[ODM\ReferenceMany(targetDocument: CustomNormalizedDummy::class)] - public Collection|iterable $customNormalizedDummy; + public Collection $customNormalizedDummy; public function __construct() { @@ -72,12 +72,12 @@ public function getName(): ?string return $this->name; } - public function getCustomNormalizedDummy(): Collection|iterable + public function getCustomNormalizedDummy(): Collection { return $this->customNormalizedDummy; } - public function setCustomNormalizedDummy(Collection|iterable $customNormalizedDummy): void + public function setCustomNormalizedDummy(Collection $customNormalizedDummy): void { $this->customNormalizedDummy = $customNormalizedDummy; } diff --git a/tests/Fixtures/TestBundle/Document/SecuredDummy.php b/tests/Fixtures/TestBundle/Document/SecuredDummy.php index daab913c07e..888ef24ded4 100644 --- a/tests/Fixtures/TestBundle/Document/SecuredDummy.php +++ b/tests/Fixtures/TestBundle/Document/SecuredDummy.php @@ -92,7 +92,7 @@ class SecuredDummy #[ApiProperty(security: "is_granted('ROLE_ADMIN')")] #[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var RelatedDummy @@ -106,7 +106,7 @@ class SecuredDummy */ #[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. @@ -120,7 +120,7 @@ class SecuredDummy * Collection of dummies that anyone can access. There is no ApiProperty security, and the security on RelatedSecuredDummy shouldn't be run. */ #[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 +206,7 @@ public function addRelatedDummy(RelatedDummy $relatedDummy): void $this->relatedDummies->add($relatedDummy); } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } @@ -226,7 +226,7 @@ public function addRelatedSecuredDummy(RelatedSecuredDummy $relatedSecuredDummy) $this->relatedSecuredDummies->add($relatedSecuredDummy); } - public function getRelatedSecuredDummies(): Collection|iterable + public function getRelatedSecuredDummies(): Collection { return $this->relatedSecuredDummies; } @@ -246,7 +246,7 @@ public function addPublicRelatedSecuredDummy(RelatedSecuredDummy $publicRelatedS $this->publicRelatedSecuredDummies->add($publicRelatedSecuredDummy); } - public function getPublicRelatedSecuredDummies(): Collection|iterable + public function getPublicRelatedSecuredDummies(): Collection { return $this->publicRelatedSecuredDummies; } diff --git a/tests/Fixtures/TestBundle/Document/SlugParentDummy.php b/tests/Fixtures/TestBundle/Document/SlugParentDummy.php index ed34ea94bd6..c6011cdba0c 100644 --- a/tests/Fixtures/TestBundle/Document/SlugParentDummy.php +++ b/tests/Fixtures/TestBundle/Document/SlugParentDummy.php @@ -48,7 +48,7 @@ class SlugParentDummy * @var Collection */ #[ODM\ReferenceMany(targetDocument: SlugChildDummy::class, mappedBy: 'parentDummy')] - private Collection|iterable $childDummies; + private Collection $childDummies; public function __construct() { @@ -73,7 +73,7 @@ public function setSlug(string $slug): void /** * @return Collection */ - public function getChildDummies(): Collection|iterable + public function getChildDummies(): Collection { return $this->childDummies; } diff --git a/tests/Fixtures/TestBundle/Document/ThirdLevel.php b/tests/Fixtures/TestBundle/Document/ThirdLevel.php index ef482a6564a..9a970c345f3 100644 --- a/tests/Fixtures/TestBundle/Document/ThirdLevel.php +++ b/tests/Fixtures/TestBundle/Document/ThirdLevel.php @@ -52,7 +52,7 @@ class ThirdLevel #[ODM\ReferenceOne(targetDocument: FourthLevel::class, cascade: ['persist'])] public $badFourthLevel; #[ODM\ReferenceMany(mappedBy: 'thirdLevel', targetDocument: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Document/VoDummyCar.php b/tests/Fixtures/TestBundle/Document/VoDummyCar.php index 28609813c15..59e0e7462e5 100644 --- a/tests/Fixtures/TestBundle/Document/VoDummyCar.php +++ b/tests/Fixtures/TestBundle/Document/VoDummyCar.php @@ -25,7 +25,7 @@ class VoDummyCar extends VoDummyVehicle { #[Groups(['car_read', 'car_write'])] #[ODM\ReferenceMany(targetDocument: VoDummyInspection::class, mappedBy: 'car', cascade: ['persist'])] - private Collection|iterable $inspections; + private Collection $inspections; public function __construct(string $make, VoDummyInsuranceCompany $insuranceCompany, array $drivers, #[Groups(['car_read', 'car_write'])] #[ODM\Field(type: 'int')] private int $mileage, #[Groups(['car_read', 'car_write'])] #[ODM\Field] private string $bodyType = 'coupe') { @@ -43,7 +43,7 @@ public function getBodyType(): string return $this->bodyType; } - public function getInspections(): Collection|iterable + public function getInspections(): Collection { return $this->inspections; } diff --git a/tests/Fixtures/TestBundle/Document/VoDummyVehicle.php b/tests/Fixtures/TestBundle/Document/VoDummyVehicle.php index cd84cf99916..b276d463e28 100644 --- a/tests/Fixtures/TestBundle/Document/VoDummyVehicle.php +++ b/tests/Fixtures/TestBundle/Document/VoDummyVehicle.php @@ -27,7 +27,7 @@ abstract class VoDummyVehicle */ #[Groups(['car_read', 'car_write'])] #[ODM\ReferenceMany(targetDocument: VoDummyDriver::class, cascade: ['persist'])] - private Collection|iterable $drivers; + private Collection $drivers; public function __construct( #[Groups(['car_read', 'car_write'])] #[ODM\Field] private string $make, @@ -50,7 +50,7 @@ public function getInsuranceCompany(): VoDummyInsuranceCompany /** * @return Collection */ - public function getDrivers(): Collection|iterable + public function getDrivers(): Collection { return $this->drivers; } diff --git a/tests/Fixtures/TestBundle/Entity/AbsoluteUrlRelationDummy.php b/tests/Fixtures/TestBundle/Entity/AbsoluteUrlRelationDummy.php index 8be39e7c89c..eb30c0e7208 100644 --- a/tests/Fixtures/TestBundle/Entity/AbsoluteUrlRelationDummy.php +++ b/tests/Fixtures/TestBundle/Entity/AbsoluteUrlRelationDummy.php @@ -28,7 +28,7 @@ class AbsoluteUrlRelationDummy #[ORM\Column(type: 'integer')] private $id; #[ORM\OneToMany(targetEntity: AbsoluteUrlDummy::class, mappedBy: 'absoluteUrlRelationDummy')] - public Collection|iterable $absoluteUrlDummies; + public Collection $absoluteUrlDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/Answer.php b/tests/Fixtures/TestBundle/Entity/Answer.php index ec22268a5be..1542580adbe 100644 --- a/tests/Fixtures/TestBundle/Entity/Answer.php +++ b/tests/Fixtures/TestBundle/Entity/Answer.php @@ -50,7 +50,7 @@ class Answer */ #[ORM\OneToMany(targetEntity: Question::class, mappedBy: 'answer')] #[Serializer\Groups(['foobar'])] - private Collection|iterable $relatedQuestions; + private Collection $relatedQuestions; public function __construct() { @@ -106,7 +106,7 @@ public function getQuestion(): ?Question /** * Get related question. */ - public function getRelatedQuestions(): Collection|iterable + public function getRelatedQuestions(): Collection { return $this->relatedQuestions; } diff --git a/tests/Fixtures/TestBundle/Entity/CircularReference.php b/tests/Fixtures/TestBundle/Entity/CircularReference.php index 1c7bdf06844..d139e47c4d8 100644 --- a/tests/Fixtures/TestBundle/Entity/CircularReference.php +++ b/tests/Fixtures/TestBundle/Entity/CircularReference.php @@ -37,7 +37,7 @@ class CircularReference public $parent; #[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/CompositeItem.php b/tests/Fixtures/TestBundle/Entity/CompositeItem.php index e049b5bbf8f..ac2271334d5 100644 --- a/tests/Fixtures/TestBundle/Entity/CompositeItem.php +++ b/tests/Fixtures/TestBundle/Entity/CompositeItem.php @@ -35,7 +35,7 @@ class CompositeItem implements \Stringable private ?string $field1 = null; #[ORM\OneToMany(targetEntity: CompositeRelation::class, mappedBy: 'compositeItem', fetch: 'EAGER')] #[Groups(['default'])] - private Collection|iterable $compositeValues; + private Collection $compositeValues; public function __construct() { @@ -71,7 +71,7 @@ public function setField1($field1 = null): void /** * Gets compositeValues. */ - public function getCompositeValues(): Collection|iterable + public function getCompositeValues(): Collection { return $this->compositeValues; } diff --git a/tests/Fixtures/TestBundle/Entity/Content.php b/tests/Fixtures/TestBundle/Entity/Content.php index 4a447c3748a..f8ba93480d0 100644 --- a/tests/Fixtures/TestBundle/Entity/Content.php +++ b/tests/Fixtures/TestBundle/Entity/Content.php @@ -35,7 +35,7 @@ class Content implements \JsonSerializable */ #[ORM\OneToMany(targetEntity: Field::class, mappedBy: 'content', cascade: ['persist'], orphanRemoval: true, indexBy: 'name')] #[ORM\OrderBy(['id' => 'ASC'])] - private Collection|iterable $fields; + private Collection $fields; #[ORM\Column(type: 'string')] private string $status = ContentStatus::DRAFT; diff --git a/tests/Fixtures/TestBundle/Entity/Customer.php b/tests/Fixtures/TestBundle/Entity/Customer.php index 1d3f6d42a13..e6d10e330a8 100644 --- a/tests/Fixtures/TestBundle/Entity/Customer.php +++ b/tests/Fixtures/TestBundle/Entity/Customer.php @@ -34,7 +34,7 @@ class Customer #[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..cee354b5921 100644 --- a/tests/Fixtures/TestBundle/Entity/Dummy.php +++ b/tests/Fixtures/TestBundle/Entity/Dummy.php @@ -114,7 +114,7 @@ class Dummy public ?RelatedDummy $relatedDummy = null; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -318,7 +318,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/Entity/DummyAggregateOffer.php b/tests/Fixtures/TestBundle/Entity/DummyAggregateOffer.php index 7089cdf2a70..24e5779871c 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyAggregateOffer.php +++ b/tests/Fixtures/TestBundle/Entity/DummyAggregateOffer.php @@ -44,7 +44,7 @@ class DummyAggregateOffer * @var Collection */ #[ORM\OneToMany(targetEntity: DummyOffer::class, mappedBy: 'aggregate', cascade: ['persist'])] - private Collection|iterable $offers; + private Collection $offers; /** * @var DummyProduct|null The dummy product */ @@ -61,12 +61,12 @@ public function __construct() $this->offers = new ArrayCollection(); } - public function getOffers(): Collection|iterable + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + public function setOffers(Collection $offers): void { $this->offers = $offers; } diff --git a/tests/Fixtures/TestBundle/Entity/DummyCar.php b/tests/Fixtures/TestBundle/Entity/DummyCar.php index 3991a1da6a8..0fcab53cf12 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyCar.php +++ b/tests/Fixtures/TestBundle/Entity/DummyCar.php @@ -49,22 +49,22 @@ class DummyCar #[ApiFilter(SearchFilter::class, properties: ['colors.prop' => 'ipartial', 'colors' => 'exact'])] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] #[Serializer\Groups(['colors'])] - private Collection|iterable $colors; + private Collection $colors; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] #[Serializer\Groups(['colors'])] - private Collection|iterable|null $secondColors = null; + private ?Collection $secondColors = null; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\OneToMany(targetEntity: DummyCarColor::class, mappedBy: 'car')] #[Serializer\Groups(['colors'])] - private Collection|iterable|null $thirdColors = null; + private ?Collection $thirdColors = null; #[ApiFilter(SearchFilter::class, strategy: 'exact')] #[ORM\ManyToMany(targetEntity: UuidIdentifierDummy::class, indexBy: 'uuid')] #[ORM\JoinColumn(name: 'car_id', referencedColumnName: 'id_id')] #[ORM\InverseJoinColumn(name: 'uuid_uuid', referencedColumnName: 'uuid')] #[ORM\JoinTable(name: 'uuid_cars')] #[Serializer\Groups(['colors'])] - private Collection|iterable|null $uuid = null; + private ?Collection $uuid = null; #[ApiFilter(SearchFilter::class, strategy: 'partial')] #[ORM\Column(type: 'string')] @@ -93,12 +93,12 @@ public function getId(): DummyCarIdentifier return $this->id; } - public function getColors(): Collection|iterable + public function getColors(): Collection { return $this->colors; } - public function setColors(Collection|iterable $colors): self + public function setColors(Collection $colors): self { $this->colors = $colors; diff --git a/tests/Fixtures/TestBundle/Entity/DummyDtoInputOutput.php b/tests/Fixtures/TestBundle/Entity/DummyDtoInputOutput.php index 1efc7bfd669..26acd5b6a18 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyDtoInputOutput.php +++ b/tests/Fixtures/TestBundle/Entity/DummyDtoInputOutput.php @@ -53,5 +53,5 @@ public function __construct() #[ORM\Column(type: 'float')] public $num; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable|null $relatedDummies = null; + public ?Collection $relatedDummies = null; } diff --git a/tests/Fixtures/TestBundle/Entity/DummyProblem.php b/tests/Fixtures/TestBundle/Entity/DummyProblem.php index a6bf31b5dc9..1b46b1a97a6 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyProblem.php +++ b/tests/Fixtures/TestBundle/Entity/DummyProblem.php @@ -101,7 +101,7 @@ class DummyProblem public ?RelatedDummy $relatedDummy = null; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; /** * @var array|null serialize data @@ -296,7 +296,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/Entity/DummyProduct.php b/tests/Fixtures/TestBundle/Entity/DummyProduct.php index d6e428f8a02..d79d60dfff7 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyProduct.php +++ b/tests/Fixtures/TestBundle/Entity/DummyProduct.php @@ -42,7 +42,7 @@ class DummyProduct * @var Collection */ #[ORM\OneToMany(targetEntity: DummyAggregateOffer::class, mappedBy: 'product', cascade: ['persist'])] - private Collection|iterable $offers; + private Collection $offers; /** * @var string The tour name */ @@ -52,7 +52,7 @@ class DummyProduct * @var Collection */ #[ORM\OneToMany(targetEntity: self::class, mappedBy: 'parent')] - private Collection|iterable $relatedProducts; + private Collection $relatedProducts; #[ORM\ManyToOne(targetEntity: self::class, inversedBy: 'relatedProducts')] private $parent; @@ -62,12 +62,12 @@ public function __construct() $this->relatedProducts = new ArrayCollection(); } - public function getOffers(): Collection|iterable + public function getOffers(): Collection { return $this->offers; } - public function setOffers(Collection|iterable $offers): void + public function setOffers(Collection $offers): void { $this->offers = $offers; } @@ -98,12 +98,12 @@ public function setName(string $name): void $this->name = $name; } - public function getRelatedProducts(): Collection|iterable + public function getRelatedProducts(): Collection { return $this->relatedProducts; } - public function setRelatedProducts(Collection|iterable $relatedProducts): void + public function setRelatedProducts(Collection $relatedProducts): void { $this->relatedProducts = $relatedProducts; } diff --git a/tests/Fixtures/TestBundle/Entity/DummyProperty.php b/tests/Fixtures/TestBundle/Entity/DummyProperty.php index d0d6b84032b..afee7bb90d2 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyProperty.php +++ b/tests/Fixtures/TestBundle/Entity/DummyProperty.php @@ -61,7 +61,7 @@ class DummyProperty public $group; #[ORM\ManyToMany(targetEntity: DummyGroup::class, cascade: ['persist'])] #[Groups(['dummy_read', 'dummy_graphql_read', 'dummy_write'])] - public Collection|iterable|null $groups = null; + public ?Collection $groups = null; /** * @var string|null */ diff --git a/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php b/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php index e0032d28b4f..3ee6d0d868a 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php +++ b/tests/Fixtures/TestBundle/Entity/DummyTableInheritanceRelated.php @@ -37,7 +37,7 @@ class DummyTableInheritanceRelated #[ORM\OneToMany(targetEntity: DummyTableInheritance::class, mappedBy: 'parent')] #[ORM\OrderBy(['id' => 'ASC'])] #[Groups(['default'])] - private Collection|iterable $children; + private Collection $children; public function __construct() { @@ -49,12 +49,12 @@ public function getId(): ?int return $this->id; } - public function getChildren(): Collection|iterable + public function getChildren(): Collection { return $this->children; } - public function setChildren(Collection|iterable $children) + public function setChildren(Collection $children) { $this->children = $children; diff --git a/tests/Fixtures/TestBundle/Entity/DummyWithCollectDenormalizationErrors.php b/tests/Fixtures/TestBundle/Entity/DummyWithCollectDenormalizationErrors.php index 8953503d7d4..d3e49bfab2d 100644 --- a/tests/Fixtures/TestBundle/Entity/DummyWithCollectDenormalizationErrors.php +++ b/tests/Fixtures/TestBundle/Entity/DummyWithCollectDenormalizationErrors.php @@ -52,7 +52,7 @@ class DummyWithCollectDenormalizationErrors public ?RelatedDummy $relatedDummy = null; #[ORM\ManyToMany(targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; public function __construct(string $baz, ?string $qux = null) { diff --git a/tests/Fixtures/TestBundle/Entity/FourthLevel.php b/tests/Fixtures/TestBundle/Entity/FourthLevel.php index b62eaed1b27..e1094d56c5d 100644 --- a/tests/Fixtures/TestBundle/Entity/FourthLevel.php +++ b/tests/Fixtures/TestBundle/Entity/FourthLevel.php @@ -46,7 +46,7 @@ class FourthLevel #[Groups(['barcelona', 'chicago'])] private int $level = 4; #[ORM\OneToMany(targetEntity: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel')] - public Collection|iterable|null $badThirdLevel = null; + public ?Collection $badThirdLevel = null; public function getId(): ?int { diff --git a/tests/Fixtures/TestBundle/Entity/NetworkPathRelationDummy.php b/tests/Fixtures/TestBundle/Entity/NetworkPathRelationDummy.php index f743fbf6432..af1cc82b4a0 100644 --- a/tests/Fixtures/TestBundle/Entity/NetworkPathRelationDummy.php +++ b/tests/Fixtures/TestBundle/Entity/NetworkPathRelationDummy.php @@ -28,7 +28,7 @@ class NetworkPathRelationDummy #[ORM\Column(type: 'integer')] private $id; #[ORM\OneToMany(targetEntity: NetworkPathDummy::class, mappedBy: 'networkPathRelationDummy')] - public Collection|iterable $networkPathDummies; + public Collection $networkPathDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php b/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php index 4ac60db1e85..25d35d7c480 100644 --- a/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php +++ b/tests/Fixtures/TestBundle/Entity/OptionalRequiredDummy.php @@ -53,7 +53,7 @@ class OptionalRequiredDummy #[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')] #[Groups(['fakemanytomany', 'friends'])] - public Collection|iterable $relatedToDummyFriend; + public Collection $relatedToDummyFriend; public function __construct() { @@ -93,7 +93,7 @@ public function setThirdLevelRequired(ThirdLevel $thirdLevelRequired): void /** * Get relatedToDummyFriend. */ - 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..2f95121c9d3 100644 --- a/tests/Fixtures/TestBundle/Entity/Person.php +++ b/tests/Fixtures/TestBundle/Entity/Person.php @@ -50,10 +50,10 @@ class Person #[ORM\OneToMany(targetEntity: PersonToPet::class, mappedBy: 'person')] #[Groups(['people.pets'])] - public Collection|iterable $pets; + public Collection $pets; #[ORM\OneToMany(targetEntity: Greeting::class, mappedBy: 'sender')] - public Collection|iterable|null $sentGreetings = null; + public ?Collection $sentGreetings = null; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/Pet.php b/tests/Fixtures/TestBundle/Entity/Pet.php index 85706a4f6a3..08b4485d7e1 100644 --- a/tests/Fixtures/TestBundle/Entity/Pet.php +++ b/tests/Fixtures/TestBundle/Entity/Pet.php @@ -36,7 +36,7 @@ class Pet #[Groups(['people.pets'])] public $name; #[ORM\OneToMany(targetEntity: PersonToPet::class, mappedBy: 'pet')] - public Collection|iterable $people; + public Collection $people; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/RelatedDummy.php b/tests/Fixtures/TestBundle/Entity/RelatedDummy.php index f51c467159a..89ed41d5b16 100644 --- a/tests/Fixtures/TestBundle/Entity/RelatedDummy.php +++ b/tests/Fixtures/TestBundle/Entity/RelatedDummy.php @@ -92,7 +92,7 @@ class RelatedDummy extends ParentDummy implements \Stringable #[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 @@ -177,7 +177,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void /** * Get relatedToDummyFriend. */ - public function getRelatedToDummyFriend(): Collection|iterable + public function getRelatedToDummyFriend(): Collection { return $this->relatedToDummyFriend; } diff --git a/tests/Fixtures/TestBundle/Entity/RelatedNormalizedDummy.php b/tests/Fixtures/TestBundle/Entity/RelatedNormalizedDummy.php index 4c7598f3ece..91d4ac334e2 100644 --- a/tests/Fixtures/TestBundle/Entity/RelatedNormalizedDummy.php +++ b/tests/Fixtures/TestBundle/Entity/RelatedNormalizedDummy.php @@ -52,7 +52,7 @@ class RelatedNormalizedDummy */ #[ORM\ManyToMany(targetEntity: CustomNormalizedDummy::class)] #[Groups(['related_output', 'related_input'])] - public Collection|iterable $customNormalizedDummy; + public Collection $customNormalizedDummy; public function __construct() { @@ -74,12 +74,12 @@ public function getName(): ?string return $this->name; } - public function getCustomNormalizedDummy(): Collection|iterable + public function getCustomNormalizedDummy(): Collection { return $this->customNormalizedDummy; } - public function setCustomNormalizedDummy(Collection|iterable $customNormalizedDummy): void + public function setCustomNormalizedDummy(Collection $customNormalizedDummy): void { $this->customNormalizedDummy = $customNormalizedDummy; } diff --git a/tests/Fixtures/TestBundle/Entity/Relation2.php b/tests/Fixtures/TestBundle/Entity/Relation2.php index 3c9337c8e18..e8f77c3ea8a 100644 --- a/tests/Fixtures/TestBundle/Entity/Relation2.php +++ b/tests/Fixtures/TestBundle/Entity/Relation2.php @@ -30,7 +30,7 @@ class Relation2 #[ORM\GeneratedValue] public $id; #[ORM\OneToMany(targetEntity: Relation1::class, mappedBy: 'relation2')] - public Collection|iterable $relation1s; + public Collection $relation1s; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/Relation3.php b/tests/Fixtures/TestBundle/Entity/Relation3.php index 412b0019544..d4dc32524fa 100644 --- a/tests/Fixtures/TestBundle/Entity/Relation3.php +++ b/tests/Fixtures/TestBundle/Entity/Relation3.php @@ -30,14 +30,14 @@ class Relation3 * @var Collection */ #[ORM\ManyToMany(targetEntity: Relation2::class, orphanRemoval: true)] - private Collection|iterable $relation2s; + private Collection $relation2s; public function __construct() { $this->relation2s = new ArrayCollection(); } - public function getRelation2s(): Collection|iterable + public function getRelation2s(): Collection { return $this->relation2s; } diff --git a/tests/Fixtures/TestBundle/Entity/SecuredDummy.php b/tests/Fixtures/TestBundle/Entity/SecuredDummy.php index 3ea5c943ced..2460ab99b50 100644 --- a/tests/Fixtures/TestBundle/Entity/SecuredDummy.php +++ b/tests/Fixtures/TestBundle/Entity/SecuredDummy.php @@ -112,7 +112,7 @@ class SecuredDummy #[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. @@ -130,7 +130,7 @@ class SecuredDummy #[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. @@ -147,7 +147,7 @@ class SecuredDummy */ #[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 +235,7 @@ public function addRelatedDummy(RelatedDummy $relatedDummy): void $this->relatedDummies->add($relatedDummy); } - public function getRelatedDummies(): Collection|iterable + public function getRelatedDummies(): Collection { return $this->relatedDummies; } @@ -255,7 +255,7 @@ public function addRelatedSecuredDummy(RelatedSecuredDummy $relatedSecuredDummy) $this->relatedSecuredDummies->add($relatedSecuredDummy); } - public function getRelatedSecuredDummies(): Collection|iterable + public function getRelatedSecuredDummies(): Collection { return $this->relatedSecuredDummies; } @@ -275,7 +275,7 @@ public function addPublicRelatedSecuredDummy(RelatedSecuredDummy $publicRelatedS $this->publicRelatedSecuredDummies->add($publicRelatedSecuredDummy); } - public function getPublicRelatedSecuredDummies(): Collection|iterable + public function getPublicRelatedSecuredDummies(): Collection { return $this->publicRelatedSecuredDummies; } diff --git a/tests/Fixtures/TestBundle/Entity/SlugParentDummy.php b/tests/Fixtures/TestBundle/Entity/SlugParentDummy.php index 104ca2cc97e..2ee1fe4ef83 100644 --- a/tests/Fixtures/TestBundle/Entity/SlugParentDummy.php +++ b/tests/Fixtures/TestBundle/Entity/SlugParentDummy.php @@ -49,7 +49,7 @@ class SlugParentDummy * @var Collection */ #[ORM\OneToMany(targetEntity: SlugChildDummy::class, mappedBy: 'parentDummy')] - private Collection|iterable $childDummies; + private Collection $childDummies; public function __construct() { @@ -74,7 +74,7 @@ public function setSlug(string $slug): void /** * @return Collection */ - public function getChildDummies(): Collection|iterable + public function getChildDummies(): Collection { return $this->childDummies; } diff --git a/tests/Fixtures/TestBundle/Entity/ThirdLevel.php b/tests/Fixtures/TestBundle/Entity/ThirdLevel.php index 672d2e5ba78..07bc466b06c 100644 --- a/tests/Fixtures/TestBundle/Entity/ThirdLevel.php +++ b/tests/Fixtures/TestBundle/Entity/ThirdLevel.php @@ -54,7 +54,7 @@ class ThirdLevel public $badFourthLevel; #[ORM\OneToMany(mappedBy: 'thirdLevel', targetEntity: RelatedDummy::class)] - public Collection|iterable $relatedDummies; + public Collection $relatedDummies; public function __construct() { diff --git a/tests/Fixtures/TestBundle/Entity/VoDummyCar.php b/tests/Fixtures/TestBundle/Entity/VoDummyCar.php index 290266d84ec..62314b43569 100644 --- a/tests/Fixtures/TestBundle/Entity/VoDummyCar.php +++ b/tests/Fixtures/TestBundle/Entity/VoDummyCar.php @@ -28,7 +28,7 @@ class VoDummyCar extends VoDummyVehicle */ #[ORM\OneToMany(targetEntity: VoDummyInspection::class, mappedBy: 'car', cascade: ['persist'])] #[Groups(['car_read', 'car_write'])] - private Collection|iterable $inspections; + private Collection $inspections; public function __construct(string $make, VoDummyInsuranceCompany $insuranceCompany, array $drivers, #[ORM\Column(type: 'integer')] #[Groups(['car_read', 'car_write'])] private int $mileage, #[ORM\Column] #[Groups(['car_read', 'car_write'])] private string $bodyType = 'coupe') { @@ -46,7 +46,7 @@ public function getBodyType(): string return $this->bodyType; } - public function getInspections(): Collection|iterable + public function getInspections(): Collection { return $this->inspections; } diff --git a/tests/Fixtures/TestBundle/Entity/VoDummyVehicle.php b/tests/Fixtures/TestBundle/Entity/VoDummyVehicle.php index 2b6f0e5b86d..8a20c4867dc 100644 --- a/tests/Fixtures/TestBundle/Entity/VoDummyVehicle.php +++ b/tests/Fixtures/TestBundle/Entity/VoDummyVehicle.php @@ -27,7 +27,7 @@ abstract class VoDummyVehicle */ #[ORM\ManyToMany(targetEntity: VoDummyDriver::class, cascade: ['persist'])] #[Groups(['car_read', 'car_write'])] - private Collection|iterable $drivers; + private Collection $drivers; public function __construct( #[ORM\Column] #[Groups(['car_read', 'car_write'])] private string $make, @@ -50,7 +50,7 @@ public function getInsuranceCompany(): ?VoDummyInsuranceCompany /** * @return Collection */ - public function getDrivers(): Collection|iterable + public function getDrivers(): Collection { return $this->drivers; }