Skip to content

Commit c72b98d

Browse files
Solve some baseline errors
1 parent 42f0ce7 commit c72b98d

File tree

74 files changed

+164
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+164
-162
lines changed

phpstan.neon.dist

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ parameters:
5050
message: '#but database expects#'
5151
paths:
5252
- tests/Fixtures/TestBundle/Entity/
53-
- '#Cannot call method add\(\) on iterable.#'
5453
-
5554
message: '#is never read, only written.#'
5655
paths:

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/Dummy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class Dummy
104104
public ?RelatedDummy $relatedDummy = null;
105105

106106
#[ORM\ManyToMany(targetEntity: RelatedDummy::class)]
107-
public Collection|iterable $relatedDummies;
107+
public Collection $relatedDummies;
108108

109109
/**
110110
* @var array|null serialize data
@@ -302,7 +302,7 @@ public function getDummy()
302302
return $this->dummy;
303303
}
304304

305-
public function getRelatedDummies(): Collection|iterable
305+
public function getRelatedDummies(): Collection
306306
{
307307
return $this->relatedDummies;
308308
}

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/FourthLevel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class FourthLevel
4646
#[Groups(['barcelona', 'chicago'])]
4747
private int $level = 4;
4848
#[ORM\OneToMany(targetEntity: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel')]
49-
public Collection|iterable|null $badThirdLevel = null;
49+
public Collection|null $badThirdLevel = null;
5050

5151
public function getId(): ?int
5252
{

src/Doctrine/Common/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class RelatedDummy extends ParentDummy implements \Stringable
8484

8585
#[ORM\OneToMany(targetEntity: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy')]
8686
#[Groups(['fakemanytomany', 'friends'])]
87-
public Collection|iterable $relatedToDummyFriend;
87+
public Collection $relatedToDummyFriend;
8888

8989
/**
9090
* @var bool|null A dummy bool
@@ -169,7 +169,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void
169169
/**
170170
* Get relatedToDummyFriend.
171171
*/
172-
public function getRelatedToDummyFriend(): Collection|iterable
172+
public function getRelatedToDummyFriend(): Collection
173173
{
174174
return $this->relatedToDummyFriend;
175175
}

src/Doctrine/Odm/Tests/Fixtures/Document/Dummy.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class Dummy
7777
#[ODM\ReferenceOne(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)]
7878
public ?RelatedDummy $relatedDummy = null;
7979
#[ODM\ReferenceMany(targetDocument: RelatedDummy::class, storeAs: 'id', nullable: true)]
80-
public Collection|iterable $relatedDummies;
80+
public Collection $relatedDummies;
8181
#[ODM\Field(type: 'hash', nullable: true)]
8282
public array $jsonData = [];
8383
#[ODM\Field(type: 'collection', nullable: true)]

src/Doctrine/Odm/Tests/Fixtures/Document/FourthLevel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class FourthLevel
3232
#[ODM\Field(type: 'int')]
3333
private ?int $level = 4;
3434
#[ODM\ReferenceMany(targetDocument: ThirdLevel::class, cascade: ['persist'], mappedBy: 'badFourthLevel', storeAs: 'id')]
35-
public Collection|iterable|null $badThirdLevel = null;
35+
public Collection|null $badThirdLevel = null;
3636

3737
public function getId(): ?int
3838
{

src/Doctrine/Odm/Tests/Fixtures/Document/RelatedDummy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class RelatedDummy extends ParentDummy implements \Stringable
4343
#[ODM\ReferenceOne(targetDocument: ThirdLevel::class, cascade: ['persist'], nullable: true, storeAs: 'id', inversedBy: 'relatedDummies')]
4444
public ?ThirdLevel $thirdLevel = null;
4545
#[ODM\ReferenceMany(targetDocument: RelatedToDummyFriend::class, cascade: ['persist'], mappedBy: 'relatedDummy', storeAs: 'id')]
46-
public Collection|iterable $relatedToDummyFriend;
46+
public Collection $relatedToDummyFriend;
4747
#[ODM\Field(type: 'bool')]
4848
public ?bool $dummyBoolean = null;
4949
#[ODM\EmbedOne(targetDocument: EmbeddableDummy::class)]
@@ -121,7 +121,7 @@ public function setThirdLevel(?ThirdLevel $thirdLevel = null): void
121121
/**
122122
* Get relatedToDummyFriend.
123123
*/
124-
public function getRelatedToDummyFriend(): Collection|iterable
124+
public function getRelatedToDummyFriend(): Collection
125125
{
126126
return $this->relatedToDummyFriend;
127127
}

src/Doctrine/Odm/Tests/Fixtures/Document/ThirdLevel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ThirdLevel
4040
#[ODM\ReferenceOne(targetDocument: FourthLevel::class, cascade: ['persist'])]
4141
public $badFourthLevel;
4242
#[ODM\ReferenceMany(mappedBy: 'thirdLevel', targetDocument: RelatedDummy::class)]
43-
public Collection|iterable $relatedDummies;
43+
public Collection $relatedDummies;
4444

4545
public function __construct()
4646
{

src/Doctrine/Orm/Tests/Fixtures/Entity/CompositeItem.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class CompositeItem implements \Stringable
3535
private ?string $field1 = null;
3636
#[ORM\OneToMany(targetEntity: CompositeRelation::class, mappedBy: 'compositeItem', fetch: 'EAGER')]
3737
#[Groups(['default'])]
38-
private Collection|iterable $compositeValues;
38+
private Collection $compositeValues;
3939

4040
public function __construct()
4141
{
@@ -71,7 +71,7 @@ public function setField1($field1 = null): void
7171
/**
7272
* Gets compositeValues.
7373
*/
74-
public function getCompositeValues(): Collection|iterable
74+
public function getCompositeValues(): Collection
7575
{
7676
return $this->compositeValues;
7777
}

src/Doctrine/Orm/Tests/Fixtures/Entity/Dummy.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class Dummy
107107
public ?RelatedDummy $relatedDummy = null;
108108

109109
#[ORM\ManyToMany(targetEntity: RelatedDummy::class)]
110-
public Collection|iterable $relatedDummies;
110+
public Collection $relatedDummies;
111111

112112
/**
113113
* @var array|null serialize data
@@ -305,7 +305,7 @@ public function getDummy()
305305
return $this->dummy;
306306
}
307307

308-
public function getRelatedDummies(): Collection|iterable
308+
public function getRelatedDummies(): Collection
309309
{
310310
return $this->relatedDummies;
311311
}

0 commit comments

Comments
 (0)